Quellcode durchsuchen

Clean up pins self-checks

Scott Lahteine vor 5 Jahren
Ursprung
Commit
fdaa374490

+ 1
- 3
Marlin/src/pins/mega/pins_MEGACONTROLLER.h Datei anzeigen

27
 
27
 
28
 #ifndef __AVR_ATmega2560__
28
 #ifndef __AVR_ATmega2560__
29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
30
-#endif
31
-
32
-#if HOTENDS > 2 || E_STEPPERS > 2
30
+#elif HOTENDS > 2 || E_STEPPERS > 2
33
   #error "Mega Controller supports up to 2 hotends / E-steppers. Comment out this line to continue."
31
   #error "Mega Controller supports up to 2 hotends / E-steppers. Comment out this line to continue."
34
 #endif
32
 #endif
35
 
33
 

+ 1
- 3
Marlin/src/pins/mega/pins_MINITRONICS.h Datei anzeigen

34
 
34
 
35
 #ifndef __AVR_ATmega1281__
35
 #ifndef __AVR_ATmega1281__
36
   #error "Oops! Select 'Minitronics' in 'Tools > Board.'"
36
   #error "Oops! Select 'Minitronics' in 'Tools > Board.'"
37
-#endif
38
-
39
-#if HOTENDS > 2 || E_STEPPERS > 2
37
+#elif HOTENDS > 2 || E_STEPPERS > 2
40
   #error "Minitronics supports up to 2 hotends / E-steppers. Comment out this line to continue."
38
   #error "Minitronics supports up to 2 hotends / E-steppers. Comment out this line to continue."
41
 #endif
39
 #endif
42
 
40
 

+ 1
- 3
Marlin/src/pins/ramps/pins_AZTEEG_X3.h Datei anzeigen

27
 
27
 
28
 #ifndef __AVR_ATmega2560__
28
 #ifndef __AVR_ATmega2560__
29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
30
-#endif
31
-
32
-#if HOTENDS > 2 || E_STEPPERS > 2
30
+#elif HOTENDS > 2 || E_STEPPERS > 2
33
   #error "Azteeg X3 supports up to 2 hotends / E-steppers. Comment out this line to continue."
31
   #error "Azteeg X3 supports up to 2 hotends / E-steppers. Comment out this line to continue."
34
 #endif
32
 #endif
35
 
33
 

+ 1
- 3
Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h Datei anzeigen

27
 
27
 
28
 #ifndef __AVR_ATmega2560__
28
 #ifndef __AVR_ATmega2560__
29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
30
-#endif
31
-
32
-#if HOTENDS > 5 || E_STEPPERS > 5
30
+#elif HOTENDS > 5 || E_STEPPERS > 5
33
   #error "Azteeg X3 Pro supports up to 5 hotends / E-steppers. Comment out this line to continue."
31
   #error "Azteeg X3 Pro supports up to 5 hotends / E-steppers. Comment out this line to continue."
34
 #endif
32
 #endif
35
 
33
 

+ 1
- 3
Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h Datei anzeigen

27
 
27
 
28
 #ifndef __AVR_ATmega2560__
28
 #ifndef __AVR_ATmega2560__
29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
30
-#endif
31
-
32
-#if HOTENDS > 3 || E_STEPPERS > 3
30
+#elif HOTENDS > 3 || E_STEPPERS > 3
33
   #error "Formbot supports up to 3 hotends / E-steppers. Comment out this line to continue."
31
   #error "Formbot supports up to 3 hotends / E-steppers. Comment out this line to continue."
34
 #endif
32
 #endif
35
 
33
 

+ 1
- 3
Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h Datei anzeigen

27
 
27
 
28
 #ifndef __AVR_ATmega2560__
28
 #ifndef __AVR_ATmega2560__
29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
30
-#endif
31
-
32
-#if HOTENDS > 2 || E_STEPPERS > 2
30
+#elif HOTENDS > 2 || E_STEPPERS > 2
33
   #error "Formbot supports up to 2 hotends / E-steppers. Comment out this line to continue."
31
   #error "Formbot supports up to 2 hotends / E-steppers. Comment out this line to continue."
34
 #endif
32
 #endif
35
 
33
 

+ 1
- 3
Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h Datei anzeigen

27
 
27
 
28
 #ifndef __AVR_ATmega2560__
28
 #ifndef __AVR_ATmega2560__
29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
30
-#endif
31
-
32
-#if HOTENDS > 2 || E_STEPPERS > 2
30
+#elif HOTENDS > 2 || E_STEPPERS > 2
33
   #error "Formbot supports up to 2 hotends / E-steppers. Comment out this line to continue."
31
   #error "Formbot supports up to 2 hotends / E-steppers. Comment out this line to continue."
34
 #endif
32
 #endif
35
 
33
 

+ 1
- 3
Marlin/src/pins/ramps/pins_RUMBA.h Datei anzeigen

27
 
27
 
28
 #ifndef __AVR_ATmega2560__
