config cleanup

keeb-it · Aug 28, 2024 · 589aacf · 589aacf
1 parent df80321
commit 589aacf
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 33 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,5 +1,10 @@
+name: "Build ZMK Firmware"
 on: [push, pull_request, workflow_dispatch]
 
+concurrency:
+  group: "${{ github.workflow }}-${{ github.ref }}"
+  cancel-in-progress: true
+
 jobs:
   build:
     uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
diff --git a/boards/shields/acorn/acorn.zmk.yml b/boards/shields/acorn/acorn.zmk.yml
@@ -3,7 +3,7 @@ id: acorn
 name: acorn
 type: shield
 url: https://github.com/keeb-it/acorn
-requires: [seeeduino_xiao_ble, seeeduino_xiao_rp2040]
+requires: [nice_nano_v2]
 exposes: [i2c_oled, spi_oled]
 siblings:
   - acorn_central_dongle

diff --git a/boards/shields/acorn/acorn_central_dongle.conf b/boards/shields/acorn/acorn_central_dongle.conf
@@ -2,18 +2,11 @@
 CONFIG_BT_MAX_CONN=5
 CONFIG_BT_MAX_PAIRED=5
 
-# combo config
-CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=7
-
 # dongle mode
 CONFIG_ZMK_SPLIT_BLE_CENTRAL_PERIPHERALS=2
 
 # display
 # CONFIG_ZMK_DISPLAY=y
 # CONFIG_ZMK_IDLE_TIMEOUT=60000
 # CONFIG_BT_BAS=n
-# CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_FETCHING=y
-
-# Turn on logging, and set ZMK logging to debug output
-# CONFIG_ZMK_USB_LOGGING=y
-# CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=8000
+# CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_FETCHING=y
diff --git a/boards/shields/acorn/acorn_central_left.conf b/boards/shields/acorn/acorn_central_left.conf
@@ -2,13 +2,6 @@
 CONFIG_BT_MAX_CONN=4
 CONFIG_BT_MAX_PAIRED=4
 
-# combo config
-CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=7
-
 # battery reporting
 CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_FETCHING=y
 CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_PROXY=y
-
-# Turn on logging, and set ZMK logging to debug output
-# CONFIG_ZMK_USB_LOGGING=y
-# CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=8000
diff --git a/boards/shields/hana/hana_central_dongle.conf b/boards/shields/hana/hana_central_dongle.conf
@@ -2,9 +2,6 @@
 CONFIG_BT_MAX_CONN=5
 CONFIG_BT_MAX_PAIRED=5
 
-# combo config
-CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=7
-
 # dongle mode
 CONFIG_ZMK_SPLIT_BLE_CENTRAL_PERIPHERALS=2
 
@@ -13,7 +10,3 @@ CONFIG_ZMK_SPLIT_BLE_CENTRAL_PERIPHERALS=2
 # CONFIG_ZMK_IDLE_TIMEOUT=60000
 # CONFIG_BT_BAS=n
 # CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_FETCHING=y
-
-# Turn on logging, and set ZMK logging to debug output
-# CONFIG_ZMK_USB_LOGGING=y
-# CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=8000
diff --git a/boards/shields/hana/hana_central_left.conf b/boards/shields/hana/hana_central_left.conf
@@ -2,13 +2,6 @@
 CONFIG_BT_MAX_CONN=4
 CONFIG_BT_MAX_PAIRED=4
 
-# combo config
-CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=7
-
 # battery reporting
 CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_FETCHING=y
 CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_PROXY=y
-
-# Turn on logging, and set ZMK logging to debug output
-# CONFIG_ZMK_USB_LOGGING=y
-# CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=8000
diff --git a/config/acorn.conf b/config/acorn.conf
@@ -14,6 +14,3 @@ CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
 
 # Enable deep sleep
 CONFIG_ZMK_SLEEP=y
-
-# Set NFC Pins on Xiao as GPIO
-CONFIG_NFCT_PINS_AS_GPIOS=y