summaryrefslogtreecommitdiff
path: root/src/drivers/relative_wheel.cpp
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2023-06-26 12:55:46 +1000
committerjacqueline <me@jacqueline.id.au>2023-06-26 12:55:46 +1000
commit9763cc955c4f3b2c2af54b61c2c5ad77afef9603 (patch)
treebdfef9f5685fac3088cf4d59400e888a1b0ffb8b /src/drivers/relative_wheel.cpp
parentc124c8f94dbdb41a7e535b741fe2d2be8e7346c0 (diff)
downloadtangara-fw-9763cc955c4f3b2c2af54b61c2c5ad77afef9603.tar.gz
Improve encoder driver
It actually works and clicks now! Still a bit rough though. Need to dive into lvgl internals to work out what it's doing with enc_diff
Diffstat (limited to 'src/drivers/relative_wheel.cpp')
-rw-r--r--src/drivers/relative_wheel.cpp16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/drivers/relative_wheel.cpp b/src/drivers/relative_wheel.cpp
index 4c9e19bb..a631cd2e 100644
--- a/src/drivers/relative_wheel.cpp
+++ b/src/drivers/relative_wheel.cpp
@@ -15,7 +15,8 @@ namespace drivers {
RelativeWheel::RelativeWheel(TouchWheel* touch)
: touch_(touch),
- is_pressed_(false),
+ is_clicking_(false),
+ was_clicking_(false),
is_first_read_(true),
ticks_(0),
last_angle_(0) {}
@@ -23,7 +24,12 @@ RelativeWheel::RelativeWheel(TouchWheel* touch)
auto RelativeWheel::Update() -> void {
touch_->Update();
TouchWheelData d = touch_->GetTouchWheelData();
- is_pressed_ = d.is_touched;
+
+ is_clicking_ = d.is_button_touched;
+
+ if (!d.is_wheel_touched) {
+ is_first_read_ = true;
+ }
uint8_t new_angle = d.wheel_position;
if (is_first_read_) {
@@ -61,8 +67,10 @@ auto RelativeWheel::Update() -> void {
ticks_ = change;
}
-auto RelativeWheel::is_pressed() -> bool {
- return is_pressed_;
+auto RelativeWheel::is_clicking() -> bool {
+ bool ret = is_clicking_;
+ is_clicking_ = 0;
+ return ret;
}
auto RelativeWheel::ticks() -> std::int_fast16_t {