From 9632360caa5e6511b0ec13cb4c55eb64408232b5 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 30 Aug 2022 03:20:04 -0500
Subject: Use a macro to compute the size of arrays at compile time (#18044)

* Add ARRAY_SIZE and CEILING utility macros

* Apply a coccinelle patch to use ARRAY_SIZE

* fix up some straggling items

* Fix 'make test:secure'

* Enhance ARRAY_SIZE macro to reject acting on pointers

The previous definition would not produce a diagnostic for
```
int *p;
size_t num_elem = ARRAY_SIZE(p)
```
but the new one will.

* explicitly get definition of ARRAY_SIZE

* Convert to ARRAY_SIZE when const is involved

The following spatch finds additional instances where the array is
const and the division is by the size of the type, not the size of
the first element:
```
@ rule5a using "empty.iso" @
type T;
const T[] E;
@@

- (sizeof(E)/sizeof(T))
+ ARRAY_SIZE(E)

@ rule6a using "empty.iso" @
type T;
const T[] E;
@@

- sizeof(E)/sizeof(T)
+ ARRAY_SIZE(E)
```

* New instances of ARRAY_SIZE added since initial spatch run

* Use `ARRAY_SIZE` in docs (found by grep)

* Manually use ARRAY_SIZE

hs_set is expected to be the same size as uint16_t, though it's made
of two 8-bit integers

* Just like char, sizeof(uint8_t) is guaranteed to be 1

This is at least true on any plausible system where qmk is actually used.

Per my understanding it's universally true, assuming that uint8_t exists:
https://stackoverflow.com/questions/48655310/can-i-assume-that-sizeofuint8-t-1

* Run qmk-format on core C files touched in this branch

Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
---
 keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'keyboards/handwired/onekey')

