Browse Source

Fix some edit items for 16-bit encoder (#13948)

InsanityAutomation 5 years ago
parent
commit
3f758d9e00

+ 4
- 4
Marlin/src/lcd/menu/menu_advanced.cpp View File

131
 
131
 
132
     #if ENABLED(LIN_ADVANCE)
132
     #if ENABLED(LIN_ADVANCE)
133
       #if EXTRUDERS == 1
133
       #if EXTRUDERS == 1
134
-        MENU_ITEM_EDIT(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
134
+        MENU_ITEM_EDIT(float51, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
135
       #elif EXTRUDERS > 1
135
       #elif EXTRUDERS > 1
136
-        #define EDIT_ADVANCE_K(N) MENU_ITEM_EDIT(float52, MSG_ADVANCE_K MSG_E##N, &planner.extruder_advance_K[N-1], 0, 999)
136
+        #define EDIT_ADVANCE_K(N) MENU_ITEM_EDIT(float51, MSG_ADVANCE_K MSG_E##N, &planner.extruder_advance_K[N-1], 0, 999)
137
         EDIT_ADVANCE_K(1);
137
         EDIT_ADVANCE_K(1);
138
         EDIT_ADVANCE_K(2);
138
         EDIT_ADVANCE_K(2);
139
         #if EXTRUDERS > 2
139
         #if EXTRUDERS > 2
669
     MENU_ITEM(submenu, MSG_FILAMENT, menu_advanced_filament);
669
     MENU_ITEM(submenu, MSG_FILAMENT, menu_advanced_filament);
670
   #elif ENABLED(LIN_ADVANCE)
670
   #elif ENABLED(LIN_ADVANCE)
671
     #if EXTRUDERS == 1
671
     #if EXTRUDERS == 1
672
-      MENU_ITEM_EDIT(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
672
+      MENU_ITEM_EDIT(float51, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
673
     #elif EXTRUDERS > 1
673
     #elif EXTRUDERS > 1
674
-      #define EDIT_ADVANCE_K(N) MENU_ITEM_EDIT(float52, MSG_ADVANCE_K MSG_E##N, &planner.extruder_advance_K[N-1], 0, 999)
674
+      #define EDIT_ADVANCE_K(N) MENU_ITEM_EDIT(float51, MSG_ADVANCE_K MSG_E##N, &planner.extruder_advance_K[N-1], 0, 999)
675
       EDIT_ADVANCE_K(1);
675
       EDIT_ADVANCE_K(1);
676
       EDIT_ADVANCE_K(2);
676
       EDIT_ADVANCE_K(2);
677
       #if EXTRUDERS > 2
677
       #if EXTRUDERS > 2

+ 1
- 1
Marlin/src/lcd/menu/menu_bed_leveling.cpp View File

278
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
278
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
279
     MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
279
     MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
280
   #elif HAS_BED_PROBE
280
   #elif HAS_BED_PROBE
281
-    MENU_ITEM_EDIT(float52, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
281
+    MENU_ITEM_EDIT(float52sign, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
282
   #endif
282
   #endif
283
 
283
 
284
   #if ENABLED(LEVEL_BED_CORNERS)
284
   #if ENABLED(LEVEL_BED_CORNERS)

+ 5
- 5
Marlin/src/lcd/menu/menu_configuration.cpp View File

134
     START_MENU();
134
     START_MENU();
135
     MENU_BACK(MSG_MAIN);
135
     MENU_BACK(MSG_MAIN);
136
     #if ENABLED(DUAL_X_CARRIAGE)
136
     #if ENABLED(DUAL_X_CARRIAGE)
137
-      MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float52, MSG_X_OFFSET, &hotend_offset[X_AXIS][1], MIN(X2_HOME_POS, X2_MAX_POS) - 25.0, MAX(X2_HOME_POS, X2_MAX_POS) + 25.0, _recalc_offsets);
137
+      MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float51, MSG_X_OFFSET, &hotend_offset[X_AXIS][1], MIN(X2_HOME_POS, X2_MAX_POS) - 25.0, MAX(X2_HOME_POS, X2_MAX_POS) + 25.0, _recalc_offsets);
138
     #else
138
     #else
139
-      MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float52, MSG_X_OFFSET, &hotend_offset[X_AXIS][1], -10.0, 10.0, _recalc_offsets);
139
+      MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float51, MSG_X_OFFSET, &hotend_offset[X_AXIS][1], -10.0, 10.0, _recalc_offsets);
140
     #endif
140
     #endif
141
-    MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float52, MSG_Y_OFFSET, &hotend_offset[Y_AXIS][1], -10.0, 10.0, _recalc_offsets);
142
-    MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float52, MSG_Z_OFFSET, &hotend_offset[Z_AXIS][1], Z_PROBE_LOW_POINT, 10.0, _recalc_offsets);
141
+    MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float51, MSG_Y_OFFSET, &hotend_offset[Y_AXIS][1], -10.0, 10.0, _recalc_offsets);
142
+    MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float51, MSG_Z_OFFSET, &hotend_offset[Z_AXIS][1], Z_PROBE_LOW_POINT, 10.0, _recalc_offsets);
143
     #if ENABLED(EEPROM_SETTINGS)
