diff --git a/app/boards/arm/kbdfans_tofu65_v2/Kconfig.board b/app/boards/arm/kbdfans_tofu65_v2/Kconfig.board index 7db63263..3457b548 100644 --- a/app/boards/arm/kbdfans_tofu65_v2/Kconfig.board +++ b/app/boards/arm/kbdfans_tofu65_v2/Kconfig.board @@ -1,6 +1,6 @@ # Copyright (c) 2022 Pete Johanson # SPDX-License-Identifier: Apache-2.0 -config BOARD_TOFU65_V2 - bool "Kbdfans Tofu65 2.0" +config BOARD_KBDFANS_TOFU65_V2 + bool "KBDfans Tofu65 2.0" depends on SOC_RP2040 diff --git a/app/boards/arm/kbdfans_tofu65_v2/Kconfig.defconfig b/app/boards/arm/kbdfans_tofu65_v2/Kconfig.defconfig index fd2b0f17..993d5142 100644 --- a/app/boards/arm/kbdfans_tofu65_v2/Kconfig.defconfig +++ b/app/boards/arm/kbdfans_tofu65_v2/Kconfig.defconfig @@ -1,10 +1,10 @@ # Copyright (c) 2023 The ZMK Contributors # SPDX-License-Identifier: MIT -if BOARD_TOFU65_V2 +if BOARD_KBDFANS_TOFU65_V2 config ZMK_KEYBOARD_NAME - default "kbdfans_tofu65" + default "kbdfans tofu65" config RP2_FLASH_W25Q080 default y @@ -12,4 +12,4 @@ config RP2_FLASH_W25Q080 config ZMK_USB default y -endif # BOARD_TOFU65_V2 +endif # BOARD_KBDFANS_TOFU65_V2 diff --git a/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.dts b/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.dts index 2bb5b1ac..e66647f7 100644 --- a/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.dts +++ b/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.dts @@ -11,8 +11,6 @@ #include / { - // model = "Tofu65, 2.0"; - // compatible = "tofu65,2.0", "st,stm32f303"; chosen { zephyr,sram = &sram0; @@ -24,10 +22,6 @@ zmk,matrix_transform = &default_transform; }; - // aliases { - // watchdog0 = &wdt0; - // }; - xtal_clk: xtal-clk { compatible = "fixed-clock"; clock-frequency = <12000000>; @@ -41,7 +35,7 @@ // ------- Switch Matrix ---------- // -// Column 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | +// Column 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | // ========================================================================================== // Row 0 || S0 | S1 | S2 | S3 | S4 | S5 | S6 | S7 | S8 | S9 | S10 | S11 | S12 | S13 | S14 | // Row 1 || S0 | S1 | S2 | S3 | S4 | S5 | S6 | S7 | S8 | S9 | S10 | S11 | S12 | S13 | S14 | @@ -161,9 +155,3 @@ RC(4,0) RC(4,1) RC(4,2) RC(4,6) RC(4,8) RC(4,9) zephyr_udc0: &usbd { status = "okay"; }; - - -// &vreg { -// regulator-always-on; -// regulator-allowed-modes = ; -// }; diff --git a/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.keymap b/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.keymap index f1d3a542..7eca7919 100644 --- a/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.keymap +++ b/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.keymap @@ -50,7 +50,7 @@ base { // --------- Default QWERTY Layout --------- -// Layer 0 +// Layer 0 BASE // ------------------------------------------------------------------------------------------------- // | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | BSPC | HME | // ------------------------------------------------------------------------------------------------- @@ -73,7 +73,7 @@ func { // --------- Default QWERTY Layout --------- -// Layer 0 +// Layer 1 FUNC // --------------------------------------------------------------------------------------------------- // | ESC | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | DEL | HME | // --------------------------------------------------------------------------------------------------- @@ -86,7 +86,7 @@ // | ---- | ---- | ---- | ---- | -- | MO 1 | -- | PREV | VOL DN | NEXT | // --------------------------------------------------------------------------------------------------- bindings = < -&trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp DEL &trans +&kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp DEL &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp SLCK &kp PAUSE_BREAK &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp C_VOL_UP &kp C_MUTE diff --git a/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.yaml b/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.yaml index 4adf1484..4916bf3b 100644 --- a/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.yaml +++ b/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.yaml @@ -1,5 +1,5 @@ -identifier: tofu65_v2 -name: Kbdfans Tofu65 2.0 +identifier: kbdfans_tofu65_v2 +name: KBDfans Tofu65 2.0 type: mcu arch: arm flash: 8192 diff --git a/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.zmk.yml b/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.zmk.yml index ec53e7f0..382e7dd3 100644 --- a/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.zmk.yml +++ b/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2.zmk.yml @@ -1,10 +1,10 @@ file_format: "1" -id: tofu65_v2 -name: Tofu65 2.0 +id: kbdfans_tofu65_v2 +name: KBDfans Tofu65 2.0 type: board arch: arm features: - keys outputs: - usb -url: +url: https://kbdfans.com/collections/tofu65-2-0/products/tofu65-2-0 diff --git a/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2_defconfig b/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2_defconfig index 4d3497e2..0695d7b7 100644 --- a/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2_defconfig +++ b/app/boards/arm/kbdfans_tofu65_v2/kbdfans_tofu65_v2_defconfig @@ -3,7 +3,7 @@ CONFIG_SOC_SERIES_RP2XXX=y CONFIG_SOC_RP2040=y -CONFIG_BOARD_TOFU65_V2=y +CONFIG_BOARD_KBDFANS_TOFU65_V2=y CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=125000000