CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Define AVR_ATmega2560_FAMILY_PLUS_70 in Conditionals

Browse Source
This commit is contained in:
Scott Lahteine 2017-10-14 19:05:32 -05:00
parent fd128b3c93
commit e587f0893c
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/src/HAL/HAL_AVR/HAL_pinsDebug_AVR.h
View File

@ -23,6 +23,8 @@
#ifndef _HAL_PINSDEBUG_AVR_H_ #ifndef _HAL_PINSDEBUG_AVR_H_
#define _HAL_PINSDEBUG_AVR_H_ #define _HAL_PINSDEBUG_AVR_H_
#include "../../inc/MarlinConfig.h"
void HAL_print_analog_pin(char buffer[], int8_t pin) { void HAL_print_analog_pin(char buffer[], int8_t pin) {
sprintf(buffer, "(A%2d) ", int(pin - analogInputToDigitalPin(0))); sprintf(buffer, "(A%2d) ", int(pin - analogInputToDigitalPin(0)));
} }
@ -111,11 +113,6 @@ const PinInfo pin_array[] PROGMEM = {
}; };
#define AVR_ATmega2560_FAMILY_PLUS_70 (MOTHERBOARD == BOARD_BQ_ZUM_MEGA_3D \
|| MOTHERBOARD == BOARD_MIGHTYBOARD_REVE \
|| MOTHERBOARD == BOARD_MINIRAMBO \
|| MOTHERBOARD == BOARD_SCOOVO_X9H)
#if AVR_AT90USB1286_FAMILY #if AVR_AT90USB1286_FAMILY
// Working with Teensyduino extension so need to re-define some things // Working with Teensyduino extension so need to re-define some things
#include "pinsDebug_Teensyduino.h" #include "pinsDebug_Teensyduino.h"

5
Marlin/src/HAL/HAL_AVR/pinsDebug_AVR_8_bit.h
View File

@ -27,10 +27,7 @@
#ifndef _PINSDEBUG_AVR_8_BIT_ #ifndef _PINSDEBUG_AVR_8_BIT_
#define _PINSDEBUG_AVR_8_BIT_ #define _PINSDEBUG_AVR_8_BIT_
#define AVR_ATmega2560_FAMILY_PLUS_70 (MOTHERBOARD == BOARD_BQ_ZUM_MEGA_3D \ #include "../../inc/MarlinConfig.h"
|| MOTHERBOARD == BOARD_MIGHTYBOARD_REVE \
|| MOTHERBOARD == BOARD_MINIRAMBO \
|| MOTHERBOARD == BOARD_SCOOVO_X9H)
#if AVR_AT90USB1286_FAMILY #if AVR_AT90USB1286_FAMILY
// Working with Teensyduino extension so need to re-define some things // Working with Teensyduino extension so need to re-define some things

7
Marlin/src/inc/Conditionals_post.h
View File

@ -28,6 +28,13 @@
#ifndef CONDITIONALS_POST_H #ifndef CONDITIONALS_POST_H
#define CONDITIONALS_POST_H #define CONDITIONALS_POST_H
#define AVR_ATmega2560_FAMILY_PLUS_70 ( \
MB(BQ_ZUM_MEGA_3D) \
|| MB(MIGHTYBOARD_REVE) \
|| MB(MINIRAMBO) \
|| MB(SCOOVO_X9H) \
)
#define IS_SCARA (ENABLED(MORGAN_SCARA) || ENABLED(MAKERARM_SCARA)) #define IS_SCARA (ENABLED(MORGAN_SCARA) || ENABLED(MAKERARM_SCARA))
#define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA) #define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA)
#define IS_CARTESIAN !IS_KINEMATIC #define IS_CARTESIAN !IS_KINEMATIC