Browse Source

Clean up old externs / includes

Scott Lahteine 4 years ago
parent
commit
94291eb59f
2 changed files with 7 additions and 17 deletions
  1. 0
    10
      Marlin/src/MarlinCore.h
  2. 7
    7
      Marlin/src/module/stepper/L64xx.h

+ 0
- 10
Marlin/src/MarlinCore.h View File

31
 #include <stdio.h>
31
 #include <stdio.h>
32
 #include <stdlib.h>
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
 void stop();
34
 void stop();
40
 
35
 
41
 // Pass true to keep steppers from timing out
36
 // Pass true to keep steppers from timing out
95
 // Inactivity shutdown timer
90
 // Inactivity shutdown timer
96
 extern millis_t max_inactive_time, stepper_inactive_time;
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
 #if ENABLED(PSU_CONTROL)
93
 #if ENABLED(PSU_CONTROL)
103
   extern bool powersupply_on;
94
   extern bool powersupply_on;
104
   #define PSU_PIN_ON()  do{ OUT_WRITE(PS_ON_PIN,  PSU_ACTIVE_HIGH); powersupply_on = true; }while(0)
95
   #define PSU_PIN_ON()  do{ OUT_WRITE(PS_ON_PIN,  PSU_ACTIVE_HIGH); powersupply_on = true; }while(0)
127
 extern const char NUL_STR[], M112_KILL_STR[], G28_STR[], M21_STR[], M23_STR[], M24_STR[],
118
 extern const char NUL_STR[], M112_KILL_STR[], G28_STR[], M21_STR[], M23_STR[], M24_STR[],
128
                   SP_P_STR[], SP_T_STR[], SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_E_STR[],
119
                   SP_P_STR[], SP_T_STR[], SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_E_STR[],
129
                   X_LBL[], Y_LBL[], Z_LBL[], E_LBL[], SP_X_LBL[], SP_Y_LBL[], SP_Z_LBL[], SP_E_LBL[];
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 View File

221
     #define E0_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E0, STATE)
221
     #define E0_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E0, STATE)
222
     #define E0_DIR_READ()        (stepper##E0.getStatus() & STATUS_DIR);
222
     #define E0_DIR_READ()        (stepper##E0.getStatus() & STATUS_DIR);
223
     #if AXIS_DRIVER_TYPE_E0(L6470)
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
     #endif
225
     #endif
226
   #endif
226
   #endif
227
 #endif
227
 #endif
241
     #define E1_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E1, STATE)
241
     #define E1_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E1, STATE)
242
     #define E1_DIR_READ()        (stepper##E1.getStatus() & STATUS_DIR);
242
     #define E1_DIR_READ()        (stepper##E1.getStatus() & STATUS_DIR);
243
     #if AXIS_DRIVER_TYPE_E1(L6470)
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
     #endif
245
     #endif
246
   #endif
246
   #endif
247
 #endif
247
 #endif
261
     #define E2_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E2, STATE)
261
     #define E2_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E2, STATE)
262
     #define E2_DIR_READ()        (stepper##E2.getStatus() & STATUS_DIR);
262
     #define E2_DIR_READ()        (stepper##E2.getStatus() & STATUS_DIR);
263
     #if AXIS_DRIVER_TYPE_E2(L6470)
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
     #endif
265
     #endif
266
   #endif
266
   #endif
267
 #endif
267
 #endif
298
     #define E4_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E4, STATE)
298
     #define E4_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E4, STATE)
299
     #define E4_DIR_READ()        (stepper##E4.getStatus() & STATUS_DIR);
299
     #define E4_DIR_READ()        (stepper##E4.getStatus() & STATUS_DIR);
300
     #if AXIS_DRIVER_TYPE_E4(L6470)
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
     #endif
302
     #endif
303
   #endif
303
   #endif
304
 #endif
304
 #endif
318
     #define E5_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E5, STATE)
318
     #define E5_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E5, STATE)
319
     #define E5_DIR_READ()        (stepper##E5.getStatus() & STATUS_DIR);
319
     #define E5_DIR_READ()        (stepper##E5.getStatus() & STATUS_DIR);
320
     #if AXIS_DRIVER_TYPE_E5(L6470)
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
     #endif
322
     #endif
323
   #endif
323
   #endif
324
 #endif
324
 #endif
338
     #define E6_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E6, STATE)
338
     #define E6_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E6, STATE)
339
     #define E6_DIR_READ()        (stepper##E6.getStatus() & STATUS_DIR);
339
     #define E6_DIR_READ()        (stepper##E6.getStatus() & STATUS_DIR);
340
     #if AXIS_DRIVER_TYPE_E6(L6470)
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
     #endif
342
     #endif
343
   #endif
343
   #endif
344
 #endif
344
 #endif
358
     #define E7_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E7, STATE)
358
     #define E7_DIR_WRITE(STATE)  L64XX_DIR_WRITE(E7, STATE)
359
     #define E7_DIR_READ()        (stepper##E7.getStatus() & STATUS_DIR);
359
     #define E7_DIR_READ()        (stepper##E7.getStatus() & STATUS_DIR);
360
     #if AXIS_DRIVER_TYPE_E7(L6470)
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
     #endif
362
     #endif
363
   #endif
363
   #endif
364
 #endif
364
 #endif

Loading…
Cancel
Save