Преглед изворни кода

Fix a compile warning, etc. (#12955)

Ludy пре 6 година
родитељ
комит
acf266fe78

+ 1
- 0
Marlin/src/gcode/motion/G2_G3.cpp Прегледај датотеку

184
     raw[q_axis] = center_Q + r_Q;
184
     raw[q_axis] = center_Q + r_Q;
185
     #if ENABLED(AUTO_BED_LEVELING_UBL)
185
     #if ENABLED(AUTO_BED_LEVELING_UBL)
186
       raw[l_axis] = start_L;
186
       raw[l_axis] = start_L;
187
+      UNUSED(linear_per_segment);
187
     #else
188
     #else
188
       raw[l_axis] += linear_per_segment;
189
       raw[l_axis] += linear_per_segment;
189
     #endif
190
     #endif

+ 3
- 7
Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp Прегледај датотеку

179
 
179
 
180
   #if ENABLED(FAST_FILE_TRANSFER)
180
   #if ENABLED(FAST_FILE_TRANSFER)
181
 
181
 
182
-    const int16_t port =
183
-      #if NUM_SERIAL > 1
184
-        command_queue_port[cmd_queue_index_r]
185
-      #else
186
-        0
187
-      #endif
188
-    ;
182
+    #if NUM_SERIAL > 1
183
+      const int16_t port = command_queue_port[cmd_queue_index_r];
184
+    #endif
189
 
185
 
190
     bool binary_mode = false;
186
     bool binary_mode = false;
191
     char *p = parser.string_arg;
187
     char *p = parser.string_arg;

+ 1
- 1
Marlin/src/gcode/temperature/M106_M107.cpp Прегледај датотеку

48
   if (p < MIN(EXTRUDERS, FAN_COUNT)) {
48
   if (p < MIN(EXTRUDERS, FAN_COUNT)) {
49
 
49
 
50
     #if ENABLED(EXTRA_FAN_SPEED)
50
     #if ENABLED(EXTRA_FAN_SPEED)
51
-      const int16_t t = parser.intval('T');
51
+      const uint16_t t = parser.intval('T');
52
       if (t > 0) return thermalManager.set_temp_fan_speed(p, t);
52
       if (t > 0) return thermalManager.set_temp_fan_speed(p, t);
53
     #endif
53
     #endif
54
 
54
 

+ 2
- 2
Marlin/src/lcd/menu/menu_bed_leveling.cpp Прегледај датотеку

210
     static uint8_t xind, yind; // =0
210
     static uint8_t xind, yind; // =0
211
     START_MENU();
211
     START_MENU();
212
     MENU_BACK(MSG_BED_LEVELING);
212
     MENU_BACK(MSG_BED_LEVELING);
213
-    MENU_ITEM_EDIT(int8, MSG_MESH_X, &xind, 0, GRID_MAX_POINTS_X - 1);
214
-    MENU_ITEM_EDIT(int8, MSG_MESH_Y, &yind, 0, GRID_MAX_POINTS_Y - 1);
213
+    MENU_ITEM_EDIT(uint8, MSG_MESH_X, &xind, 0, GRID_MAX_POINTS_X - 1);
214
+    MENU_ITEM_EDIT(uint8, MSG_MESH_Y, &yind, 0, GRID_MAX_POINTS_Y - 1);
215
     MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_MESH_EDIT_Z, &Z_VALUES(xind, yind), -(LCD_PROBE_Z_RANGE) * 0.5, (LCD_PROBE_Z_RANGE) * 0.5, refresh_planner);
215
     MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_MESH_EDIT_Z, &Z_VALUES(xind, yind), -(LCD_PROBE_Z_RANGE) * 0.5, (LCD_PROBE_Z_RANGE) * 0.5, refresh_planner);
216
     END_MENU();
216
     END_MENU();
217
   }
217
   }

+ 1
- 1
Marlin/src/module/temperature.cpp Прегледај датотеку

111
   #if ENABLED(EXTRA_FAN_SPEED)
111
   #if ENABLED(EXTRA_FAN_SPEED)
112
     uint8_t Temperature::old_fan_speed[FAN_COUNT], Temperature::new_fan_speed[FAN_COUNT];
112
     uint8_t Temperature::old_fan_speed[FAN_COUNT], Temperature::new_fan_speed[FAN_COUNT];
113
 
113
 
114
-    void Temperature::set_temp_fan_speed(const uint8_t fan, const int16_t tmp_temp) {
114
+    void Temperature::set_temp_fan_speed(const uint8_t fan, const uint16_t tmp_temp) {
115
       switch (tmp_temp) {
115
       switch (tmp_temp) {
116
         case 1:
116
         case 1:
117
           set_fan_speed(fan, old_fan_speed[fan]);
117
           set_fan_speed(fan, old_fan_speed[fan]);

+ 1
- 1
Marlin/src/module/temperature.h Прегледај датотеку

346
 
346
 
347
       #if ENABLED(EXTRA_FAN_SPEED)
347
       #if ENABLED(EXTRA_FAN_SPEED)
348
         static uint8_t old_fan_speed[FAN_COUNT], new_fan_speed[FAN_COUNT];
348
         static uint8_t old_fan_speed[FAN_COUNT], new_fan_speed[FAN_COUNT];
349
-        static void set_temp_fan_speed(const uint8_t fan, const int16_t tmp_temp);
349
+        static void set_temp_fan_speed(const uint8_t fan, const uint16_t tmp_temp);
350
       #endif
350
       #endif
351
 
351
 
352
       #if HAS_LCD_MENU
352
       #if HAS_LCD_MENU

Loading…
Откажи
Сачувај