瀏覽代碼

fix compile errors

================================

Changed to conditional compile for AT90USB issue
Bob-the-Kuhn 8 年之前
父節點
當前提交
9dda022705
共有 2 個文件被更改,包括 8 次插入4 次删除
  1. 5
    1
      Marlin/G26_Mesh_Validation_Tool.cpp
  2. 3
    3
      Marlin/Marlin_main.cpp

+ 5
- 1
Marlin/G26_Mesh_Validation_Tool.cpp 查看文件

137
   void set_destination_to_current();
137
   void set_destination_to_current();
138
   void set_current_to_destination();
138
   void set_current_to_destination();
139
   void prepare_move_to_destination();
139
   void prepare_move_to_destination();
140
-  void sync_plan_position_e();
140
+  #if AVR_AT90USB1286_FAMILY  // Teensyduino & Printrboard IDE extensions have compile errors without this
141
+    inline void sync_plan_position_e() { planner.set_e_position_mm(current_position[E_AXIS]); }
142
+  #else
143
+    void sync_plan_position_e();
144
+  #endif
141
   #if ENABLED(NEWPANEL)
145
   #if ENABLED(NEWPANEL)
142
     void lcd_setstatusPGM(const char* const message, const int8_t level);
146
     void lcd_setstatusPGM(const char* const message, const int8_t level);
143
     void chirp_at_user();
147
     void chirp_at_user();

+ 3
- 3
Marlin/Marlin_main.cpp 查看文件

5895
 
5895
 
5896
     if (!DEBUGGING(DRYRUN) && unload_length != 0) {
5896
     if (!DEBUGGING(DRYRUN) && unload_length != 0) {
5897
       #if ENABLED(PREVENT_COLD_EXTRUSION)
5897
       #if ENABLED(PREVENT_COLD_EXTRUSION)
5898
-        if (!thermalManager.allow_cold_extrude && 
5898
+        if (!thermalManager.allow_cold_extrude &&
5899
             thermalManager.degTargetHotend(active_extruder) < thermalManager.extrude_min_temp) {
5899
             thermalManager.degTargetHotend(active_extruder) < thermalManager.extrude_min_temp) {
5900
           SERIAL_ERROR_START();
5900
           SERIAL_ERROR_START();
5901
           SERIAL_ERRORLNPGM(MSG_TOO_COLD_FOR_M600);
5901
           SERIAL_ERRORLNPGM(MSG_TOO_COLD_FOR_M600);
7659
       #endif
7659
       #endif
7660
     }
7660
     }
7661
 
7661
 
7662
-    #if ENABLED(AUTO_BED_LEVELING_UBL)
7662
+    #if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTRA_LCD)  //only needed if have an LCD
7663
       ubl_lcd_map_control = false;
7663
       ubl_lcd_map_control = false;
7664
       defer_return_to_status = false;
7664
       defer_return_to_status = false;
7665
     #endif
7665
     #endif
12442
     #if ENABLED(DISABLE_INACTIVE_E)
12442
     #if ENABLED(DISABLE_INACTIVE_E)
12443
       disable_e_steppers();
12443
       disable_e_steppers();
12444
     #endif
12444
     #endif
12445
-    #if ENABLED(AUTO_BED_LEVELING_UBL)
12445
+    #if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTRA_LCD)  //only needed if have an LCD
12446
       ubl_lcd_map_control = false;
12446
       ubl_lcd_map_control = false;
12447
       defer_return_to_status = false;
12447
       defer_return_to_status = false;
12448
     #endif
12448
     #endif

Loading…
取消
儲存