Misc board updates

ReFil · Mar 7, 2024 · 41fc8e1 · 41fc8e1
1 parent 1d3629c
commit 41fc8e1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/app/boards/arm/stp/board.cmake b/app/boards/arm/stp/board.cmake
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
 
 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
-include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
diff --git a/app/boards/arm/stp/stp.dts b/app/boards/arm/stp/stp.dts
@@ -25,6 +25,8 @@
         zmk,matrix_transform = &default_transform;
         zmk,battery = &vbatt;
         zephyr,console = &cdc_acm_uart;
+        zmk,profileswitch = &profileswitch;
+        zmk,indicators = &led_strip;
     };
 
     default_transform: keymap_transform_0 {

diff --git a/app/boards/arm/stp/stp.keymap b/app/boards/arm/stp/stp.keymap
@@ -5,6 +5,7 @@
 #include <dt-bindings/zmk/reset.h>
 #include <dt-bindings/zmk/outputs.h>
 #include <dt-bindings/zmk/trackpad.h>
+#include <dt-bindings/zmk/stp.h>
 
 
 / {
@@ -22,7 +23,7 @@
             // ------------------------------------------------------------------------------------------------------------
 
             bindings = <
-            &kp ESC     &kp F1    &kp F2    &kp F3     &kp F4     &kp F5    &kp F6  &kp F7    &kp F8    &kp F9   &kp F10    &kp F11    &out OUT_TOG     &mo 1    &bootloader  &sys_reset
+            &kp ESC     &kp F1    &kp F2    &kp F3     &kp F4     &kp F5    &kp F6  &kp F7    &kp F8    &kp F9   &kp F10    &kp F11    &kp F12    &mo 1    &kp DEL  &kp INS
             &kp GRAVE   &kp N1    &kp N2    &kp N3     &kp N4     &kp N5    &kp N6  &kp N7    &kp N8    &kp N9    &kp N0  &kp MINUS  &kp EQUAL             &kp BACKSPACE      &kp HOME
             &kp TAB        &kp Q     &kp W     &kp E      &kp R      &kp T     &kp Y   &kp U      &kp I     &kp O     &kp P   &kp LBKT   &kp RBKT         &kp BSLH            &kp END
             &kp CLCK          &kp A     &kp S     &kp D      &kp F      &kp G     &kp H   &kp J      &kp K     &kp L  &kp SEMI    &kp SQT              &kp RET                &kp PG_UP
@@ -33,11 +34,11 @@
 
         raise {
             bindings = <
-            &none       &kp C_MUTE     &kp C_VOL_DN    &kp C_VOL_UP  &kp C_PREV  &kp C_PP       &kp C_NEXT  &bl BL_DEC  &bl BL_INC  &kp C_BRI_DN  &kp C_BRI_UP  &bt BT_CLR     &none       &trans  &none  &none
+            &none       &kp C_MUTE     &kp C_VOL_DN    &kp C_VOL_UP  &kp C_PREV  &kp C_PP       &kp C_NEXT  &bl BL_DEC  &bl BL_INC  &kp C_BRI_DN  &kp C_BRI_UP  &bt BT_CLR     &stp STP_BAT       &trans  &none  &none
             &none       &none          &none           &none         &none       &none          &none       &none       &none       &none         &none         &none          &none           &none      &none
             &none       &none          &kp C_MEDIA_WWW &none         &none       &kp C_MEDIA_TV &none      &none     &none        &none     &none    &none  &none       &sys_reset  &none
-            &none       &none          &none     &none     &none    &tp TP_MULTI_TOG      &none    &none      &none        &none      &none   &none      &bootloader  &none
-            &none       &none          &none   &none      &none   &none      &none      &none      &none       &none    &none  &none          &none       &none
+            &none       &none          &none     &none     &none    &none      &kp C_AC_HOME    &none      &none        &none      &none   &none      &bootloader  &none
+            &none       &none          &none   &none      &none   &kp C_AC_BACK      &none      &none      &none       &none    &none  &none          &none       &none
             &none       &none          &none     &none    &none      &none      &none  &none        &none        &none  &none
             >;
         };

diff --git a/app/boards/arm/stp/stp_defconfig b/app/boards/arm/stp/stp_defconfig
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022 The ZMK Contributors
+# Copyright (c) 2024 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 #
 
@@ -18,9 +18,6 @@ CONFIG_PINCTRL=y
 CONFIG_SPI=y
 CONFIG_SPI_NRFX=y
 
-CONFIG_ZMK_USB_LOGGING=y
-
-
 # Enable I2C for trackpad
 CONFIG_I2C=y
 CONFIG_ZMK_MOUSE=y
@@ -49,9 +46,10 @@ CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_150PPM=y
 
 # RGB leds config
+CONFIG_ZMK_STP_INDICATORS=y
+CONFIG_ZMK_STP_INDICATORS_BRT_MAX=10
 CONFIG_WS2812_STRIP=y
 
-
 # Backlighting configuration
 CONFIG_PWM=y
 CONFIG_LED_PWM=y
@@ -69,10 +67,11 @@ CONFIG_USB_DEVICE_VID=0x29EA
 CONFIG_USB_DEVICE_PID=0x1000
 CONFIG_USB_DEVICE_MANUFACTURER="Kinesis Corporation"
 
+CONFIG_ZMK_PROFILESWITCH=y
 CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y
 CONFIG_ZMK_HID_REPORT_TYPE_NKRO=n
 CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y
 CONFIG_BUILD_OUTPUT_UF2=y
 
 
-#CONFIG_ZMK_USB_LOGGING=y
+CONFIG_ZMK_USB_LOGGING=n