Browse Source

suppress warnings

esenapaj 8 years ago
parent
commit
8de7a6f9b1
2 changed files with 3 additions and 3 deletions
  1. 1
    1
      Marlin/Marlin_main.cpp
  2. 2
    2
      Marlin/ultralcd.cpp

+ 1
- 1
Marlin/Marlin_main.cpp View File

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 View File

469
       encoderPosition = 0;
469
       encoderPosition = 0;
470
       lcdDrawUpdate = 1;
470
       lcdDrawUpdate = 1;
471
     }
471
     }
472
-    if (lcdDrawUpdate) lcd_implementation_drawedit(msg, "");
472
+    if (lcdDrawUpdate) lcd_implementation_drawedit(msg, (char*)"");
473
     if (LCD_CLICKED) lcd_goto_previous_menu();
473
     if (LCD_CLICKED) lcd_goto_previous_menu();
474
   }
474
   }
475
   static void lcd_babystep_x() { _lcd_babystep(X_AXIS, PSTR(MSG_BABYSTEPPING_X)); }
475
   static void lcd_babystep_x() { _lcd_babystep(X_AXIS, PSTR(MSG_BABYSTEPPING_X)); }
2290
    * MBL Move to mesh starting point
2290
    * MBL Move to mesh starting point
2291
    */
2291
    */
2292
   static void _lcd_level_bed_homing() {
2292
   static void _lcd_level_bed_homing() {
2293
-    if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("XYZ"), "Homing");
2293
+    if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("XYZ"), (char*)"Homing");
2294
     if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]) {
2294
     if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]) {
2295
       current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
2295
       current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
2296
       plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
2296
       plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);

Loading…
Cancel
Save