fix: If the direction is reversed, clear the count

espressif2022 · espressif2022 · commit f5ff636059ab · 2025-01-09T12:09:44.000+08:00
diff --git a/components/esp_lvgl_port/src/lvgl8/esp_lvgl_port_knob.c b/components/esp_lvgl_port/src/lvgl8/esp_lvgl_port_knob.c
@@ -166,7 +166,8 @@ static void lvgl_port_encoder_left_handler(void *arg, void *arg2)
     if (ctx && knob) {
         /* LEFT */
         if (knob == ctx->knob_handle) {
-            ctx->diff += lvgl_port_calculate_diff(knob, KNOB_LEFT);
+            int32_t diff = lvgl_port_calculate_diff(knob, KNOB_LEFT);
+            ctx->diff = (ctx->diff > 0) ? diff : ctx->diff + diff;
         }
     }
 }
@@ -178,7 +179,8 @@ static void lvgl_port_encoder_right_handler(void *arg, void *arg2)
     if (ctx && knob) {
         /* RIGHT */
         if (knob == ctx->knob_handle) {
-            ctx->diff += lvgl_port_calculate_diff(knob, KNOB_RIGHT);
+            int32_t diff = lvgl_port_calculate_diff(knob, KNOB_RIGHT);
+            ctx->diff = (ctx->diff < 0) ? diff : ctx->diff + diff;
         }
     }
 }
diff --git a/components/esp_lvgl_port/src/lvgl9/esp_lvgl_port_knob.c b/components/esp_lvgl_port/src/lvgl9/esp_lvgl_port_knob.c
@@ -180,7 +180,8 @@ static void lvgl_port_encoder_left_handler(void *arg, void *arg2)
     if (ctx && knob) {
         /* LEFT */
         if (knob == ctx->knob_handle) {
-            ctx->diff += lvgl_port_calculate_diff(knob, KNOB_LEFT);
+            int32_t diff = lvgl_port_calculate_diff(knob, KNOB_LEFT);
+            ctx->diff = (ctx->diff > 0) ? diff : ctx->diff + diff;
         }
         /* Wake LVGL task, if needed */
         lvgl_port_task_wake(LVGL_PORT_EVENT_TOUCH, ctx->indev);
@@ -194,7 +195,8 @@ static void lvgl_port_encoder_right_handler(void *arg, void *arg2)
     if (ctx && knob) {
         /* RIGHT */
         if (knob == ctx->knob_handle) {
-            ctx->diff += lvgl_port_calculate_diff(knob, KNOB_RIGHT);
+            int32_t diff = lvgl_port_calculate_diff(knob, KNOB_RIGHT);
+            ctx->diff = (ctx->diff < 0) ? diff : ctx->diff + diff;
         }
         /* Wake LVGL task, if needed */
         lvgl_port_task_wake(LVGL_PORT_EVENT_TOUCH, ctx->indev);

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,8 @@ static void lvgl_port_encoder_left_handler(void arg, void arg2)`
`166`	`166`	`if (ctx && knob) {`
`167`	`167`	`/* LEFT */`
`168`	`168`	`if (knob == ctx->knob_handle) {`
`169`		`- ctx->diff += lvgl_port_calculate_diff(knob, KNOB_LEFT);`
	`169`	`+ int32_t diff = lvgl_port_calculate_diff(knob, KNOB_LEFT);`
	`170`	`+ ctx->diff = (ctx->diff > 0) ? diff : ctx->diff + diff;`
`170`	`171`	`}`
`171`	`172`	`}`
`172`	`173`	`}`
`@@ -178,7 +179,8 @@ static void lvgl_port_encoder_right_handler(void arg, void arg2)`
`178`	`179`	`if (ctx && knob) {`
`179`	`180`	`/* RIGHT */`
`180`	`181`	`if (knob == ctx->knob_handle) {`
`181`		`- ctx->diff += lvgl_port_calculate_diff(knob, KNOB_RIGHT);`
	`182`	`+ int32_t diff = lvgl_port_calculate_diff(knob, KNOB_RIGHT);`
	`183`	`+ ctx->diff = (ctx->diff < 0) ? diff : ctx->diff + diff;`
`182`	`184`	`}`
`183`	`185`	`}`
`184`	`186`	`}`