Browse Source

Define AVR_ATmega2560_FAMILY_PLUS_70 in Conditionals

Scott Lahteine 7 years ago
parent
commit
e587f0893c

+ 2
- 5
Marlin/src/HAL/HAL_AVR/HAL_pinsDebug_AVR.h View File

23
 #ifndef _HAL_PINSDEBUG_AVR_H_
23
 #ifndef _HAL_PINSDEBUG_AVR_H_
24
 #define _HAL_PINSDEBUG_AVR_H_
24
 #define _HAL_PINSDEBUG_AVR_H_
25
 
25
 
26
+#include "../../inc/MarlinConfig.h"
27
+
26
 void HAL_print_analog_pin(char buffer[], int8_t pin) {
28
 void HAL_print_analog_pin(char buffer[], int8_t pin) {
27
   sprintf(buffer, "(A%2d)  ", int(pin - analogInputToDigitalPin(0)));
29
   sprintf(buffer, "(A%2d)  ", int(pin - analogInputToDigitalPin(0)));
28
 }
30
 }
111
 
113
 
112
 };
114
 };
113
 
115
 
114
-#define AVR_ATmega2560_FAMILY_PLUS_70 (MOTHERBOARD == BOARD_BQ_ZUM_MEGA_3D \
115
-|| MOTHERBOARD == BOARD_MIGHTYBOARD_REVE \
116
-|| MOTHERBOARD == BOARD_MINIRAMBO \
117
-|| MOTHERBOARD == BOARD_SCOOVO_X9H)
118
-
119
 #if AVR_AT90USB1286_FAMILY
116
 #if AVR_AT90USB1286_FAMILY
120
   // Working with Teensyduino extension so need to re-define some things
117
   // Working with Teensyduino extension so need to re-define some things
121
   #include "pinsDebug_Teensyduino.h"
118
   #include "pinsDebug_Teensyduino.h"

+ 1
- 4
Marlin/src/HAL/HAL_AVR/pinsDebug_AVR_8_bit.h View File

27
 #ifndef _PINSDEBUG_AVR_8_BIT_
27
 #ifndef _PINSDEBUG_AVR_8_BIT_
28
 #define _PINSDEBUG_AVR_8_BIT_
28
 #define _PINSDEBUG_AVR_8_BIT_
29
 
29
 
30
-#define AVR_ATmega2560_FAMILY_PLUS_70 (MOTHERBOARD == BOARD_BQ_ZUM_MEGA_3D \
31
-|| MOTHERBOARD == BOARD_MIGHTYBOARD_REVE \
32
-|| MOTHERBOARD == BOARD_MINIRAMBO \
33
-|| MOTHERBOARD == BOARD_SCOOVO_X9H)
30
+#include "../../inc/MarlinConfig.h"
34
 
31
 
35
 #if AVR_AT90USB1286_FAMILY
32
 #if AVR_AT90USB1286_FAMILY
36
   // Working with Teensyduino extension so need to re-define some things
33
   // Working with Teensyduino extension so need to re-define some things

+ 7
- 0
Marlin/src/inc/Conditionals_post.h View File

28
 #ifndef CONDITIONALS_POST_H
28
 #ifndef CONDITIONALS_POST_H
29
 #define CONDITIONALS_POST_H
29
 #define CONDITIONALS_POST_H
30
 
30
 
31
+  #define AVR_ATmega2560_FAMILY_PLUS_70 ( \
32
+       MB(BQ_ZUM_MEGA_3D)                 \
33
+    || MB(MIGHTYBOARD_REVE)               \
34
+    || MB(MINIRAMBO)                      \
35
+    || MB(SCOOVO_X9H)                     \
36
+  )
37
+
31
   #define IS_SCARA (ENABLED(MORGAN_SCARA) || ENABLED(MAKERARM_SCARA))
38
   #define IS_SCARA (ENABLED(MORGAN_SCARA) || ENABLED(MAKERARM_SCARA))
32
   #define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA)
39
   #define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA)
33
   #define IS_CARTESIAN !IS_KINEMATIC
40
   #define IS_CARTESIAN !IS_KINEMATIC

Loading…
Cancel
Save