143
     #if ENABLED(EEPROM_SETTINGS)
144
       MENU_ITEM(function, MSG_STORE_EEPROM, lcd_store_settings);
144
       MENU_ITEM(function, MSG_STORE_EEPROM, lcd_store_settings);
145
     #endif
145
     #endif
287
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
287
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
288
     MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
288
     MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
289
   #elif HAS_BED_PROBE
289
   #elif HAS_BED_PROBE
290
-    MENU_ITEM_EDIT(float52, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
290
+    MENU_ITEM_EDIT(float52sign, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
291
   #endif
291
   #endif
292
 
292
 
293
   const bool busy = printer_busy();
293
   const bool busy = printer_busy();

+ 3
- 3
Marlin/src/lcd/menu/menu_delta_calibrate.cpp View File

94
 void lcd_delta_settings() {
94
 void lcd_delta_settings() {
95
   START_MENU();
95
   START_MENU();
96
   MENU_BACK(MSG_DELTA_CALIBRATE);
96
   MENU_BACK(MSG_DELTA_CALIBRATE);
97
-  MENU_ITEM_EDIT_CALLBACK(float52sign, MSG_DELTA_HEIGHT, &delta_height, delta_height - 10, delta_height + 10, _recalc_delta_settings);
97
+  MENU_ITEM_EDIT_CALLBACK(float51, MSG_DELTA_HEIGHT, &delta_height, delta_height - 10, delta_height + 10, _recalc_delta_settings);
98
   #define EDIT_ENDSTOP_ADJ(LABEL,N) MENU_ITEM_EDIT_CALLBACK(float43, LABEL, &delta_endstop_adj[_AXIS(N)], -5, 5, _recalc_delta_settings)
98
   #define EDIT_ENDSTOP_ADJ(LABEL,N) MENU_ITEM_EDIT_CALLBACK(float43, LABEL, &delta_endstop_adj[_AXIS(N)], -5, 5, _recalc_delta_settings)
99
   EDIT_ENDSTOP_ADJ("Ex",A);
99
   EDIT_ENDSTOP_ADJ("Ex",A);
100
   EDIT_ENDSTOP_ADJ("Ey",B);
100
   EDIT_ENDSTOP_ADJ("Ey",B);
101
   EDIT_ENDSTOP_ADJ("Ez",C);
101
   EDIT_ENDSTOP_ADJ("Ez",C);
102
-  MENU_ITEM_EDIT_CALLBACK(float52sign, MSG_DELTA_RADIUS, &delta_radius, delta_radius - 5, delta_radius + 5, _recalc_delta_settings);
102
+  MENU_ITEM_EDIT_CALLBACK(float51, MSG_DELTA_RADIUS, &delta_radius, delta_radius - 5, delta_radius + 5, _recalc_delta_settings);
103
   #define EDIT_ANGLE_TRIM(LABEL,N) MENU_ITEM_EDIT_CALLBACK(float43, LABEL, &delta_tower_angle_trim[_AXIS(N)], -5, 5, _recalc_delta_settings)
103
   #define EDIT_ANGLE_TRIM(LABEL,N) MENU_ITEM_EDIT_CALLBACK(float43, LABEL, &delta_tower_angle_trim[_AXIS(N)], -5, 5, _recalc_delta_settings)
104
   EDIT_ANGLE_TRIM("Tx",A);
104
   EDIT_ANGLE_TRIM("Tx",A);
105
   EDIT_ANGLE_TRIM("Ty",B);
105
   EDIT_ANGLE_TRIM("Ty",B);
106
   EDIT_ANGLE_TRIM("Tz",C);
106
   EDIT_ANGLE_TRIM("Tz",C);
107
-  MENU_ITEM_EDIT_CALLBACK(float52sign, MSG_DELTA_DIAG_ROD, &delta_diagonal_rod, delta_diagonal_rod - 5, delta_diagonal_rod + 5, _recalc_delta_settings);
107
+  MENU_ITEM_EDIT_CALLBACK(float51, MSG_DELTA_DIAG_ROD, &delta_diagonal_rod, delta_diagonal_rod - 5, delta_diagonal_rod + 5, _recalc_delta_settings);
108
   END_MENU();
108
   END_MENU();
109
 }
109
 }
110
 
110
 

Loading…
Cancel
Save