diff options
| -rw-r--r-- | .github/workflows/build.yml | 8 | ||||
| -rw-r--r-- | app/Kconfig | 154 |
2 files changed, 99 insertions, 63 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e22dc65..5e7e23f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ jobs: name: Build Test strategy: matrix: - board: [proton_c, nice_nano, bluemicro840_v1, nrfmicro_13] + board: [nice_nano, bluemicro840_v1, nrfmicro_13] shield: - boardsource3x4 - corne_left @@ -29,6 +29,12 @@ jobs: include: - board: proton_c shield: clueboard_california + - board: proton_c + shield: romac + - board: proton_c + shield: romac_plus + - board: proton_c + shield: settings_reset steps: # To use this repository's private action, # you must check out the repository diff --git a/app/Kconfig b/app/Kconfig index 285ed91..e8bfa3c 100644 --- a/app/Kconfig +++ b/app/Kconfig @@ -1,5 +1,9 @@ mainmenu "ZMK Firmware" +menu "ZMK" + +menu "Basic Keyboard Setup" + config ZMK_KEYBOARD_NAME string "Keyboard Name" @@ -18,34 +22,27 @@ config USB_DEVICE_PID config USB_DEVICE_MANUFACTURER default "ZMK Project" -config ZMK_KSCAN_EVENT_QUEUE_SIZE - int "Size of the event queue for KSCAN events to buffer events" - default 4 - menu "HID Output Types" -menuconfig ZMK_USB +config ZMK_USB bool "USB" select USB select USB_DEVICE_STACK select USB_DEVICE_HID -if USB +if ZMK_USB config ZMK_USB_INIT_PRIORITY - int "Init Priority" + int "USB Init Priority" default 50 -endif - -if ZMK_USB - config USB_NUMOF_EP_WRITE_RETRIES default 10 +#ZMK_USB endif -menuconfig ZMK_BLE +config ZMK_BLE bool "BLE (HID over GATT)" select BT select BT_SMP @@ -60,7 +57,7 @@ menuconfig ZMK_BLE if ZMK_BLE config ZMK_BLE_INIT_PRIORITY - int "Init Priority" + int "BLE Init Priority" default 50 config SYSTEM_WORKQUEUE_STACK_SIZE @@ -81,42 +78,12 @@ config ZMK_BLE_PASSKEY_ENTRY bool "Experimental: Requiring typing passkey from host to pair BLE connection" default n +#ZMK_BLE endif +#HID Output Types endmenu -menuconfig ZMK_SLEEP - bool "Enable deep sleep support" - imply USB - -if ZMK_SLEEP - -config SYS_POWER_DEEP_SLEEP_STATES - default y - -choice SYS_PM_POLICY - default SYS_PM_POLICY_APP -endchoice - -config ZMK_IDLE_SLEEP_TIMEOUT - int "Milliseconds to wait to sleep when going idle" - default 900000 - -endif - -config ZMK_EXT_POWER - bool "Enable support to control external power output" - default y - -config ZMK_DISPLAY - bool "ZMK display support" - default n - select DISPLAY - select LVGL - select LVGL_THEMES - select LVGL_THEME_MONO - select LVGL_OBJ_LABEL - menu "Split Support" config ZMK_SPLIT @@ -127,9 +94,17 @@ if ZMK_SPLIT config ZMK_SPLIT_BLE bool "Split keyboard support via BLE transport" - depends on ZMK_BLE default y select BT_USER_PHY_UPDATE + select BT + select BT_SMP + select BT_SMP_SC_PAIR_ONLY + select BT_SMP_APP_PAIRING_ACCEPT + select BT_PERIPHERAL + select BT_GATT_DIS + select BT_GATT_BAS + select BT_SETTINGS + select SETTINGS if ZMK_SPLIT_BLE @@ -159,15 +134,19 @@ config BT_MAX_CONN config BT_GAP_AUTO_UPDATE_CONN_PARAMS default n +#ZMK_SPLIT_BLE_ROLE_PERIPHERAL endif +#ZMK_SPLIT_BLE_ROLE endchoice +#ZMK_SPLIT_BLE endif +#ZMK_SPLIT endif -if ZMK_BLE +if ZMK_BLE || ZMK_SPLIT_BLE if ZMK_SPLIT_BLE && ZMK_SPLIT_BLE_ROLE_CENTRAL @@ -177,6 +156,7 @@ config BT_MAX_CONN config BT_MAX_PAIRED default 6 +#ZMK_SPLIT_BLE && ZMK_SPLIT_BLE_ROLE_CENTRAL endif if !ZMK_SPLIT_BLE @@ -187,31 +167,30 @@ config BT_MAX_CONN config BT_MAX_PAIRED default 5 +#!ZMK_SPLIT_BLE endif +#ZMK_BLE || ZMK_SPLIT_BLE endif +#Split Support endmenu -config ZMK_KSCAN_MOCK_DRIVER - bool "Enable mock kscan driver to simulate key presses" - default n +#Basic Keyboard Setup +endmenu +menu "Display/LED Options" -config ZMK_KSCAN_COMPOSITE_DRIVER - bool "Enable composite kscan driver to combine kscan devices" +config ZMK_DISPLAY + bool "ZMK display support" default n + select DISPLAY + select LVGL + select LVGL_THEMES + select LVGL_THEME_MONO + select LVGL_OBJ_LABEL -menu "ZMK Actions" - -config ZMK_ACTION_MOD_TAP - bool "Enable the Mod-Tap Action" - -endmenu - -menu "ZMK Lighting" - -menuconfig ZMK_RGB_UNDERGLOW +config ZMK_RGB_UNDERGLOW bool "RGB Adressable LED Underglow" select LED_STRIP @@ -257,8 +236,59 @@ config ZMK_RGB_UNDERGLOW_ON_START bool "Whether RGB underglow starts on by default" default y +#ZMK_RGB_UNDERGLOW +endif + +#Display/LED Options +endmenu + +menu "Power Management" + +config ZMK_SLEEP + bool "Enable deep sleep support" + imply USB + +if ZMK_SLEEP + +config SYS_POWER_DEEP_SLEEP_STATES + default y + +choice SYS_PM_POLICY + default SYS_PM_POLICY_APP +endchoice + +config ZMK_IDLE_SLEEP_TIMEOUT + int "Milliseconds to wait to sleep when going idle" + default 900000 + +#ZMK_SLEEP endif +config ZMK_EXT_POWER + bool "Enable support to control external power output" + default y + +#Power Management +endmenu + +menu "KSCAN Settings (Advanced)" + +config ZMK_KSCAN_EVENT_QUEUE_SIZE + int "Size of the event queue for KSCAN events to buffer events" + default 4 + +config ZMK_KSCAN_MOCK_DRIVER + bool "Enable mock kscan driver to simulate key presses" + default n + +config ZMK_KSCAN_COMPOSITE_DRIVER + bool "Enable composite kscan driver to combine kscan devices" + default n + +#KSCAN Settings (Advanced) +endmenu + +#ZMK endmenu config HEAP_MEM_POOL_SIZE |