diff --git a/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c b/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c
index ecf67d3b3c..65983c8dd8 100644
--- a/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c
@@ -34,11 +34,11 @@ static const uint32_t waiting_values[] = {0, 1, 5, 10, 25, 50, 100, 150, 200, 50
 void housekeeping_task_user(void) {
     static uint32_t last_bench = 0;
     if (timer_elapsed32(last_bench) > 500) {
-        for (int i = 0; i < (sizeof(waiting_values) / sizeof(waiting_values[0])); i++) {
+        for (int i = 0; i < ARRAY_SIZE(waiting_values); i++) {
             wait_us_polling_with_strobe(waiting_values[i]);
             wait_us(10);
         }
-        for (int i = 0; i < (sizeof(waiting_values) / sizeof(waiting_values[0])); i++) {
+        for (int i = 0; i < ARRAY_SIZE(waiting_values); i++) {
             wait_us_yield_with_strobe(waiting_values[i]);
             wait_us(10);
         }
-- 
cgit v1.2.3


From be8907d634ac8967de1ae2ac8346b845f738c9e6 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 27 Sep 2022 18:37:13 +1000
Subject: Further refactoring of joystick feature (#18437)

---
 keyboards/handwired/onekey/keymaps/joystick/keymap.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'keyboards/handwired/onekey')

diff --git a/keyboards/handwired/onekey/keymaps/joystick/keymap.c b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
index 7a2f138b28..c74707e931 100644
--- a/keyboards/handwired/onekey/keymaps/joystick/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
@@ -10,11 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void matrix_scan_user() {
     int16_t val = (((uint32_t)timer_read() % 5000 - 2500) * 255) / 5000;
-
-    if (val != joystick_status.axes[1]) {
-        joystick_status.axes[1] = val;
-        joystick_status.status |= JS_UPDATED;
-    }
+    joystick_set_axis(1, val);
 }
 
 // Joystick config
-- 
cgit v1.2.3


From e0115caab92167b23ff9dd9d1f68cd03c830bfec Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 1 Oct 2022 02:14:41 +1000
Subject: onekey: enable ADC for Bluepill and Blackpill (#18545)

---
 keyboards/handwired/onekey/blackpill_f401/halconf.h         | 2 ++
 keyboards/handwired/onekey/blackpill_f401/mcuconf.h         | 3 +++
 keyboards/handwired/onekey/blackpill_f411/halconf.h         | 2 ++
 keyboards/handwired/onekey/blackpill_f411/mcuconf.h         | 3 +++
 keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h | 3 +++
 keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h | 3 +++
 keyboards/handwired/onekey/bluepill/halconf.h               | 2 ++
 keyboards/handwired/onekey/bluepill/mcuconf.h               | 3 +++
 keyboards/handwired/onekey/bluepill_f103c6/halconf.h        | 2 ++
 keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h        | 3 +++
 10 files changed, 26 insertions(+)

(limited to 'keyboards/handwired/onekey')

diff --git a/keyboards/handwired/onekey/blackpill_f401/halconf.h b/keyboards/handwired/onekey/blackpill_f401/halconf.h
index 020a7722f0..4982bb5b49 100644
--- a/keyboards/handwired/onekey/blackpill_f401/halconf.h
+++ b/keyboards/handwired/onekey/blackpill_f401/halconf.h
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#define HAL_USE_ADC TRUE
+
 #define HAL_USE_I2C TRUE
 
 #define HAL_USE_PWM TRUE
diff --git a/keyboards/handwired/onekey/blackpill_f401/mcuconf.h b/keyboards/handwired/onekey/blackpill_f401/mcuconf.h
index e614a9dfa9..1aa0fe4ce7 100644
--- a/keyboards/handwired/onekey/blackpill_f401/mcuconf.h
+++ b/keyboards/handwired/onekey/blackpill_f401/mcuconf.h
@@ -18,6 +18,9 @@
 
 #include_next "mcuconf.h"
 
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
 
diff --git a/keyboards/handwired/onekey/blackpill_f411/halconf.h b/keyboards/handwired/onekey/blackpill_f411/halconf.h
index 4a0da20890..8225cc7208 100644
--- a/keyboards/handwired/onekey/blackpill_f411/halconf.h
+++ b/keyboards/handwired/onekey/blackpill_f411/halconf.h
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#define HAL_USE_ADC TRUE
+
 #define HAL_USE_I2C TRUE
 
 #define HAL_USE_PWM TRUE
diff --git a/keyboards/handwired/onekey/blackpill_f411/mcuconf.h b/keyboards/handwired/onekey/blackpill_f411/mcuconf.h
index e614a9dfa9..1aa0fe4ce7 100644
--- a/keyboards/handwired/onekey/blackpill_f411/mcuconf.h
+++ b/keyboards/handwired/onekey/blackpill_f411/mcuconf.h
@@ -18,6 +18,9 @@
 
 #include_next "mcuconf.h"
 
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
 
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h
index e15870984f..00aca25c36 100644
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/halconf.h
@@ -16,7 +16,10 @@
 
 #pragma once
 
+#define HAL_USE_ADC TRUE
+
 #define HAL_USE_I2C TRUE
+
 #define HAL_USE_PWM TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h
index d003af03e5..fcb7d84f96 100755
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h
@@ -18,6 +18,9 @@
 
 #include_next "mcuconf.h"
 
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
 
diff --git a/keyboards/handwired/onekey/bluepill/halconf.h b/keyboards/handwired/onekey/bluepill/halconf.h
index 923b4e52d2..dbc3e82a79 100644
--- a/keyboards/handwired/onekey/bluepill/halconf.h
+++ b/keyboards/handwired/onekey/bluepill/halconf.h
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#define HAL_USE_ADC TRUE
+
 #define HAL_USE_PWM TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/bluepill/mcuconf.h b/keyboards/handwired/onekey/bluepill/mcuconf.h
index 5e94a97e21..39834c135b 100644
--- a/keyboards/handwired/onekey/bluepill/mcuconf.h
+++ b/keyboards/handwired/onekey/bluepill/mcuconf.h
@@ -23,6 +23,9 @@
 
 #include_next <mcuconf.h>
 
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
 #undef STM32_PWM_USE_TIM2
 #define STM32_PWM_USE_TIM2 TRUE
 
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/halconf.h b/keyboards/handwired/onekey/bluepill_f103c6/halconf.h
index 923b4e52d2..dbc3e82a79 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/halconf.h
+++ b/keyboards/handwired/onekey/bluepill_f103c6/halconf.h
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#define HAL_USE_ADC TRUE
+
 #define HAL_USE_PWM TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h b/keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h
index 5e94a97e21..39834c135b 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h
+++ b/keyboards/handwired/onekey/bluepill_f103c6/mcuconf.h
@@ -23,6 +23,9 @@
 
 #include_next <mcuconf.h>
 
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
 #undef STM32_PWM_USE_TIM2
 #define STM32_PWM_USE_TIM2 TRUE
 
-- 
cgit v1.2.3


From 996a9006d3f101dc5c48b58339e2e7323040fd59 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Tue, 4 Oct 2022 23:10:24 +0200
Subject: [Core] PWM Backlight for RP2040 (#17706)

---
 keyboards/handwired/onekey/blackpill_f401/config.h         | 1 +
 keyboards/handwired/onekey/blackpill_f411/config.h         | 1 +
 keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h | 1 +
 keyboards/handwired/onekey/rp2040/config.h                 | 3 +++
 keyboards/handwired/onekey/rp2040/halconf.h                | 9 +++++++++
 keyboards/handwired/onekey/rp2040/info.json                | 5 ++++-
 keyboards/handwired/onekey/rp2040/mcuconf.h                | 9 +++++++++
 7 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 keyboards/handwired/onekey/rp2040/halconf.h
 create mode 100644 keyboards/handwired/onekey/rp2040/mcuconf.h

(limited to 'keyboards/handwired/onekey')

diff --git a/keyboards/handwired/onekey/blackpill_f401/config.h b/keyboards/handwired/onekey/blackpill_f401/config.h
index 4e9552480f..05f3f07763 100644
--- a/keyboards/handwired/onekey/blackpill_f401/config.h
+++ b/keyboards/handwired/onekey/blackpill_f401/config.h
@@ -20,6 +20,7 @@
 
 #define BACKLIGHT_PWM_DRIVER  PWMD5
 #define BACKLIGHT_PWM_CHANNEL 1
+#define BACKLIGHT_PAL_MODE 2
 
 #define ADC_PIN A0
 
diff --git a/keyboards/handwired/onekey/blackpill_f411/config.h b/keyboards/handwired/onekey/blackpill_f411/config.h
index b97df0c666..c890043b09 100644
--- a/keyboards/handwired/onekey/blackpill_f411/config.h
+++ b/keyboards/handwired/onekey/blackpill_f411/config.h
@@ -20,6 +20,7 @@
 
 #define BACKLIGHT_PWM_DRIVER  PWMD5
 #define BACKLIGHT_PWM_CHANNEL 1
+#define BACKLIGHT_PAL_MODE 2
 
 #define ADC_PIN A0
 
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
index c8800fa163..2b60320fc1 100755
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h
@@ -20,6 +20,7 @@
 
 #define BACKLIGHT_PWM_DRIVER  PWMD5
 #define BACKLIGHT_PWM_CHANNEL 1
+#define BACKLIGHT_PAL_MODE 2
 
 #define ADC_PIN A0
 
diff --git a/keyboards/handwired/onekey/rp2040/config.h b/keyboards/handwired/onekey/rp2040/config.h
index bcf4047a4f..82c5592dc9 100644
--- a/keyboards/handwired/onekey/rp2040/config.h
+++ b/keyboards/handwired/onekey/rp2040/config.h
@@ -13,3 +13,6 @@
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP25
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+
+#define BACKLIGHT_PWM_DRIVER PWMD4
+#define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B
diff --git a/keyboards/handwired/onekey/rp2040/halconf.h b/keyboards/handwired/onekey/rp2040/halconf.h
new file mode 100644
index 0000000000..5890122e5e
--- /dev/null
+++ b/keyboards/handwired/onekey/rp2040/halconf.h
@@ -0,0 +1,9 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/rp2040/info.json b/keyboards/handwired/onekey/rp2040/info.json
index b34a1cc206..32bde911bb 100644
--- a/keyboards/handwired/onekey/rp2040/info.json
+++ b/keyboards/handwired/onekey/rp2040/info.json
@@ -6,7 +6,10 @@
         "cols": ["GP4"],
         "rows": ["GP5"]
     },
+    "backlight": {
+        "pin": "GP25"
+    },
     "rgblight": {
-        "pin": "A1"
+        "pin": "GP25"
     }
 }
diff --git a/keyboards/handwired/onekey/rp2040/mcuconf.h b/keyboards/handwired/onekey/rp2040/mcuconf.h
new file mode 100644
index 0000000000..86f821640f
--- /dev/null
+++ b/keyboards/handwired/onekey/rp2040/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2022 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef RP_PWM_USE_PWM4
+#define RP_PWM_USE_PWM4 TRUE
-- 
cgit v1.2.3


From 4d6fab1cfa4c16831cbd9727efddec654ca0460e Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 5 Oct 2022 11:36:20 +1100
Subject: onekey: Enable ADC for STM32F072 Discovery (#18592)

---
 keyboards/handwired/onekey/stm32f0_disco/halconf.h | 2 ++
 keyboards/handwired/onekey/stm32f0_disco/mcuconf.h | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'keyboards/handwired/onekey')

diff --git a/keyboards/handwired/onekey/stm32f0_disco/halconf.h b/keyboards/handwired/onekey/stm32f0_disco/halconf.h
index 78ed6586c8..432c43c6cc 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/halconf.h
+++ b/keyboards/handwired/onekey/stm32f0_disco/halconf.h
@@ -21,6 +21,8 @@
 
 #pragma once
 
+#define HAL_USE_ADC TRUE
+
 #define HAL_USE_PWM TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/stm32f0_disco/mcuconf.h b/keyboards/handwired/onekey/stm32f0_disco/mcuconf.h
index ea4f9373a0..0bb4f4d643 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/mcuconf.h
+++ b/keyboards/handwired/onekey/stm32f0_disco/mcuconf.h
@@ -23,5 +23,8 @@
 
 #include_next <mcuconf.h>
 
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
 #undef STM32_PWM_USE_TIM3
 #define STM32_PWM_USE_TIM3 TRUE
-- 
cgit v1.2.3


From 55b9a4d06e12df08564d3b6261f9ed81f75e07ec Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sat, 15 Oct 2022 09:55:27 -0700
Subject: Remove RGBLIGHT_ANIMATION and clean up effect defines for G-K
 (#18726)

---
 keyboards/handwired/onekey/keymaps/apa102/config.h | 11 ++++++++++-
 keyboards/handwired/onekey/keymaps/rgb/config.h    | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'keyboards/handwired/onekey')

diff --git a/keyboards/handwired/onekey/keymaps/apa102/config.h b/keyboards/handwired/onekey/keymaps/apa102/config.h
index aeb22a261b..756ebb3593 100644
--- a/keyboards/handwired/onekey/keymaps/apa102/config.h
+++ b/keyboards/handwired/onekey/keymaps/apa102/config.h
@@ -2,4 +2,13 @@
 
 #define RGBLED_NUM 40
 #define APA102_DEFAULT_BRIGHTNESS 5
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/handwired/onekey/keymaps/rgb/config.h b/keyboards/handwired/onekey/keymaps/rgb/config.h
index 89e76326b4..1e54383769 100644
--- a/keyboards/handwired/onekey/keymaps/rgb/config.h
+++ b/keyboards/handwired/onekey/keymaps/rgb/config.h
@@ -1,4 +1,13 @@
 #pragma once
 
 #define RGBLED_NUM 9
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
-- 
cgit v1.2.3


From c347e732be6b50500c1651b3fb8c0753b0c9c40d Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 20 Oct 2022 22:20:07 +1100
Subject: Remove legacy EEPROM clear keycodes (#18782)

* `EEP_RST` -> `EE_CLR`, default-ish keymaps

* `EEP_RST` -> `EE_CLR`, user keymaps

* `EEP_RST` -> `EE_CLR`, community layouts

* `EEP_RST` -> `EE_CLR`, userspace

* `EEP_RST` -> `EE_CLR`, docs & core
---
 keyboards/handwired/onekey/keymaps/eep_rst/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'keyboards/handwired/onekey')

diff --git a/keyboards/handwired/onekey/keymaps/eep_rst/keymap.c b/keyboards/handwired/onekey/keymaps/eep_rst/keymap.c
index 3f7a6b8502..e206b6b39f 100644
--- a/keyboards/handwired/onekey/keymaps/eep_rst/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/eep_rst/keymap.c
@@ -1,5 +1,5 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    LAYOUT_ortho_1x1(EEP_RST)
+    LAYOUT_ortho_1x1(EE_CLR)
 };
-- 
cgit v1.2.3


From 6bbe8b6eddc56d43f4db07c665bf1791ea2ab871 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 25 Oct 2022 01:50:33 +1100
Subject: Normalise Joystick and Programmable Button keycodes (#18832)

---
 keyboards/handwired/onekey/keymaps/joystick/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'keyboards/handwired/onekey')

diff --git a/keyboards/handwired/onekey/keymaps/joystick/keymap.c b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
index c74707e931..96115aa496 100644
--- a/keyboards/handwired/onekey/keymaps/joystick/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
@@ -5,7 +5,7 @@
 #endif
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    LAYOUT_ortho_1x1(JS_BUTTON0)
+    LAYOUT_ortho_1x1(JS_0)
 };
 
 void matrix_scan_user() {
-- 
cgit v1.2.3


From 19145704e4a7a8a7609d697585a6423b67dc5371 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Thu, 27 Oct 2022 19:26:16 +0200
Subject: [Core] Adjust PWM hardware audio driver for RP2040 (#17723)

---
 keyboards/handwired/onekey/rp2040/config.h  | 4 ++++
 keyboards/handwired/onekey/rp2040/mcuconf.h | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'keyboards/handwired/onekey')

diff --git a/keyboards/handwired/onekey/rp2040/config.h b/keyboards/handwired/onekey/rp2040/config.h
index 82c5592dc9..d3e7b5c076 100644
--- a/keyboards/handwired/onekey/rp2040/config.h
+++ b/keyboards/handwired/onekey/rp2040/config.h
@@ -16,3 +16,7 @@
 
 #define BACKLIGHT_PWM_DRIVER PWMD4
 #define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B
+
+#define AUDIO_PIN GP16
+#define AUDIO_PWM_DRIVER PWMD0
+#define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_A
diff --git a/keyboards/handwired/onekey/rp2040/mcuconf.h b/keyboards/handwired/onekey/rp2040/mcuconf.h
index 86f821640f..5c2587395d 100644
--- a/keyboards/handwired/onekey/rp2040/mcuconf.h
+++ b/keyboards/handwired/onekey/rp2040/mcuconf.h
@@ -5,5 +5,8 @@
 
 #include_next "mcuconf.h"
 
+#undef RP_PWM_USE_PWM0
+#define RP_PWM_USE_PWM0 TRUE
+
 #undef RP_PWM_USE_PWM4
 #define RP_PWM_USE_PWM4 TRUE
-- 
cgit v1.2.3


From 7407347be1df69928d27ea9b6a4fe094429f2a55 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 28 Oct 2022 09:50:14 +1100
Subject: Remove rgblight_list.h (#18878)

* Remove rgblight_list defines with no usage

* Remove rgblight_setrgb_*[_at] defines

* Remove rgblight_sethsv_* defines

* Remove rgblight_sethsv_noeeprom_* defines

* Delete rgblight_list.h and remove all references
---
 keyboards/handwired/onekey/keymaps/apa102/keymap.c | 2 +-
 keyboards/handwired/onekey/keymaps/rgb/keymap.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'keyboards/handwired/onekey')

diff --git a/keyboards/handwired/onekey/keymaps/apa102/keymap.c b/keyboards/handwired/onekey/keymaps/apa102/keymap.c
index 700755a452..8b4191fb28 100644
--- a/keyboards/handwired/onekey/keymaps/apa102/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/apa102/keymap.c
@@ -9,6 +9,6 @@ void keyboard_post_init_user(void) {
     apa102_set_brightness(5);
 
     rgblight_enable_noeeprom();
-    rgblight_sethsv_noeeprom_cyan();
+    rgblight_sethsv_noeeprom(HSV_CYAN);
     rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
 }
diff --git a/keyboards/handwired/onekey/keymaps/rgb/keymap.c b/keyboards/handwired/onekey/keymaps/rgb/keymap.c
index c3e77f1ec1..c99eb86339 100644
--- a/keyboards/handwired/onekey/keymaps/rgb/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/rgb/keymap.c
@@ -6,6 +6,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void keyboard_post_init_user(void) {
     rgblight_enable_noeeprom();
-    rgblight_sethsv_noeeprom_cyan();
+    rgblight_sethsv_noeeprom(HSV_CYAN);
     rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
 }
-- 
cgit v1.2.3


From 9435ad19eedba9e56fa6a33989bc5c788f080e54 Mon Sep 17 00:00:00 2001
From: Joy Lee <joylee.lc@foxmail.com>
Date: Tue, 1 Nov 2022 12:04:15 +0800
Subject: Added analog support for WB32 MCU. (#18289)

Co-authored-by: Joy <chang.li@westberrytech.com>
---
 keyboards/handwired/onekey/evb_wb32f3g71/config.h  | 25 ++++++++++++++++++++++
 keyboards/handwired/onekey/evb_wb32f3g71/halconf.h | 11 ++++++++++
 keyboards/handwired/onekey/evb_wb32f3g71/info.json |  6 ++++++
 keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h | 17 +++++++++++++++
 keyboards/handwired/onekey/evb_wb32f3g71/rules.mk  |  4 +---
 keyboards/handwired/onekey/evb_wb32fq95/config.h   | 25 ++++++++++++++++++++++
 keyboards/handwired/onekey/evb_wb32fq95/halconf.h  | 11 ++++++++++
 keyboards/handwired/onekey/evb_wb32fq95/info.json  |  6 ++++++
 keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h  | 17 +++++++++++++++
 keyboards/handwired/onekey/evb_wb32fq95/rules.mk   |  4 +---
 10 files changed, 120 insertions(+), 6 deletions(-)
 create mode 100644 keyboards/handwired/onekey/evb_wb32f3g71/config.h
 create mode 100644 keyboards/handwired/onekey/evb_wb32f3g71/halconf.h
 create mode 100644 keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h
 create mode 100644 keyboards/handwired/onekey/evb_wb32fq95/config.h
 create mode 100644 keyboards/handwired/onekey/evb_wb32fq95/halconf.h
 create mode 100644 keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h

(limited to 'keyboards/handwired/onekey')

diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/config.h b/keyboards/handwired/onekey/evb_wb32f3g71/config.h
new file mode 100644
index 0000000000..d1f87b4e3e
--- /dev/null
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/config.h
@@ -0,0 +1,25 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+#define ADC_PIN A0
+
+#define BACKLIGHT_PWM_DRIVER  PWMD4
+#define BACKLIGHT_PWM_CHANNEL 3
+#define BACKLIGHT_PAL_MODE    2
+
+#define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4)))
+#define RGB_CI_PIN B8
+
+#define SOLENOID_PIN B12
+#define SOLENOID_PINS { B12, B13, B14, B15 }
+#define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
+
+#define I2C1_SDA_PIN B7
+#define I2C1_SCL_PIN B6
+#define I2C1_SCL_PAL_MODE 4
+#define I2C1_OPMODE OPMODE_I2C
+#define I2C1_CLOCK_SPEED 100000
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/halconf.h b/keyboards/handwired/onekey/evb_wb32f3g71/halconf.h
new file mode 100644
index 0000000000..f0cf0a179f
--- /dev/null
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/halconf.h
@@ -0,0 +1,11 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_ADC TRUE
+
+#define HAL_USE_I2C TRUE
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/info.json b/keyboards/handwired/onekey/evb_wb32f3g71/info.json
index 6287cdc34a..304517d266 100644
--- a/keyboards/handwired/onekey/evb_wb32f3g71/info.json
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/info.json
@@ -5,5 +5,11 @@
     "matrix_pins": {
         "cols": ["B12"],
         "rows": ["B13"]
+    },
+    "backlight": {
+        "pin": "B8"
+    },
+    "rgblight": {
+        "pin": "A0"
     }
 }
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h b/keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h
new file mode 100644
index 0000000000..7ef36ff66c
--- /dev/null
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h
@@ -0,0 +1,17 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef WB32_ADC_USE_ADC1
+#define WB32_ADC_USE_ADC1 TRUE
+
+#undef WB32_DMA_REQUIRED
+#define WB32_DMA_REQUIRED TRUE
+
+#undef WB32_I2C_USE_I2C1
+#define WB32_I2C_USE_I2C1 TRUE
+
+#undef WB32_PWM_USE_TIM4
+#define WB32_PWM_USE_TIM4 TRUE
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/rules.mk b/keyboards/handwired/onekey/evb_wb32f3g71/rules.mk
index 033dd66aa4..1071cf62ee 100644
--- a/keyboards/handwired/onekey/evb_wb32f3g71/rules.mk
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/rules.mk
@@ -1,3 +1 @@
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-NKRO_ENABLE = no           # Enable N-Key Rollover
+KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/config.h b/keyboards/handwired/onekey/evb_wb32fq95/config.h
new file mode 100644
index 0000000000..d1f87b4e3e
--- /dev/null
+++ b/keyboards/handwired/onekey/evb_wb32fq95/config.h
@@ -0,0 +1,25 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+#define ADC_PIN A0
+
+#define BACKLIGHT_PWM_DRIVER  PWMD4
+#define BACKLIGHT_PWM_CHANNEL 3
+#define BACKLIGHT_PAL_MODE    2
+
+#define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4)))
+#define RGB_CI_PIN B8
+
+#define SOLENOID_PIN B12
+#define SOLENOID_PINS { B12, B13, B14, B15 }
+#define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
+
+#define I2C1_SDA_PIN B7
+#define I2C1_SCL_PIN B6
+#define I2C1_SCL_PAL_MODE 4
+#define I2C1_OPMODE OPMODE_I2C
+#define I2C1_CLOCK_SPEED 100000
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/halconf.h b/keyboards/handwired/onekey/evb_wb32fq95/halconf.h
new file mode 100644
index 0000000000..f0cf0a179f
--- /dev/null
+++ b/keyboards/handwired/onekey/evb_wb32fq95/halconf.h
@@ -0,0 +1,11 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_ADC TRUE
+
+#define HAL_USE_I2C TRUE
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/info.json b/keyboards/handwired/onekey/evb_wb32fq95/info.json
index 3fc1c88657..bbf5139668 100644
--- a/keyboards/handwired/onekey/evb_wb32fq95/info.json
+++ b/keyboards/handwired/onekey/evb_wb32fq95/info.json
@@ -5,5 +5,11 @@
     "matrix_pins": {
         "cols": ["B12"],
         "rows": ["B13"]
+    },
+    "backlight": {
+        "pin": "B8"
+    },
+    "rgblight": {
+        "pin": "A0"
     }
 }
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h b/keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h
new file mode 100644
index 0000000000..7ef36ff66c
--- /dev/null
+++ b/keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h
@@ -0,0 +1,17 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef WB32_ADC_USE_ADC1
+#define WB32_ADC_USE_ADC1 TRUE
+
+#undef WB32_DMA_REQUIRED
+#define WB32_DMA_REQUIRED TRUE
+
+#undef WB32_I2C_USE_I2C1
+#define WB32_I2C_USE_I2C1 TRUE
+
+#undef WB32_PWM_USE_TIM4
+#define WB32_PWM_USE_TIM4 TRUE
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/rules.mk b/keyboards/handwired/onekey/evb_wb32fq95/rules.mk
index 033dd66aa4..1071cf62ee 100644
--- a/keyboards/handwired/onekey/evb_wb32fq95/rules.mk
+++ b/keyboards/handwired/onekey/evb_wb32fq95/rules.mk
@@ -1,3 +1 @@
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-NKRO_ENABLE = no           # Enable N-Key Rollover
+KEYBOARD_SHARED_EP = yes
-- 
cgit v1.2.3


From 8cecf7fad8614de2defd43f225250186cc517f38 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 12 Nov 2022 14:20:44 +1100
Subject: onekey: disable NKRO and mousekeys by default (#19038)

---
 keyboards/handwired/onekey/bluepill_f103c6/rules.mk | 4 ----
 keyboards/handwired/onekey/info.json                | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'keyboards/handwired/onekey')

diff --git a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
index c76a8ebe6e..208165ab31 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
+++ b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
@@ -13,10 +13,6 @@ OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 # LTO is required to fit the firmware into the available 24K of flash
 LTO_ENABLE = yes
 
-# Disable some features which still don't fit into flash even with LTO
-MOUSEKEY_ENABLE = no
-NKRO_ENABLE = no
-
 # EEPROM emulation not supported yet (need to implement a proper firmware size
 # check first, otherwise the chance of the EEPROM backing store overwriting
 # some part of the firmware code is really high).
diff --git a/keyboards/handwired/onekey/info.json b/keyboards/handwired/onekey/info.json
index 605e73e726..0639ec99fd 100644
--- a/keyboards/handwired/onekey/info.json
+++ b/keyboards/handwired/onekey/info.json
@@ -10,11 +10,11 @@
     "diode_direction": "COL2ROW",
     "features": {
         "bootmagic": false,
-        "mousekey": true,
+        "mousekey": false,
         "extrakey": true,
         "console": true,
         "command": false,
-        "nkro": true,
+        "nkro": false,
         "backlight": false,
         "rgblight": false,
         "audio": false
-- 
cgit v1.2.3


From 6cc9513ab0cd5e21354c51ab83a89af9f2eb517e Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 13 Nov 2022 10:28:11 +1100
Subject: Digitizer feature improvements (#19034)

---
 .../handwired/onekey/keymaps/digitizer/keymap.c    | 72 ++++++++++++++--------
 1 file changed, 46 insertions(+), 26 deletions(-)

(limited to 'keyboards/handwired/onekey')

diff --git a/keyboards/handwired/onekey/keymaps/digitizer/keymap.c b/keyboards/handwired/onekey/keymaps/digitizer/keymap.c
index 6b304e86fe..dcc0adc59b 100644
--- a/keyboards/handwired/onekey/keymaps/digitizer/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/digitizer/keymap.c
@@ -1,38 +1,58 @@
- /* Copyright 2021 QMK 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include QMK_KEYBOARD_H
 
-#include "digitizer.h"
+#include <math.h>
 
-#include "math.h"
+enum custom_keycodes {
+    DG_TIP = SAFE_RANGE,
+};
 
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {LAYOUT_ortho_1x1(KC_A)};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT_ortho_1x1(DG_TIP)
+};
 
 uint32_t timer = 0;
 
+void keyboard_post_init_user(void) {
+    digitizer_in_range_on();
+}
+
 void matrix_scan_user() {
     if (timer_elapsed32(timer) < 200) {
         return;
     }
-    
-    timer               = timer_read32();
-    digitizer_t digitizer;
-    digitizer.x         = 0.5 - 0.2 * cos(timer_read() / 250. / 6.28);
-    digitizer.y         = 0.5 - 0.2 * sin(timer_read() / 250. / 6.28);
-    digitizer.tipswitch = 0;
-    digitizer.inrange   = 1;
-    digitizer_set_report(digitizer);
+
+    timer = timer_read32();
+
+    float x = 0.5 - 0.2 * cos(timer / 250. / 6.28);
+    float y = 0.5 - 0.2 * sin(timer / 250. / 6.28);
+    digitizer_set_position(x, y);
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case DG_TIP:
+            if (record->event.pressed) {
+                digitizer_tip_switch_on();
+            } else {
+                digitizer_tip_switch_off();
+            }
+            return false;
+    }
+    return true;
 }
-- 
cgit v1.2.3


From 59443fa970332106872a906d923f5b0fd9eb116b Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 25 Nov 2022 02:47:02 +0000
Subject: jsonify some info.json (#19146)

---
 keyboards/handwired/onekey/stm32f405_feather/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'keyboards/handwired/onekey')

diff --git a/keyboards/handwired/onekey/stm32f405_feather/info.json b/keyboards/handwired/onekey/stm32f405_feather/info.json
index 5135873576..80e41cddf2 100644
--- a/keyboards/handwired/onekey/stm32f405_feather/info.json
+++ b/keyboards/handwired/onekey/stm32f405_feather/info.json
@@ -4,6 +4,6 @@
     "bootloader": "stm32-dfu",
     "matrix_pins": {
         "cols": ["C2"],
-        "rows": ["C3"],
+        "rows": ["C3"]
     }
 }
-- 
cgit v1.2.3


From 1e95f7be8f214c544bf99f415916a4a5f07a1e9b Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 27 Nov 2022 03:14:45 +1100
Subject: Joystick feature improvements (#19052)

---
 .../handwired/onekey/keymaps/joystick/config.h     |  2 +-
 .../handwired/onekey/keymaps/joystick/keymap.c     |  2 +-
 keyboards/handwired/onekey/proton_c/halconf.h      | 26 ++++++++++++++++++++++
 keyboards/handwired/onekey/proton_c/mcuconf.h      | 22 ++++++++++++++++++
 4 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 keyboards/handwired/onekey/proton_c/halconf.h
 create mode 100644 keyboards/handwired/onekey/proton_c/mcuconf.h

(limited to 'keyboards/handwired/onekey')

diff --git a/keyboards/handwired/onekey/keymaps/joystick/config.h b/keyboards/handwired/onekey/keymaps/joystick/config.h
index a3b5858ad2..8a4e461b27 100644
--- a/keyboards/handwired/onekey/keymaps/joystick/config.h
+++ b/keyboards/handwired/onekey/keymaps/joystick/config.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#define JOYSTICK_AXES_COUNT 2
+#define JOYSTICK_AXIS_COUNT 2
 #define JOYSTICK_BUTTON_COUNT 1
diff --git a/keyboards/handwired/onekey/keymaps/joystick/keymap.c b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
index 96115aa496..6463900b7b 100644
--- a/keyboards/handwired/onekey/keymaps/joystick/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/joystick/keymap.c
@@ -14,7 +14,7 @@ void matrix_scan_user() {
 }
 
 // Joystick config
-joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
+joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {
     [0] = JOYSTICK_AXIS_IN(ADC_PIN, 0, 512, 1023),
     [1] = JOYSTICK_AXIS_VIRTUAL
 };
diff --git a/keyboards/handwired/onekey/proton_c/halconf.h b/keyboards/handwired/onekey/proton_c/halconf.h
new file mode 100644
index 0000000000..4c66e56bba
--- /dev/null
+++ b/keyboards/handwired/onekey/proton_c/halconf.h
@@ -0,0 +1,26 @@
+/* Copyright 2020 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/blackpill_f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_ADC TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/proton_c/mcuconf.h b/keyboards/handwired/onekey/proton_c/mcuconf.h
new file mode 100644
index 0000000000..935056eb6a
--- /dev/null
+++ b/keyboards/handwired/onekey/proton_c/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
-- 
cgit v1.2.3