zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7062 from Bob-the-Kuhn/AT90USB---UBL-compile-error

Browse source 
Fix two UBL compile errors (one is AT90USB only and one affects all)
This commit is contained in:
Scott Lahteine 2017-06-15 14:22:27 -05:00 committed by GitHub
parent b3338ccb01 9dda022705
commit 50c2702ba5
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/G26_Mesh_Validation_Tool.cpp
View file

@ -137,7 +137,11 @@
void set_destination_to_current();
void set_current_to_destination();
void prepare_move_to_destination();
void sync_plan_position_e();
#if AVR_AT90USB1286_FAMILY // Teensyduino & Printrboard IDE extensions have compile errors without this
inline void sync_plan_position_e() { planner.set_e_position_mm(current_position[E_AXIS]); }
#else
void sync_plan_position_e();
#endif
#if ENABLED(NEWPANEL)
void lcd_setstatusPGM(const char* const message, const int8_t level);
void chirp_at_user();

6
Marlin/Marlin_main.cpp
View file

@ -5895,7 +5895,7 @@ inline void gcode_M17() {
if (!DEBUGGING(DRYRUN) && unload_length != 0) {
#if ENABLED(PREVENT_COLD_EXTRUSION)
if (!thermalManager.allow_cold_extrude &&
if (!thermalManager.allow_cold_extrude &&
thermalManager.degTargetHotend(active_extruder) < thermalManager.extrude_min_temp) {
SERIAL_ERROR_START();
SERIAL_ERRORLNPGM(MSG_TOO_COLD_FOR_M600);
@ -7659,7 +7659,7 @@ inline void gcode_M18_M84() {
#endif
}
#if ENABLED(AUTO_BED_LEVELING_UBL)
#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTRA_LCD) //only needed if have an LCD
ubl_lcd_map_control = false;
defer_return_to_status = false;
#endif
@ -12442,7 +12442,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
#if ENABLED(DISABLE_INACTIVE_E)
disable_e_steppers();
#endif
#if ENABLED(AUTO_BED_LEVELING_UBL)
#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTRA_LCD) //only needed if have an LCD
ubl_lcd_map_control = false;
defer_return_to_status = false;
#endif