Remove duplicate of SPI default config from keyboards (#25266)

docs/drivers/spi.md

@@ -39,8 +39,6 @@ To enable SPI, modify your board's `halconf.h` to enable SPI, then modify your b
 #pragma once
 
 #define HAL_USE_SPI TRUE // [!code focus]
-#define SPI_USE_WAIT TRUE // [!code focus]
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD // [!code focus]
 
 #include_next <halconf.h>
 ```

keyboards/adafruit/macropad/halconf.h

@@ -16,16 +16,7 @@
 
 #pragma once
 
-#include_next <halconf.h>
-
-#undef HAL_USE_SPI
 #define HAL_USE_SPI TRUE
-
-#undef SPI_USE_WAIT
-#define SPI_USE_WAIT TRUE
-
-#undef SPI_SELECT_MODE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
-#undef HAL_USE_PWM
 #define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>

keyboards/akko/5087/halconf.h

@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/akko/5108/halconf.h

@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/akko/acr87/halconf.h

@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/akko/top40/halconf.h

@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/annepro2/halconf.h

@@ -26,7 +26,5 @@
 #define SERIAL_USB_BUFFERS_SIZE 256
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h

@@ -21,7 +21,5 @@
 #define HAL_USE_PWM TRUE
 #define HAL_USE_SERIAL TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h

@@ -21,7 +21,5 @@
 #define HAL_USE_PWM TRUE
 #define HAL_USE_SERIAL TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h

@@ -21,7 +21,5 @@
 #define HAL_USE_PWM TRUE
 #define HAL_USE_SERIAL TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/bastardkb/scylla/blackpill/halconf.h

@@ -21,7 +21,5 @@
 #define HAL_USE_PWM TRUE
 #define HAL_USE_SERIAL TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/bastardkb/skeletyl/blackpill/halconf.h

@@ -21,7 +21,5 @@
 #define HAL_USE_PWM TRUE
 #define HAL_USE_SERIAL TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/bastardkb/tbkmini/blackpill/halconf.h

@@ -21,7 +21,5 @@
 #define HAL_USE_PWM TRUE
 #define HAL_USE_SERIAL TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/chosfox/cf81/halconf.h

@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/custommk/cmk11/halconf.h

@@ -20,11 +20,6 @@
 
 #define HAL_USE_SPI TRUE
 
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
 #define SERIAL_BUFFERS_SIZE 256
 
-// This enables interrupt-driven mode
-#define SPI_USE_WAIT TRUE
-
 #include_next <halconf.h>

keyboards/custommk/elysian/halconf.h

@@ -5,10 +5,6 @@
 
 #define HAL_USE_SPI TRUE
 
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
 #define SERIAL_BUFFERS_SIZE 256
 
-#define SPI_USE_WAIT TRUE
-
 #include_next <halconf.h>

keyboards/custommk/ergostrafer/halconf.h

@@ -20,11 +20,6 @@
 
 #define HAL_USE_SPI TRUE
 
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
 #define SERIAL_BUFFERS_SIZE 256
 
-// This enables interrupt-driven mode
-#define SPI_USE_WAIT TRUE
-
 #include_next <halconf.h>

keyboards/custommk/ergostrafer_rgb/halconf.h

@@ -20,11 +20,6 @@
 
 #define HAL_USE_SPI TRUE
 
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
 #define SERIAL_BUFFERS_SIZE 256
 
-// This enables interrupt-driven mode
-#define SPI_USE_WAIT TRUE
-
 #include_next <halconf.h>

keyboards/custommk/evo70_r2/halconf.h

@@ -26,11 +26,6 @@
 
 #define HAL_USE_GPT TRUE
 
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
 #define SERIAL_BUFFERS_SIZE 256
 
-// This enables interrupt-driven mode
-#define SPI_USE_WAIT TRUE
-
 #include_next <halconf.h>

keyboards/darkproject/kd83a_bfg_edition/halconf.h

@@ -17,7 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/darkproject/kd87a_bfg_edition/halconf.h

@@ -17,7 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/darmoshark/k3/halconf.h

@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/edi/hardlight/mk2/halconf.h

@@ -25,8 +25,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Activate Serial Peripheral Interface
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
 
 #include_next <halconf.h>

keyboards/gmmk/gmmk2/p65/halconf.h

@@ -22,8 +22,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
-

keyboards/gmmk/gmmk2/p96/halconf.h

@@ -22,8 +22,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
-

keyboards/gmmk/numpad/halconf.h

@@ -18,9 +18,6 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 #define HAL_USE_ADC TRUE
 
-
 #include_next <halconf.h>

keyboards/gmmk/pro/rev1/halconf.h

@@ -17,7 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/gmmk/pro/rev2/halconf.h

@@ -17,7 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/handwired/onekey/at_start_f415/halconf.h

@@ -11,6 +11,5 @@
 #define HAL_USE_PWM TRUE
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
 
 #include_next <halconf.h>

keyboards/handwired/onekey/kb2040/halconf.h

@@ -17,6 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
 
 #include_next <halconf.h>

keyboards/handwired/onekey/rp2040/halconf.h

@@ -10,6 +10,5 @@
 #define HAL_USE_ADC TRUE
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
 
 #include_next <halconf.h>

keyboards/handwired/tractyl_manuform/5x6_right/f303/halconf.h

@@ -21,7 +21,5 @@
 #define HAL_USE_SPI     TRUE
 #define HAL_USE_GPT     TRUE
 #define HAL_USE_DAC     TRUE
-#define SPI_USE_WAIT    TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/handwired/tractyl_manuform/5x6_right/f405/halconf.h

@@ -22,11 +22,6 @@
 #    define HAL_USE_PWM TRUE
 #endif // defined(WS2812_PWM) || defined(BACKLIGHT_PWM)
 
-#if HAL_USE_SPI == TRUE
-#    define SPI_USE_WAIT TRUE
-#    define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-#endif
-
 #ifdef AUDIO_DRIVER_DAC
 #    define HAL_USE_GPT TRUE
 #    define HAL_USE_DAC TRUE

keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h

@@ -19,7 +19,5 @@
 #define HAL_USE_SERIAL  TRUE
 #define HAL_USE_I2C     TRUE
 #define HAL_USE_SPI     TRUE
-#define SPI_USE_WAIT    TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/hazel/bad_wings/halconf.h

@@ -6,7 +6,5 @@
 #define HAL_USE_SPI     TRUE
 #define HAL_USE_I2C     TRUE
 #define HAL_USE_PWM     TRUE
-#define SPI_USE_WAIT    TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/hazel/bad_wings_v2/halconf.h

@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/hfdkb/ac001/halconf.h

@@ -16,7 +16,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/horrortroll/handwired_k552/halconf.h

@@ -22,9 +22,6 @@
 #pragma once
 
 #define HAL_USE_I2C TRUE
-
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/inland/kb83/halconf.h

@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/inland/mk47/halconf.h

@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/inland/v83p/halconf.h

@@ -5,7 +5,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/jidohun/km113/halconf.h

@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/jukaie/jk01/halconf.h

@@ -17,7 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/kbdfans/odin75/halconf.h

@@ -16,13 +16,6 @@
 
 #pragma once
 
-#include_next <halconf.h>
-
-#undef HAL_USE_SPI
 #define HAL_USE_SPI TRUE
 
-#undef SPI_USE_WAIT
+#include_next <halconf.h>
-#define SPI_USE_WAIT TRUE
-
-#undef SPI_SELECT_MODE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD

keyboards/mechwild/puckbuddy/halconf.h

@@ -5,9 +5,6 @@
 #pragma once
 
 #define HAL_USE_I2C TRUE
-
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/mechwild/sugarglider/halconf.h

@@ -4,9 +4,6 @@
 #pragma once
 
 #define HAL_USE_I2C TRUE
-
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/moky/moky67/halconf.h

@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/moky/moky88/halconf.h

@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/monsgeek/m1/halconf.h

@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/monsgeek/m3/halconf.h

@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/monsgeek/m5/halconf.h

@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/monsgeek/m6/halconf.h

@@ -17,7 +17,5 @@
 
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/phentech/rpk_001/halconf.h

@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/projectd/65/projectd_65_ansi/halconf.h

@@ -17,7 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/projectd/75/ansi/halconf.h

@@ -17,7 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/projectd/75/iso/halconf.h

@@ -17,7 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/sawnsprojects/okayu/halconf.h

@@ -4,6 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
+
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 #include_next <halconf.h>

keyboards/sharkoon/skiller_sgk50_s2/halconf.h

@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/sharkoon/skiller_sgk50_s3/halconf.h

@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/sharkoon/skiller_sgk50_s4/halconf.h

@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/splitkb/elora/rev1/halconf.h

@@ -6,8 +6,6 @@
 #define HAL_USE_SIO TRUE
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 #define HAL_USE_ADC TRUE
 
 #include_next <halconf.h>

keyboards/splitkb/halcyon/elora/rev2/halconf.h

@@ -6,9 +6,6 @@
 //// VIK
 
 #define HAL_USE_I2C TRUE
-
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/splitkb/halcyon/kyria/rev4/halconf.h

@@ -6,9 +6,6 @@
 //// VIK
 
 #define HAL_USE_I2C TRUE
-
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/tacworks/tac_k1/halconf.h

@@ -4,7 +4,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>

keyboards/trnthsn/s6xty5neor2/halconf.h

@@ -17,6 +17,5 @@
 #pragma once
 
 #define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
+
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 #include_next <halconf.h>