28
 #ifndef __AVR_ATmega2560__
29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
30
-#endif
31
-
32
-#if HOTENDS > 3 || E_STEPPERS > 3
30
+#elif HOTENDS > 3 || E_STEPPERS > 3
33
   #error "RUMBA supports up to 3 hotends / E-steppers. Comment out this line to continue."
31
   #error "RUMBA supports up to 3 hotends / E-steppers. Comment out this line to continue."
34
 #endif
32
 #endif
35
 
33
 

+ 1
- 3
Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h Datei anzeigen

27
 
27
 
28
 #ifndef __AVR_ATmega2560__
28
 #ifndef __AVR_ATmega2560__
29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
30
-#endif
31
-
32
-#if HOTENDS > 2 || E_STEPPERS > 2
30
+#elif HOTENDS > 2 || E_STEPPERS > 2
33
   #error "TRONXY-V3-1.0 supports only 2 hotends/E-steppers. Comment out this line to continue."
31
   #error "TRONXY-V3-1.0 supports only 2 hotends/E-steppers. Comment out this line to continue."
34
 #endif
32
 #endif
35
 
33
 

+ 2
- 4
Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h Datei anzeigen

25
  *  Z-Bolt X Series board – based on Arduino Mega2560
25
  *  Z-Bolt X Series board – based on Arduino Mega2560
26
  */
26
  */
27
 
27
 
28
-#if HOTENDS > 4 || E_STEPPERS > 4
29
-  #error "Z-Bolt X Series board supports up to 4 hotends / E-steppers."
30
-#endif
31
-
32
 #if !defined(__AVR_ATmega2560__)
28
 #if !defined(__AVR_ATmega2560__)
33
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
30
+#elif HOTENDS > 4 || E_STEPPERS > 4
31
+  #error "Z-Bolt X Series board supports up to 4 hotends / E-steppers."
34
 #endif
32
 #endif
35
 
33
 
36
 #define BOARD_NAME "Z-Bolt X Series"
34
 #define BOARD_NAME "Z-Bolt X Series"

+ 2
- 4
Marlin/src/pins/stm32/pins_ARMED.h Datei anzeigen

23
 
23
 
24
 #ifndef STM32F4
24
 #ifndef STM32F4
25
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
25
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
26
+#elif HOTENDS > 2 || E_STEPPERS > 2
27
+  #error "Arm'ed supports up to 2 hotends / E-steppers."
26
 #endif
28
 #endif
27
 
29
 
28
 #ifndef ARMED_V1_0
30
 #ifndef ARMED_V1_0
38
 #undef E2END // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
40
 #undef E2END // Defined in Arduino Core STM32 to be used with EEPROM emulation. This board uses a real EEPROM.
39
 #define E2END 0xFFF // 4KB
41
 #define E2END 0xFFF // 4KB
40
 
42
 
41
-#if HOTENDS > 2 || E_STEPPERS > 2
42
-  #error "Arm'ed supports up to 2 hotends / E-steppers."
43
-#endif
44
-
45
 //
43
 //
46
 // Limit Switches
44
 // Limit Switches
47
 //
45
 //

+ 1
- 3
Marlin/src/pins/stm32/pins_BIGTREE_SKR_PRO_V1.1.h Datei anzeigen

23
 
23
 
24
 #ifndef TARGET_STM32F4
24
 #ifndef TARGET_STM32F4
25
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
25
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
26
-#endif
27
-
28
-#if HOTENDS > 3 || E_STEPPERS > 3
26
+#elif HOTENDS > 3 || E_STEPPERS > 3
29
   #error "BIGTREE SKR Pro V1.1 supports up to 3 hotends / E-steppers."
27
   #error "BIGTREE SKR Pro V1.1 supports up to 3 hotends / E-steppers."
30
 #endif
28
 #endif
31
 
29
 

+ 2
- 4
Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h Datei anzeigen

31
 
31
 
32
 #if !defined(STM32F4) && !defined(STM32F4xx)
32
 #if !defined(STM32F4) && !defined(STM32F4xx)
33
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
33
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
34
+#elif HOTENDS > 2 || E_STEPPERS > 2
35
+  #error "Black STM32F4VET6 supports up to 2 hotends / E-steppers."
34
 #endif
36
 #endif
35
 
37
 
36
 #ifndef BOARD_NAME
38
 #ifndef BOARD_NAME
43
 //#define E2END 0x1FFF // 8KB
45
 //#define E2END 0x1FFF // 8KB
44
 #define SRAM_EEPROM_EMULATION
46
 #define SRAM_EEPROM_EMULATION
45
 
47
 
46
-#if HOTENDS > 2 || E_STEPPERS > 2
47
-  #error "Black STM32F4VET6 supports up to 2 hotends / E-steppers."
48
-#endif
49
-
50
 //
48
 //
51
 // Servos
49
 // Servos
52
 //
50
 //

+ 1
- 3
Marlin/src/pins/stm32/pins_MKS_ROBIN.h Datei anzeigen

