Selaa lähdekoodia

Merge pull request #3149 from esenapaj/patch-1

suppress warnings
Scott Lahteine 9 vuotta sitten
vanhempi
commit
7d25c107a8
2 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 1
    1
      Marlin/Marlin_main.cpp
  2. 2
    2
      Marlin/ultralcd.cpp

+ 1
- 1
Marlin/Marlin_main.cpp Näytä tiedosto

4114
    *   F<fan speed>
4114
    *   F<fan speed>
4115
    */
4115
    */
4116
   inline void gcode_M145() {
4116
   inline void gcode_M145() {
4117
-    uint8_t material = code_seen('S') ? code_value_short() : 0;
4117
+    int8_t material = code_seen('S') ? code_value_short() : 0;
4118
     if (material < 0 || material > 1) {
4118
     if (material < 0 || material > 1) {
4119
       SERIAL_ERROR_START;
4119
       SERIAL_ERROR_START;
4120
       SERIAL_ERRORLNPGM(MSG_ERR_MATERIAL_INDEX);
4120
       SERIAL_ERRORLNPGM(MSG_ERR_MATERIAL_INDEX);

+ 2
- 2
Marlin/ultralcd.cpp Näytä tiedosto

493
       encoderPosition = 0;
493
       encoderPosition = 0;
494
       lcdDrawUpdate = 1;
494
       lcdDrawUpdate = 1;
495
     }
495
     }
496
-    if (lcdDrawUpdate) lcd_implementation_drawedit(msg, "");
496
+    if (lcdDrawUpdate) lcd_implementation_drawedit(msg, (char*)"");
497
     if (LCD_CLICKED) lcd_goto_previous_menu();
497
     if (LCD_CLICKED) lcd_goto_previous_menu();
498
   }
498
   }
499
   static void lcd_babystep_x() { _lcd_babystep(X_AXIS, PSTR(MSG_BABYSTEPPING_X)); }
499
   static void lcd_babystep_x() { _lcd_babystep(X_AXIS, PSTR(MSG_BABYSTEPPING_X)); }
2338
    * MBL Move to mesh starting point
2338
    * MBL Move to mesh starting point
2339
    */
2339
    */
2340
   static void _lcd_level_bed_homing() {
2340
   static void _lcd_level_bed_homing() {
2341
-    if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("XYZ"), "Homing");
2341
+    if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("XYZ"), (char*)"Homing");
2342
     if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]) {
2342
     if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]) {
2343
       current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
2343
       current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
2344
       plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
2344
       plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);

Loading…
Peruuta
Tallenna