just reverse menus

should be set to "menu direction" for main menu buttons
MarlinFirmware · May 22, 2024 · 67af37f · 67af37f
1 parent defd927
commit 67af37f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Marlin/src/lcd/e3v2/common/encoder.cpp b/Marlin/src/lcd/e3v2/common/encoder.cpp
@@ -75,8 +75,7 @@ EncoderState encoderReceiveAnalyze() {
     else return ENCODER_DIFF_NO;
   }
 
-  const int8_t delta = ui.get_encoder_delta();
-  temp_diff += TERN0(REVERSIBLE_ENCODER, ui.reverse_encoder) ? -delta : delta;
+  temp_diff += ui.get_encoder_delta();
 
   const int8_t abs_diff = ABS(temp_diff);
   if (abs_diff >= ENCODER_PULSES_PER_STEP) {

diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
@@ -867,7 +867,12 @@ class MarlinUI {
     }
 
     FORCE_INLINE static void encoder_direction_menus() {
-      TERN_(REVERSE_MENU_DIRECTION, encoderDirection = -(ENCODERBASE));
+      constexpr int8_t dir = TERN(REVERSE_MENU_DIRECTION, -(ENCODERBASE), ENCODERBASE);
+      #if ENABLED(REVERSIBLE_ENCODER)
+        encoderDirection = reverse_encoder ? -dir : dir;
+      #elif ENABLED(REVERSE_MENU_DIRECTION)
+        encoderDirection = dir;
+      #endif
     }
 
     FORCE_INLINE static void encoder_direction_select() {