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

Use MB() for Megatronics 3.1

Browse Source
This commit is contained in:
Scott Lahteine 2017-12-08 23:35:25 -06:00
parent a2ac452ef9
commit c40cb52342
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/src/pins/pins.h
View File

@ -151,10 +151,7 @@
#include "pins_MEGATRONICS.h" // ATmega2560 #include "pins_MEGATRONICS.h" // ATmega2560
#elif MB(MEGATRONICS_2) #elif MB(MEGATRONICS_2)
#include "pins_MEGATRONICS_2.h" // ATmega2560 #include "pins_MEGATRONICS_2.h" // ATmega2560
#elif MB(MEGATRONICS_3) #elif MB(MEGATRONICS_3) || MB(MEGATRONICS_31)
#include "pins_MEGATRONICS_3.h" // ATmega2560
#elif MB(MEGATRONICS_31)
#define MEGATRONICS_31
#include "pins_MEGATRONICS_3.h" // ATmega2560 #include "pins_MEGATRONICS_3.h" // ATmega2560
#elif MB(RAMBO) #elif MB(RAMBO)
#include "pins_RAMBO.h" // ATmega2560 #include "pins_RAMBO.h" // ATmega2560

14
Marlin/src/pins/pins_MEGATRONICS_3.h
View File

@ -21,19 +21,17 @@
*/ */
/** /**
* MegaTronics v3.0 pin assignments * MegaTronics v3.0 / v3.1 pin assignments
*/ */
#ifndef __AVR_ATmega2560__ #ifndef __AVR_ATmega2560__
#error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu."
#endif #endif
#define MEGATRONICS_31 #if MB(MEGATRONICS_31)
#define BOARD_NAME "Megatronics v3.1"
#if ENABLED(MEGATRONICS_31)
#define BOARD_NAME "Megatronics v3.1"
#else #else
#define BOARD_NAME "Megatronics v3.0" #define BOARD_NAME "Megatronics v3.0"
#endif #endif
// //
@ -161,10 +159,8 @@
#define SHIFT_OUT 34 #define SHIFT_OUT 34
#define SHIFT_EN 44 #define SHIFT_EN 44
#if ENABLED(MEGATRONICS_31) #if MB(MEGATRONICS_31)
#define SD_DETECT_PIN 56 #define SD_DETECT_PIN 56
#else
#define SD_DETECT_PIN -1
#endif #endif
#endif #endif