mirror of
https://github.com/ByteWelder/Tactility.git
synced 2026-04-21 19:05:06 +00:00
Fixes
This commit is contained in:
parent
f3e01ea7f8
commit
293c6cf5d8
@ -11,7 +11,7 @@
|
|||||||
#include <esp_lcd_panel_io_additions.h>
|
#include <esp_lcd_panel_io_additions.h>
|
||||||
#include <esp_lcd_st7701.h>
|
#include <esp_lcd_st7701.h>
|
||||||
|
|
||||||
static const auto LOGGER = Logger("St7701Display");
|
static const auto LOGGER = tt::Logger("St7701Display");
|
||||||
|
|
||||||
static const st7701_lcd_init_cmd_t st7701_lcd_init_cmds[] = {
|
static const st7701_lcd_init_cmd_t st7701_lcd_init_cmds[] = {
|
||||||
// {cmd, { data }, data_size, delay_ms}
|
// {cmd, { data }, data_size, delay_ms}
|
||||||
|
|||||||
@ -40,7 +40,9 @@ void TpagerEncoder::readCallback(lv_indev_t* indev, lv_indev_data_t* data) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void TpagerEncoder::initEncoder() {
|
bool TpagerEncoder::initEncoder() {
|
||||||
|
assert(encPcntUnit == nullptr);
|
||||||
|
|
||||||
constexpr int LOW_LIMIT = -127;
|
constexpr int LOW_LIMIT = -127;
|
||||||
constexpr int HIGH_LIMIT = 126;
|
constexpr int HIGH_LIMIT = 126;
|
||||||
|
|
||||||
@ -49,11 +51,15 @@ void TpagerEncoder::initEncoder() {
|
|||||||
pcnt_unit_config_t unit_config = {
|
pcnt_unit_config_t unit_config = {
|
||||||
.low_limit = LOW_LIMIT,
|
.low_limit = LOW_LIMIT,
|
||||||
.high_limit = HIGH_LIMIT,
|
.high_limit = HIGH_LIMIT,
|
||||||
.flags = {.accum_count = 1},
|
.intr_priority = 0,
|
||||||
|
.flags = {
|
||||||
|
.accum_count = 1
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
if (pcnt_new_unit(&unit_config, &encPcntUnit) != ESP_OK) {
|
if (pcnt_new_unit(&unit_config, &encPcntUnit) != ESP_OK) {
|
||||||
LOGGER.error("Pulsecounter initialization failed");
|
LOGGER.error("Pulsecounter initialization failed");
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
pcnt_glitch_filter_config_t filter_config = {
|
pcnt_glitch_filter_config_t filter_config = {
|
||||||
@ -62,16 +68,31 @@ void TpagerEncoder::initEncoder() {
|
|||||||
|
|
||||||
if (pcnt_unit_set_glitch_filter(encPcntUnit, &filter_config) != ESP_OK) {
|
if (pcnt_unit_set_glitch_filter(encPcntUnit, &filter_config) != ESP_OK) {
|
||||||
LOGGER.error("Pulsecounter glitch filter config failed");
|
LOGGER.error("Pulsecounter glitch filter config failed");
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
pcnt_chan_config_t chan_1_config = {
|
pcnt_chan_config_t chan_1_config = {
|
||||||
.edge_gpio_num = ENCODER_B,
|
.edge_gpio_num = ENCODER_B,
|
||||||
.level_gpio_num = ENCODER_A,
|
.level_gpio_num = ENCODER_A,
|
||||||
|
.flags {
|
||||||
|
.invert_edge_input = 0,
|
||||||
|
.invert_level_input = 0,
|
||||||
|
.virt_edge_io_level = 0,
|
||||||
|
.virt_level_io_level = 0,
|
||||||
|
.io_loop_back = 0
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
pcnt_chan_config_t chan_2_config = {
|
pcnt_chan_config_t chan_2_config = {
|
||||||
.edge_gpio_num = ENCODER_A,
|
.edge_gpio_num = ENCODER_A,
|
||||||
.level_gpio_num = ENCODER_B,
|
.level_gpio_num = ENCODER_B,
|
||||||
|
.flags {
|
||||||
|
.invert_edge_input = 0,
|
||||||
|
.invert_level_input = 0,
|
||||||
|
.virt_edge_io_level = 0,
|
||||||
|
.virt_level_io_level = 0,
|
||||||
|
.io_loop_back = 0
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
pcnt_channel_handle_t pcnt_chan_1 = nullptr;
|
pcnt_channel_handle_t pcnt_chan_1 = nullptr;
|
||||||
@ -80,36 +101,45 @@ void TpagerEncoder::initEncoder() {
|
|||||||
if ((pcnt_new_channel(encPcntUnit, &chan_1_config, &pcnt_chan_1) != ESP_OK) ||
|
if ((pcnt_new_channel(encPcntUnit, &chan_1_config, &pcnt_chan_1) != ESP_OK) ||
|
||||||
(pcnt_new_channel(encPcntUnit, &chan_2_config, &pcnt_chan_2) != ESP_OK)) {
|
(pcnt_new_channel(encPcntUnit, &chan_2_config, &pcnt_chan_2) != ESP_OK)) {
|
||||||
LOGGER.error("Pulsecounter channel config failed");
|
LOGGER.error("Pulsecounter channel config failed");
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Second argument is rising edge, third argument is falling edge
|
// Second argument is rising edge, third argument is falling edge
|
||||||
if ((pcnt_channel_set_edge_action(pcnt_chan_1, PCNT_CHANNEL_EDGE_ACTION_DECREASE, PCNT_CHANNEL_EDGE_ACTION_INCREASE) != ESP_OK) ||
|
if ((pcnt_channel_set_edge_action(pcnt_chan_1, PCNT_CHANNEL_EDGE_ACTION_DECREASE, PCNT_CHANNEL_EDGE_ACTION_INCREASE) != ESP_OK) ||
|
||||||
(pcnt_channel_set_edge_action(pcnt_chan_2, PCNT_CHANNEL_EDGE_ACTION_INCREASE, PCNT_CHANNEL_EDGE_ACTION_DECREASE) != ESP_OK)) {
|
(pcnt_channel_set_edge_action(pcnt_chan_2, PCNT_CHANNEL_EDGE_ACTION_INCREASE, PCNT_CHANNEL_EDGE_ACTION_DECREASE) != ESP_OK)) {
|
||||||
LOGGER.error("Pulsecounter edge action config failed");
|
LOGGER.error("Pulsecounter edge action config failed");
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Second argument is low level, third argument is high level
|
// Second argument is low level, third argument is high level
|
||||||
if ((pcnt_channel_set_level_action(pcnt_chan_1, PCNT_CHANNEL_LEVEL_ACTION_KEEP, PCNT_CHANNEL_LEVEL_ACTION_INVERSE) != ESP_OK) ||
|
if ((pcnt_channel_set_level_action(pcnt_chan_1, PCNT_CHANNEL_LEVEL_ACTION_KEEP, PCNT_CHANNEL_LEVEL_ACTION_INVERSE) != ESP_OK) ||
|
||||||
(pcnt_channel_set_level_action(pcnt_chan_2, PCNT_CHANNEL_LEVEL_ACTION_KEEP, PCNT_CHANNEL_LEVEL_ACTION_INVERSE) != ESP_OK)) {
|
(pcnt_channel_set_level_action(pcnt_chan_2, PCNT_CHANNEL_LEVEL_ACTION_KEEP, PCNT_CHANNEL_LEVEL_ACTION_INVERSE) != ESP_OK)) {
|
||||||
LOGGER.error("Pulsecounter level action config failed");
|
LOGGER.error("Pulsecounter level action config failed");
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((pcnt_unit_add_watch_point(encPcntUnit, LOW_LIMIT) != ESP_OK) ||
|
if ((pcnt_unit_add_watch_point(encPcntUnit, LOW_LIMIT) != ESP_OK) ||
|
||||||
(pcnt_unit_add_watch_point(encPcntUnit, HIGH_LIMIT) != ESP_OK)) {
|
(pcnt_unit_add_watch_point(encPcntUnit, HIGH_LIMIT) != ESP_OK)) {
|
||||||
LOGGER.error("Pulsecounter watch point config failed");
|
LOGGER.error("Pulsecounter watch point config failed");
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcnt_unit_enable(encPcntUnit) != ESP_OK) {
|
if (pcnt_unit_enable(encPcntUnit) != ESP_OK) {
|
||||||
LOGGER.error("Pulsecounter could not be enabled");
|
LOGGER.error("Pulsecounter could not be enabled");
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcnt_unit_clear_count(encPcntUnit) != ESP_OK) {
|
if (pcnt_unit_clear_count(encPcntUnit) != ESP_OK) {
|
||||||
LOGGER.error("Pulsecounter could not be cleared");
|
LOGGER.error("Pulsecounter could not be cleared");
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcnt_unit_start(encPcntUnit) != ESP_OK) {
|
if (pcnt_unit_start(encPcntUnit) != ESP_OK) {
|
||||||
LOGGER.error("Pulsecounter could not be started");
|
LOGGER.error("Pulsecounter could not be started");
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
int TpagerEncoder::getEncoderPulses() const {
|
int TpagerEncoder::getEncoderPulses() const {
|
||||||
@ -118,9 +148,28 @@ int TpagerEncoder::getEncoderPulses() const {
|
|||||||
return pulses;
|
return pulses;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool TpagerEncoder::deinitEncoder() {
|
||||||
|
assert(encPcntUnit != nullptr);
|
||||||
|
|
||||||
|
if (pcnt_unit_stop(encPcntUnit) != ESP_OK) {
|
||||||
|
LOGGER.warn("Failed to stop encoder");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (pcnt_del_unit(encPcntUnit) != ESP_OK) {
|
||||||
|
LOGGER.warn("Failed to delete encoder");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
LOGGER.info("Deinitialized");
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool TpagerEncoder::startLvgl(lv_display_t* display) {
|
bool TpagerEncoder::startLvgl(lv_display_t* display) {
|
||||||
initEncoder();
|
if (encPcntUnit == nullptr && !initEncoder()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
gpio_input_enable(ENCODER_ENTER);
|
gpio_input_enable(ENCODER_ENTER);
|
||||||
|
|
||||||
@ -138,5 +187,10 @@ bool TpagerEncoder::stopLvgl() {
|
|||||||
lv_indev_delete(encHandle);
|
lv_indev_delete(encHandle);
|
||||||
encHandle = nullptr;
|
encHandle = nullptr;
|
||||||
|
|
||||||
|
if (encPcntUnit != nullptr && !deinitEncoder()) {
|
||||||
|
// We're not returning false as LVGL as effectively deinitialized
|
||||||
|
LOGGER.warn("Deinitialization failed");
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,7 +8,8 @@ class TpagerEncoder final : public tt::hal::encoder::EncoderDevice {
|
|||||||
lv_indev_t* _Nullable encHandle = nullptr;
|
lv_indev_t* _Nullable encHandle = nullptr;
|
||||||
pcnt_unit_handle_t encPcntUnit = nullptr;
|
pcnt_unit_handle_t encPcntUnit = nullptr;
|
||||||
|
|
||||||
void initEncoder();
|
bool initEncoder();
|
||||||
|
bool deinitEncoder();
|
||||||
|
|
||||||
static void readCallback(lv_indev_t* indev, lv_indev_data_t* data);
|
static void readCallback(lv_indev_t* indev, lv_indev_data_t* data);
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
#include "Drv2605.h"
|
#include "Drv2605.h"
|
||||||
|
|
||||||
|
#include <Tactility/Check.h>
|
||||||
#include <Tactility/Logger.h>
|
#include <Tactility/Logger.h>
|
||||||
|
|
||||||
static const auto LOGGER = tt::Logger("DRV2605");
|
static const auto LOGGER = tt::Logger("DRV2605");
|
||||||
@ -7,6 +8,7 @@ static const auto LOGGER = tt::Logger("DRV2605");
|
|||||||
Drv2605::Drv2605(i2c_port_t port, bool autoPlayStartupBuzz) : I2cDevice(port, ADDRESS), autoPlayStartupBuzz(autoPlayStartupBuzz) {
|
Drv2605::Drv2605(i2c_port_t port, bool autoPlayStartupBuzz) : I2cDevice(port, ADDRESS), autoPlayStartupBuzz(autoPlayStartupBuzz) {
|
||||||
if (!init()) {
|
if (!init()) {
|
||||||
LOGGER.error("Failed to initialize DRV2605");
|
LOGGER.error("Failed to initialize DRV2605");
|
||||||
|
tt_crash();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (autoPlayStartupBuzz) {
|
if (autoPlayStartupBuzz) {
|
||||||
|
|||||||
@ -28,6 +28,7 @@ namespace tt {
|
|||||||
TT_NORETURN void _crash();
|
TT_NORETURN void _crash();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: Move crash logic to kernel namespace and consider refactoring to C++
|
||||||
/** Crash system with message. */
|
/** Crash system with message. */
|
||||||
#define tt_crash(...) TT_ARG_CAT(_tt_crash,TT_ARGCOUNT(__VA_ARGS__))(__VA_ARGS__)
|
#define tt_crash(...) TT_ARG_CAT(_tt_crash,TT_ARGCOUNT(__VA_ARGS__))(__VA_ARGS__)
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user