andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix Spindle/Laser compile error (#14312)

pull/1/head
Ludy 6 years ago
committed by Scott Lahteine
parent
21f377d94a
commit
35aabd1834
3 changed files with 4 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      Marlin/src/lcd/menu/menu_temperature.cpp
  2. 2
      Marlin/src/libs/numtostr.h
  3. 2
      buildroot/share/tests/megaatmega2560-tests

3
Marlin/src/lcd/menu/menu_temperature.cpp
View File

@ -313,6 +313,7 @@ void _lcd_preheat(const int16_t endnum, const int16_t temph, const int16_t tempb
#endif #endif
inline void _lcd_spindle_laser_off() { set_spindle_laser_enabled(false); } inline void _lcd_spindle_laser_off() { set_spindle_laser_enabled(false); }
void set_spindle_direction(bool);
inline void _lcd_spindle_laser_on(const bool is_M4) { inline void _lcd_spindle_laser_on(const bool is_M4) {
#if SPINDLE_DIR_CHANGE #if SPINDLE_DIR_CHANGE
set_spindle_direction(is_M4); set_spindle_direction(is_M4);
@ -329,7 +330,7 @@ void _lcd_preheat(const int16_t endnum, const int16_t temph, const int16_t tempb
MENU_BACK(MSG_MAIN); MENU_BACK(MSG_MAIN);
if (spindle_laser_enabled()) { if (spindle_laser_enabled()) {
#if ENABLED(SPINDLE_LASER_PWM) #if ENABLED(SPINDLE_LASER_PWM)
MENU_ITEM_EDIT_CALLBACK(int3, MSG_LASER_POWER, &spindle_laser_power, SPEED_POWER_MIN, SPEED_POWER_MAX, update_spindle_laser_power); MENU_ITEM_EDIT_CALLBACK(uint8, MSG_LASER_POWER, &spindle_laser_power, SPEED_POWER_MIN, SPEED_POWER_MAX, update_spindle_laser_power);
#endif #endif
MENU_ITEM(function, MSG_LASER_OFF, _lcd_spindle_laser_off); MENU_ITEM(function, MSG_LASER_OFF, _lcd_spindle_laser_off);
} }

2
Marlin/src/libs/numtostr.h
View File

@ -27,7 +27,7 @@
char* ui8tostr4pct(const uint8_t i); char* ui8tostr4pct(const uint8_t i);
// Convert uint8_t to string with 123 format // Convert uint8_t to string with 123 format
char* ui8tostr3(const uint8_t x); char* ui8tostr3(const uint8_t i);
// Convert int8_t to string with 123 format // Convert int8_t to string with 123 format
char* i8tostr3(const int8_t x); char* i8tostr3(const int8_t x);

2
buildroot/share/tests/megaatmega2560-tests
View File

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

Write Preview
Loading…
Cancel
Save