thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge PR #1767

Richard Wackerbarth 10 years ago
parent
10733a2bb0 6d0e91328d
commit
3eea5222cf
3 changed files with 4 additions and 4 deletions
Unified View Show Diff Stats
  1. 1
    1
      Marlin/boards.h
  2. 2
    2
      Marlin/pins.h
  3. 1
    1
      Marlin/pins_MINITRONICS.h

+ 1
- 1
Marlin/boards.h View File

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

+ 2
- 2
Marlin/pins.h View File

86 
   #include "pins_GEN3_MONOLITHIC.h"
 86 
   #include "pins_GEN3_MONOLITHIC.h"
87 
 #elif MB(MEGATRONICS)
 87 
 #elif MB(MEGATRONICS)
88 
   #include "pins_MEGATRONICS.h"
 88 
   #include "pins_MEGATRONICS.h"
89 
-#elif MB(MEGATRONICS_1)
90 
-  #include "pins_MEGATRONICS_1.h"
89 
+#elif MB(MINITRONICS)
90 
+  #include "pins_MINITRONICS.h"
91 
 #elif MB(MEGATRONICS_2)
 91 
 #elif MB(MEGATRONICS_2)
92 
   #include "pins_MEGATRONICS_2.h"
 92 
   #include "pins_MEGATRONICS_2.h"
93 
 #elif MB(MEGATRONICS_3)
 93 
 #elif MB(MEGATRONICS_3)

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

1 
 /**
 1 
 /**
2 
- * Minitronics v1.0 pin assignments
2 
+ * Minitronics v1.0/1.1 pin assignments
3 
  */
 3 
  */
4
4
5 
 #ifndef __AVR_ATmega1281__
 5 
 #ifndef __AVR_ATmega1281__

Write Preview
Loading…
Cancel
Save