ChibiOS pin defs: use only vendor if present (#22297)

This commit is contained in:
Ryan 2023-10-21 13:02:03 +10:00 committed by GitHub
parent e4c54a9612
commit 2b8d9f3193
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -24,8 +24,7 @@
/* Include the vendor specific pin defs */ /* Include the vendor specific pin defs */
#if __has_include_next("_pin_defs.h") #if __has_include_next("_pin_defs.h")
# include_next "_pin_defs.h" # include_next "_pin_defs.h"
#endif #else
# define A0 PAL_LINE(GPIOA, 0) # define A0 PAL_LINE(GPIOA, 0)
# define A1 PAL_LINE(GPIOA, 1) # define A1 PAL_LINE(GPIOA, 1)
# define A2 PAL_LINE(GPIOA, 2) # define A2 PAL_LINE(GPIOA, 2)
@ -271,6 +270,7 @@
# define J13 PAL_LINE(GPIOJ, 13) # define J13 PAL_LINE(GPIOJ, 13)
# define J14 PAL_LINE(GPIOJ, 14) # define J14 PAL_LINE(GPIOJ, 14)
# define J15 PAL_LINE(GPIOJ, 15) # define J15 PAL_LINE(GPIOJ, 15)
// Keyboards can `#define KEYBOARD_REQUIRES_GPIOK` if they need to access GPIO-K pins. These conflict with a whole // Keyboards can `#define KEYBOARD_REQUIRES_GPIOK` if they need to access GPIO-K pins. These conflict with a whole
// bunch of layout definitions, so it's intentionally left out unless absolutely required -- in that case, the // bunch of layout definitions, so it's intentionally left out unless absolutely required -- in that case, the
// keyboard designer should use a different symbol when defining their layout macros. // keyboard designer should use a different symbol when defining their layout macros.
@ -292,3 +292,4 @@
# define K14 PAL_LINE(GPIOK, 14) # define K14 PAL_LINE(GPIOK, 14)
# define K15 PAL_LINE(GPIOK, 15) # define K15 PAL_LINE(GPIOK, 15)
# endif # endif
#endif