Browse Source

Fix Spindle/Laser compile error (#14312)

Ludy 5 years ago
parent
commit
35aabd1834

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

313
   #endif
313
   #endif
314
 
314
 
315
   inline void _lcd_spindle_laser_off() { set_spindle_laser_enabled(false); }
315
   inline void _lcd_spindle_laser_off() { set_spindle_laser_enabled(false); }
316
+  void set_spindle_direction(bool);
316
   inline void _lcd_spindle_laser_on(const bool is_M4) {
317
   inline void _lcd_spindle_laser_on(const bool is_M4) {
317
     #if SPINDLE_DIR_CHANGE
318
     #if SPINDLE_DIR_CHANGE
318
       set_spindle_direction(is_M4);
319
       set_spindle_direction(is_M4);
329
     MENU_BACK(MSG_MAIN);
330
     MENU_BACK(MSG_MAIN);
330
     if (spindle_laser_enabled()) {
331
     if (spindle_laser_enabled()) {
331
       #if ENABLED(SPINDLE_LASER_PWM)
332
       #if ENABLED(SPINDLE_LASER_PWM)
332
-        MENU_ITEM_EDIT_CALLBACK(int3, MSG_LASER_POWER, &spindle_laser_power, SPEED_POWER_MIN, SPEED_POWER_MAX, update_spindle_laser_power);
333
+        MENU_ITEM_EDIT_CALLBACK(uint8, MSG_LASER_POWER, &spindle_laser_power, SPEED_POWER_MIN, SPEED_POWER_MAX, update_spindle_laser_power);
333
       #endif
334
       #endif
334
       MENU_ITEM(function, MSG_LASER_OFF, _lcd_spindle_laser_off);
335
       MENU_ITEM(function, MSG_LASER_OFF, _lcd_spindle_laser_off);
335
     }
336
     }

+ 1
- 1
Marlin/src/libs/numtostr.h View File

27
 char* ui8tostr4pct(const uint8_t i);
27
 char* ui8tostr4pct(const uint8_t i);
28
 
28
 
29
 // Convert uint8_t to string with 123 format
29
 // Convert uint8_t to string with 123 format
30
-char* ui8tostr3(const uint8_t x);
30
+char* ui8tostr3(const uint8_t i);
31
 
31
 
32
 // Convert int8_t to string with 123 format
32
 // Convert int8_t to string with 123 format
33
 char* i8tostr3(const int8_t x);
33
 char* i8tostr3(const int8_t x);

+ 1
- 1
buildroot/share/tests/megaatmega2560-tests View File

58
 opt_set TEMP_SENSOR_4 1000
58
 opt_set TEMP_SENSOR_4 1000
59
 opt_set TEMP_SENSOR_BED 1
59
 opt_set TEMP_SENSOR_BED 1
60
 opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATURE G26_MESH_EDITING ENABLE_LEVELING_FADE_HEIGHT SKEW_CORRECTION \
60
 opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATURE G26_MESH_EDITING ENABLE_LEVELING_FADE_HEIGHT SKEW_CORRECTION \
61
-           EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT GCODE_MACROS \
61
+           EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT GCODE_MACROS SPINDLE_LASER_ENABLE \
62
            USB_FLASH_DRIVE_SUPPORT SDCARD_SORT_ALPHA STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES LIGHTWEIGHT_UI \
62
            USB_FLASH_DRIVE_SUPPORT SDCARD_SORT_ALPHA STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES LIGHTWEIGHT_UI \
63
            CUSTOM_USER_MENUS I2C_POSITION_ENCODERS BABYSTEPPING BABYSTEP_XY LIN_ADVANCE NANODLP_Z_SYNC QUICK_HOME JUNCTION_DEVIATION MULTI_NOZZLE_DUPLICATION
63
            CUSTOM_USER_MENUS I2C_POSITION_ENCODERS BABYSTEPPING BABYSTEP_XY LIN_ADVANCE NANODLP_Z_SYNC QUICK_HOME JUNCTION_DEVIATION MULTI_NOZZLE_DUPLICATION
64
 exec_test $1 $2 "Azteeg X3 with 5 extruders, RRDFGSC, probeless UBL, Linear Advance, and more"
64
 exec_test $1 $2 "Azteeg X3 with 5 extruders, RRDFGSC, probeless UBL, Linear Advance, and more"

Loading…
Cancel
Save