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

Merge PR #1767

Browse Source
This commit is contained in:
Richard Wackerbarth 2015-06-06 19:00:27 -05:00
commit 3eea5222cf
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/boards.h
View File

@ -42,7 +42,7 @@
#define BOARD_GEN3_MONOLITHIC 22 // Gen3 Monolithic Electronics #define BOARD_GEN3_MONOLITHIC 22 // Gen3 Monolithic Electronics
#define BOARD_MEGATRONICS 70 // Megatronics #define BOARD_MEGATRONICS 70 // Megatronics
#define BOARD_MEGATRONICS_2 701 // Megatronics v2.0 #define BOARD_MEGATRONICS_2 701 // Megatronics v2.0
#define BOARD_MEGATRONICS_1 702 // Minitronics v1.0 #define BOARD_MINITRONICS 702 // Minitronics v1.0/1.1
#define BOARD_MEGATRONICS_3 703 // Megatronics v3.0 #define BOARD_MEGATRONICS_3 703 // Megatronics v3.0
#define BOARD_OMCA_A 90 // Alpha OMCA board #define BOARD_OMCA_A 90 // Alpha OMCA board
#define BOARD_OMCA 91 // Final OMCA board #define BOARD_OMCA 91 // Final OMCA board

4
Marlin/pins.h
View File

@ -86,8 +86,8 @@
#include "pins_GEN3_MONOLITHIC.h" #include "pins_GEN3_MONOLITHIC.h"
#elif MB(MEGATRONICS) #elif MB(MEGATRONICS)
#include "pins_MEGATRONICS.h" #include "pins_MEGATRONICS.h"
#elif MB(MEGATRONICS_1) #elif MB(MINITRONICS)
#include "pins_MEGATRONICS_1.h" #include "pins_MINITRONICS.h"
#elif MB(MEGATRONICS_2) #elif MB(MEGATRONICS_2)
#include "pins_MEGATRONICS_2.h" #include "pins_MEGATRONICS_2.h"
#elif MB(MEGATRONICS_3) #elif MB(MEGATRONICS_3)

2
Marlin/pins_MEGATRONICS_1.h → Marlin/pins_MINITRONICS.h
View File

@ -1,5 +1,5 @@
/** /**
* Minitronics v1.0 pin assignments * Minitronics v1.0/1.1 pin assignments
*/ */
#ifndef __AVR_ATmega1281__ #ifndef __AVR_ATmega1281__