Merge remote-tracking branch 'origin/master' into develop

2023-01-19 01:06:08 +00:00
parent 0b25528b6b 327f7ee9a7
commit 3723c0e3d5
100 changed files with 195 additions and 91 deletions
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
@@ -24,4 +24,4 @@
 #define SPI_USE_WAIT TRUE
 #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD

-#include_next "halconf.h"
+#include_next <halconf.h>
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h
@@ -19,7 +19,7 @@

 #pragma once

-#include_next "mcuconf.h"
+#include_next <mcuconf.h>

 #undef STM32_PWM_USE_TIM2
 #define STM32_PWM_USE_TIM2 TRUE
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
@@ -16,7 +16,7 @@

 #pragma once

-#include_next "mcuconf.h"
+#include_next <mcuconf.h>

 #if defined(KEYBOARD_bastardkb_charybdis_3x5_blackpill)
 #    undef STM32_I2C_USE_I2C1
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/mcuconf.h
@@ -17,7 +17,7 @@

 #pragma once

-#include_next "mcuconf.h"
+#include_next <mcuconf.h>

 #undef RP_SPI_USE_SPI0
 #define RP_SPI_USE_SPI0 TRUE
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/mcuconf.h
@@ -17,7 +17,7 @@

 #pragma once

-#include_next "mcuconf.h"
+#include_next <mcuconf.h>

 #undef RP_SPI_USE_SPI0
 #define RP_SPI_USE_SPI0 TRUE
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
@@ -24,4 +24,4 @@
 #define SPI_USE_WAIT TRUE
 #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD

-#include_next "halconf.h"
+#include_next <halconf.h>
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h
@@ -19,7 +19,7 @@

 #pragma once

-#include_next "mcuconf.h"
+#include_next <mcuconf.h>

 #undef STM32_PWM_USE_TIM2
 #define STM32_PWM_USE_TIM2 TRUE
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h
@@ -17,7 +17,7 @@

 #pragma once

-#include_next "mcuconf.h"
+#include_next <mcuconf.h>

 #undef RP_SPI_USE_SPI0
 #define RP_SPI_USE_SPI0 TRUE
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h
@@ -17,7 +17,7 @@

 #pragma once

-#include_next "mcuconf.h"
+#include_next <mcuconf.h>

 #undef RP_SPI_USE_SPI0
 #define RP_SPI_USE_SPI0 TRUE
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
@@ -24,4 +24,4 @@
 #define SPI_USE_WAIT TRUE
 #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD

-#include_next "halconf.h"
+#include_next <halconf.h>
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h
@@ -19,7 +19,7 @@

 #pragma once

-#include_next "mcuconf.h"
+#include_next <mcuconf.h>

 #undef STM32_PWM_USE_TIM2
 #define STM32_PWM_USE_TIM2 TRUE
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
@@ -16,7 +16,7 @@

 #pragma once

-#include_next "mcuconf.h"
+#include_next <mcuconf.h>

 #if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill)
 #    undef STM32_PWM_USE_ADVANCED
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h
@@ -17,7 +17,7 @@

 #pragma once

-#include_next "mcuconf.h"
+#include_next <mcuconf.h>

 #undef RP_SPI_USE_SPI0
 #define RP_SPI_USE_SPI0 TRUE
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h
@@ -17,7 +17,7 @@

 #pragma once

-#include_next "mcuconf.h"
+#include_next <mcuconf.h>

 #undef RP_SPI_USE_SPI0
 #define RP_SPI_USE_SPI0 TRUE
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h
@@ -19,4 +19,4 @@

 #define HAL_USE_SPI TRUE

-#include_next "halconf.h"
+#include_next <halconf.h>
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h
@@ -17,7 +17,7 @@

 #pragma once

-#include_next "mcuconf.h"
+#include_next <mcuconf.h>

 #undef RP_SPI_USE_SPI1
 #define RP_SPI_USE_SPI1 TRUE
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h
@@ -20,4 +20,4 @@
 #define HAL_USE_SPI TRUE
 #define HAL_USE_I2C TRUE

-#include_next "halconf.h"
+#include_next <halconf.h>
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h
@@ -17,7 +17,7 @@

 #pragma once

-#include_next "mcuconf.h"
+#include_next <mcuconf.h>

 #undef RP_SPI_USE_SPI1
 #define RP_SPI_USE_SPI1 TRUE
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h
@@ -18,4 +18,4 @@

 #define HAL_USE_I2C TRUE

-#include_next "halconf.h"
+#include_next <halconf.h>
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h
@@ -17,7 +17,7 @@

 #pragma once

-#include_next "mcuconf.h"
+#include_next <mcuconf.h>

 #undef RP_I2C_USE_I2C1
 #define RP_I2C_USE_I2C1 TRUE
--- a/keyboards/bastardkb/dilemma/3x5_3/halconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/halconf.h
@@ -20,4 +20,4 @@
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE

-#include_next "halconf.h"
+#include_next <halconf.h>
--- a/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h
@@ -17,7 +17,7 @@

 #pragma once

-#include_next "mcuconf.h"
+#include_next <mcuconf.h>

 #undef RP_SPI_USE_SPI1
 #define RP_SPI_USE_SPI1 TRUE