27
 
27
 
28
 #ifndef __STM32F1__
28
 #ifndef __STM32F1__
29
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
29
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
30
-#endif
31
-
32
-#if HOTENDS > 2 || E_STEPPERS > 2
30
+#elif HOTENDS > 2 || E_STEPPERS > 2
33
   #error "MKS Robin supports up to 2 hotends / E-steppers. Comment out this line to continue."
31
   #error "MKS Robin supports up to 2 hotends / E-steppers. Comment out this line to continue."
34
 #endif
32
 #endif
35
 
33
 

+ 1
- 3
Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h Datei anzeigen

27
 
27
 
28
 #ifndef __STM32F1__
28
 #ifndef __STM32F1__
29
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
29
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
30
-#endif
31
-
32
-#if HOTENDS > 1 || E_STEPPERS > 1
30
+#elif HOTENDS > 1 || E_STEPPERS > 1
33
   #error "MKS Robin mini supports up to 1 hotends / E-steppers. Comment out this line to continue."
31
   #error "MKS Robin mini supports up to 1 hotends / E-steppers. Comment out this line to continue."
34
 #endif
32
 #endif
35
 
33
 

+ 1
- 3
Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h Datei anzeigen

27
 
27
 
28
 #ifndef __STM32F1__
28
 #ifndef __STM32F1__
29
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
29
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
30
-#endif
31
-
32
-#if HOTENDS > 2 || E_STEPPERS > 2
30
+#elif HOTENDS > 2 || E_STEPPERS > 2
33
   #error "MKS Robin nano supports up to 2 hotends / E-steppers. Comment out this line to continue."
31
   #error "MKS Robin nano supports up to 2 hotends / E-steppers. Comment out this line to continue."
34
 #endif
32
 #endif
35
 
33
 

+ 2
- 4
Marlin/src/pins/stm32/pins_RUMBA32.h Datei anzeigen

23
 
23
 
24
 #ifndef STM32F4
24
 #ifndef STM32F4
25
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
25
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
26
+#elif HOTENDS > 3 || E_STEPPERS > 3
27
+  #error "RUMBA32 supports up to 3 hotends / E-steppers."
26
 #endif
28
 #endif
27
 
29
 
28
 #define RUMBA32_V1_0
30
 #define RUMBA32_V1_0
32
 //#define I2C_EEPROM
34
 //#define I2C_EEPROM
33
 #define E2END 0xFFF // 4KB
35
 #define E2END 0xFFF // 4KB
34
 
36
 
35
-#if HOTENDS > 3 || E_STEPPERS > 3
36
-  #error "RUMBA32 supports up to 3 hotends / E-steppers."
37
-#endif
38
-
39
 //
37
 //
40
 // Limit Switches
38
 // Limit Switches
41
 //
39
 //

+ 2
- 4
Marlin/src/pins/stm32/pins_STM32F4.h Datei anzeigen

23
 
23
 
24
 #if !defined(STM32F4) && !defined(STM32F4xx)
24
 #if !defined(STM32F4) && !defined(STM32F4xx)
25
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
25
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
26
+#elif HOTENDS > 2 || E_STEPPERS > 2
27
+  #error "STM32F4 supports up to 2 hotends / E-steppers."
26
 #endif
28
 #endif
27
 
29
 
28
 #define BOARD_NAME           "Misc. STM32F4"
30
 #define BOARD_NAME           "Misc. STM32F4"
35
 // Ignore temp readings during development.
37
 // Ignore temp readings during development.
36
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
38
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
37
 
39
 
38
-#if HOTENDS > 2 || E_STEPPERS > 2
39
-  #error "STM32F4 supports up to 2 hotends / E-steppers."
40
-#endif
41
-
42
 //
40
 //
43
 // Limit Switches
41
 // Limit Switches
44
 //
42
 //

+ 2
- 4
Marlin/src/pins/stm32/pins_THE_BORG.h Datei anzeigen

23
 
23
 
24
 #if !defined(STM32F7)
24
 #if !defined(STM32F7)
25
   #error "Oops! Select an STM32F7 board in 'Tools > Board.'"
25
   #error "Oops! Select an STM32F7 board in 'Tools > Board.'"
26
+#elif HOTENDS > 3 || E_STEPPERS > 3
27
+  #error "The-Borg supports up to 3 hotends / E-steppers."
26
 #endif
28
 #endif
27
 
29
 
28
 #define BOARD_NAME           "The-Borge"
30
 #define BOARD_NAME           "The-Borge"
33
 // Ignore temp readings during development.
35
 // Ignore temp readings during development.
34
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
36
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
35
 
37
 
36
-#if HOTENDS > 3 || E_STEPPERS > 3
37
-  #error "The-Borg supports up to 3 hotends / E-steppers."
38
-#endif
39
-
40
 //
38
 //
41
 // Limit Switches
39
 // Limit Switches
42
 //
40
 //

Laden…
Abbrechen
Speichern