Explorar el Código

🐛 Fix env validation for 1280/2560 boards (#22150)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Victor Oliveira hace 2 años
padre
commit
dd9f91f0f0
No account linked to committer's email address
Se han modificado 1 ficheros con 6 adiciones y 4 borrados
  1. 6
    4
      Marlin/src/pins/mega/env_validate.h

+ 6
- 4
Marlin/src/pins/mega/env_validate.h Ver fichero

@@ -21,10 +21,12 @@
21 21
  */
22 22
 #pragma once
23 23
 
24
-#if ENABLED(ALLOW_MEGA1280) && NOT_TARGET(__AVR_ATmega1280__, __AVR_ATmega2560__)
25
-  #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560 or 1280' in 'Tools > Board.'"
26
-#elif NOT_TARGET(__AVR_ATmega2560__)
27
-  #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
24
+#if NOT_TARGET(__AVR_ATmega2560__)
25
+  #if DISABLED(ALLOW_MEGA1280)
26
+    #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
27
+  #elif NOT_TARGET(__AVR_ATmega1280__)
28
+    #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560 or 1280' in 'Tools > Board.'"
29
+  #endif
28 30
 #endif
29 31
 
30 32
 #undef ALLOW_MEGA1280

Loading…
Cancelar
Guardar