qmk_me

commit fcad308bee5b958e14e49758a05a73c32a6aa0ef
parent 9628902a0efa971f71b2dc06217029096ad37680
Author: Jack Sangdahl <jack@pngu.org>
Date:   Sun,  7 Dec 2025 10:27:35 +0100

Move RP2040 ROM maths to onekey keymap

Diffstat:
R
ld/RP2040_FLASH_TIMECRIT_ROM_MATH.ld -> keyboards/handwired/onekey/keymaps/rp_rom_math/RP2040_FLASH_TIMECRIT_ROM_MATH.ld
 | 
0

A
keyboards/handwired/onekey/keymaps/rp_rom_math/keymap.c
 | 
16
++++++++++++++++
R
users/jack/picosdk_math.mk -> keyboards/handwired/onekey/keymaps/rp_rom_math/picosdk_math.mk
 | 
0

A
keyboards/handwired/onekey/keymaps/rp_rom_math/post_rules.mk
 | 
2
++
M
users/jack/jack.c
 | 
14
--------------
M
users/jack/post_rules.mk
 | 
6
------
M
users/jack/rules.mk
 | 
3
---

7 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/ld/RP2040_FLASH_TIMECRIT_ROM_MATH.ld b/keyboards/handwired/onekey/keymaps/rp_rom_math/RP2040_FLASH_TIMECRIT_ROM_MATH.ld
diff --git a/keyboards/handwired/onekey/keymaps/rp_rom_math/keymap.c b/keyboards/handwired/onekey/keymaps/rp_rom_math/keymap.c
@@ -0,0 +1,16 @@
+// Copyright 2025 jack@pngu.org
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT_ortho_1x1(KC_A)};
+
+typedef void (*init_fn)(void);
+extern init_fn __preinit_array_base__;
+extern init_fn __preinit_array_end__;
+
+void keyboard_pre_init_user(void) {
+  for (init_fn *func = &__preinit_array_base__; func < &__preinit_array_end__;
+       func++)
+    (*func)();
+}
diff --git a/users/jack/picosdk_math.mk b/keyboards/handwired/onekey/keymaps/rp_rom_math/picosdk_math.mk
diff --git a/keyboards/handwired/onekey/keymaps/rp_rom_math/post_rules.mk b/keyboards/handwired/onekey/keymaps/rp_rom_math/post_rules.mk
@@ -0,0 +1,2 @@
+include picosdk_math.mk
+MCU_LDSCRIPT = RP2040_FLASH_TIMECRIT_ROM_MATH
diff --git a/users/jack/jack.c b/users/jack/jack.c
@@ -51,17 +51,3 @@ bool oled_task_user(void) {
   return false;
 }
 #endif
-
-__attribute__((weak)) void keyboard_pre_init_keymap(void) {}
-void keyboard_pre_init_user(void) {
-#ifdef RP2040_MATH_IN_ROM
-  typedef void (*init_fn)(void);
-  extern init_fn __preinit_array_base__;
-  extern init_fn __preinit_array_end__;
-
-  for (init_fn *func = &__preinit_array_base__; func < &__preinit_array_end__;
-       func++)
-    (*func)();
-#endif
-  keyboard_pre_init_keymap();
-}
diff --git a/users/jack/post_rules.mk b/users/jack/post_rules.mk
@@ -1,9 +1,3 @@
-ifeq ($(strip $(RP2040_MATH_IN_ROM)), yes)
-	include picosdk_math.mk
-	OPT_DEFS += -DRP2040_MATH_IN_ROM
-	MCU_LDSCRIPT = RP2040_FLASH_TIMECRIT_ROM_MATH
-endif
-
 ifeq ($(strip $(MOUSE_JIGGLE_ENABLE)), yes)
 	OPT_DEFS += -DMOUSE_JIGGLE_ENABLE
 	MOUSEKEY_ENABLE = yes
diff --git a/users/jack/rules.mk b/users/jack/rules.mk
@@ -22,8 +22,5 @@ ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
 endif
 
 ifeq ($(PLATFORM), CHIBIOS)
-	ifeq ($(MCU_SERIES), RP2040)
-		RP2040_MATH_IN_ROM = no
-	endif
 	EXTRAFLAGS += -O3
 endif