Ver código fonte

Clean up old externs / includes

Scott Lahteine 4 anos atrás
pai
commit
94291eb59f
2 arquivos alterados com 7 adições e 17 exclusões
  1. 0
    10
      Marlin/src/MarlinCore.h
  2. 7
    7
      Marlin/src/module/stepper/L64xx.h

+ 0
- 10
Marlin/src/MarlinCore.h Ver arquivo

@@ -31,11 +31,6 @@
31 31
 #include <stdio.h>
32 32
 #include <stdlib.h>
33 33
 
34
-#if HAS_L64XX
35
-  #include "libs/L64XX/L64XX_Marlin.h"
36
-  extern uint8_t axis_known_position;
37
-#endif
38
-
39 34
 void stop();
40 35
 
41 36
 // Pass true to keep steppers from timing out
@@ -95,10 +90,6 @@ extern bool wait_for_heatup;
95 90
 // Inactivity shutdown timer
96 91
 extern millis_t max_inactive_time, stepper_inactive_time;
97 92
 
98
-#if ENABLED(USE_CONTROLLER_FAN)
99
-  extern uint8_t controllerfan_speed;
100
-#endif
101
-
102 93
 #if ENABLED(PSU_CONTROL)
103 94
   extern bool powersupply_on;
104 95
   #define PSU_PIN_ON()  do{ OUT_WRITE(PS_ON_PIN,  PSU_ACTIVE_HIGH); powersupply_on = true; }while(0)
@@ -127,4 +118,3 @@ void protected_pin_err();
127 118
 extern const char NUL_STR[], M112_KILL_STR[], G28_STR[], M21_STR[], M23_STR[], M24_STR[],
128 119
                   SP_P_STR[], SP_T_STR[], SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_E_STR[],
129 120
                   X_LBL[], Y_LBL[], Z_LBL[], E_LBL[], SP_X_LBL[], SP_Y_LBL[], SP_Z_LBL[], SP_E_LBL[];
130
-

+ 7
- 7
Marlin/src/module/stepper/L64xx.h Ver arquivo

@@ -221,7 +221,7 @@
221 221
     #define E0_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E0, STATE)
222 222
     #define E0_DIR_READ()        (stepper##E0.getStatus() & STATUS_DIR);
223 223
     #if AXIS_DRIVER_TYPE_E0(L6470)
224
-      #define DISABLE_STEPPER_E0() do{ stepperE0.free(); CBI(axis_known_position, E_AXIS); }while(0)
224
+      #define DISABLE_STEPPER_E0() do{ stepperE0.free(); }while(0)
225 225
     #endif
226 226
   #endif
227 227
 #endif
@@ -241,7 +241,7 @@
241 241
     #define E1_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E1, STATE)
242 242
     #define E1_DIR_READ()        (stepper##E1.getStatus() & STATUS_DIR);
243 243
     #if AXIS_DRIVER_TYPE_E1(L6470)
244
-      #define DISABLE_STEPPER_E1() do{ stepperE1.free(); CBI(axis_known_position, E_AXIS); }while(0)
244
+      #define DISABLE_STEPPER_E1() do{ stepperE1.free(); }while(0)
245 245
     #endif
246 246
   #endif
247 247
 #endif
@@ -261,7 +261,7 @@
261 261
     #define E2_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E2, STATE)
262 262
     #define E2_DIR_READ()        (stepper##E2.getStatus() & STATUS_DIR);
263 263
     #if AXIS_DRIVER_TYPE_E2(L6470)
264
-      #define DISABLE_STEPPER_E2() do{ stepperE2.free(); CBI(axis_known_position, E_AXIS); }while(0)
264
+      #define DISABLE_STEPPER_E2() do{ stepperE2.free(); }while(0)
265 265
     #endif
266 266
   #endif
267 267
 #endif
@@ -298,7 +298,7 @@
298 298
     #define E4_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E4, STATE)
299 299
     #define E4_DIR_READ()        (stepper##E4.getStatus() & STATUS_DIR);
300 300
     #if AXIS_DRIVER_TYPE_E4(L6470)
301
-      #define DISABLE_STEPPER_E4() do{ stepperE4.free(); CBI(axis_known_position, E_AXIS); }while(0)
301
+      #define DISABLE_STEPPER_E4() do{ stepperE4.free(); }while(0)
302 302
     #endif
303 303
   #endif
304 304
 #endif
@@ -318,7 +318,7 @@
318 318
     #define E5_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E5, STATE)
319 319
     #define E5_DIR_READ()        (stepper##E5.getStatus() & STATUS_DIR);
320 320
     #if AXIS_DRIVER_TYPE_E5(L6470)
321
-      #define DISABLE_STEPPER_E5() do{ stepperE5.free(); CBI(axis_known_position, E_AXIS); }while(0)
321
+      #define DISABLE_STEPPER_E5() do{ stepperE5.free(); }while(0)
322 322
     #endif
323 323
   #endif
324 324
 #endif
@@ -338,7 +338,7 @@
338 338
     #define E6_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E6, STATE)
339 339
     #define E6_DIR_READ()        (stepper##E6.getStatus() & STATUS_DIR);
340 340
     #if AXIS_DRIVER_TYPE_E6(L6470)
341
-      #define DISABLE_STEPPER_E6() do{ stepperE6.free(); CBI(axis_known_position, E_AXIS); }while(0)
341
+      #define DISABLE_STEPPER_E6() do{ stepperE6.free(); }while(0)
342 342
     #endif
343 343
   #endif
344 344
 #endif
@@ -358,7 +358,7 @@
358 358
     #define E7_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E7, STATE)
359 359
     #define E7_DIR_READ()        (stepper##E7.getStatus() & STATUS_DIR);
360 360
     #if AXIS_DRIVER_TYPE_E7(L6470)
361
-      #define DISABLE_STEPPER_E7() do{ stepperE7.free(); CBI(axis_known_position, E_AXIS); }while(0)
361
+      #define DISABLE_STEPPER_E7() do{ stepperE7.free(); }while(0)
362 362
     #endif
363 363
   #endif
364 364
 #endif

Carregando…
Cancelar
Salvar