Merge branch 'zmkfirmware:main' into feat/breeze

zmkfirmware · May 26, 2022 · a633431 · a633431
2 parents 365b353 + c679b7e
commit a633431
Show file tree

Hide file tree

Showing 45 changed files with 1,455 additions and 433 deletions.
diff --git a/.github/workflows/build-user-config.yml b/.github/workflows/build-user-config.yml
@@ -18,6 +18,11 @@ on:
         default: "bin"
         required: false
         type: string
+      artifact_name:
+        description: 'Artifact output file name'
+        default: 'firmware'
+        required: false
+        type: string
 
 jobs:
   matrix:
@@ -32,9 +37,10 @@ jobs:
       - name: Install yaml2json
         run: python3 -m pip install remarshal
 
-      - id: set-matrix
-        name: Fetch Build Matrix
+      - name: Fetch Build Matrix
+        id: set-matrix
         run: |
+          set -x
           matrix=$(yaml2json ${{ inputs.build_matrix_path }} | jq -c .)
           yaml2json ${{ inputs.build_matrix_path }}
           echo "::set-output name=matrix::${matrix}"
@@ -52,7 +58,9 @@ jobs:
       - name: Prepare variables
         id: variables
         run: |
-          if [ -n "${{ matrix.shield }}" ]; then
+          set -x
+          if [ -n "${{ matrix.shield }}" ]
+          then
             EXTRA_CMAKE_ARGS="-DSHIELD=${{ matrix.shield }}"
             ARTIFACT_NAME="${{ matrix.shield }}-${{ matrix.board }}-zmk"
             DISPLAY_NAME="${{ matrix.shield }} - ${{ matrix.board }}"
@@ -70,7 +78,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Cache west modules
-        uses: actions/cache@v3.0.1
+        uses: actions/cache@v3.0.2
         continue-on-error: true
         env:
           cache-name: cache-zephyr-${{ steps.variables.outputs.zephyr-version }}-modules
@@ -98,13 +106,15 @@ jobs:
 
       - name: West Build (${{ steps.variables.outputs.display-name }})
         run: |
+          set -x
           west build -s zmk/app -b ${{ matrix.board }} -- -DZMK_CONFIG=${GITHUB_WORKSPACE}/${{ inputs.config_path }} ${{ steps.variables.outputs.extra-cmake-args }} ${{ matrix.cmake-args }}
 
       - name: ${{ steps.variables.outputs.display-name }} Kconfig file
-        run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$" | sort
+        run: grep -v -e "^#" -e "^$" build/zephyr/.config | sort
 
       - name: Rename artifacts
         run: |
+          set -x
           mkdir build/artifacts
           if [ -f build/zephyr/zmk.uf2 ]
           then
@@ -117,5 +127,5 @@ jobs:
       - name: Archive (${{ steps.variables.outputs.display-name }})
         uses: actions/upload-artifact@v2
         with:
-          name: firmware
+          name: ${{ inputs.artifact_name }}
           path: build/artifacts
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Cache west modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3.0.2
         env:
           cache-name: cache-zephyr-modules
         with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Cache west modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3.0.2
         env:
           cache-name: cache-zephyr-modules
         with:

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -26,25 +26,19 @@ target_sources(app PRIVATE src/stdlib.c)
 target_sources(app PRIVATE src/activity.c)
 target_sources(app PRIVATE src/kscan.c)
 target_sources(app PRIVATE src/matrix_transform.c)
-target_sources(app PRIVATE src/hid.c)
 target_sources(app PRIVATE src/sensors.c)
 target_sources_ifdef(CONFIG_ZMK_WPM app PRIVATE src/wpm.c)
 target_sources(app PRIVATE src/event_manager.c)
 target_sources_ifdef(CONFIG_ZMK_EXT_POWER app PRIVATE src/ext_power_generic.c)
 target_sources(app PRIVATE src/events/activity_state_changed.c)
 target_sources(app PRIVATE src/events/position_state_changed.c)
-target_sources(app PRIVATE src/events/layer_state_changed.c)
-target_sources(app PRIVATE src/events/keycode_state_changed.c)
-target_sources(app PRIVATE src/events/modifiers_state_changed.c)
-target_sources(app PRIVATE src/events/endpoint_selection_changed.c)
 target_sources(app PRIVATE src/events/sensor_event.c)
 target_sources_ifdef(CONFIG_ZMK_WPM app PRIVATE src/events/wpm_state_changed.c)
-target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/events/ble_active_profile_changed.c)
-target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/events/battery_state_changed.c)
 target_sources_ifdef(CONFIG_USB_DEVICE_STACK app PRIVATE src/events/usb_conn_state_changed.c)
 target_sources(app PRIVATE src/behaviors/behavior_reset.c)
 target_sources_ifdef(CONFIG_ZMK_EXT_POWER app PRIVATE src/behaviors/behavior_ext_power.c)
 if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL)
+  target_sources(app PRIVATE src/hid.c)
   target_sources(app PRIVATE src/behaviors/behavior_key_press.c)
   target_sources(app PRIVATE src/behaviors/behavior_hold_tap.c)
   target_sources(app PRIVATE src/behaviors/behavior_sticky_key.c)
@@ -63,27 +57,43 @@ if ((NOT CONFIG_ZMK_SPLIT) OR CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL)
   target_sources(app PRIVATE src/combo.c)
   target_sources(app PRIVATE src/behavior_queue.c)
   target_sources(app PRIVATE src/conditional_layer.c)
+  target_sources(app PRIVATE src/endpoints.c)
+  target_sources(app PRIVATE src/events/endpoint_selection_changed.c)
+  target_sources(app PRIVATE src/hid_listener.c)
   target_sources(app PRIVATE src/keymap.c)
+  target_sources(app PRIVATE src/events/layer_state_changed.c)
+  target_sources(app PRIVATE src/events/modifiers_state_changed.c)
+  target_sources(app PRIVATE src/events/keycode_state_changed.c)
+
+  if (CONFIG_ZMK_BLE)
+    target_sources(app PRIVATE src/events/ble_active_profile_changed.c)
+    target_sources(app PRIVATE src/behaviors/behavior_bt.c)
+    target_sources(app PRIVATE src/ble.c)
+    target_sources(app PRIVATE src/hog.c)
+  endif()
 endif()
+
 target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/behaviors/behavior_rgb_underglow.c)
 target_sources_ifdef(CONFIG_ZMK_BACKLIGHT app PRIVATE src/behaviors/behavior_backlight.c)
-target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/behaviors/behavior_bt.c)
-target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/ble.c)
+
+target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/events/battery_state_changed.c)
 target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/battery.c)
-if (CONFIG_ZMK_SPLIT_BLE AND (NOT CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL))
-	target_sources(app PRIVATE src/split_listener.c)
-	target_sources(app PRIVATE src/split/bluetooth/service.c)
-endif()
-if (CONFIG_ZMK_SPLIT_BLE AND CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL)
-	target_sources(app PRIVATE src/split/bluetooth/central.c)
+
+if (CONFIG_ZMK_SPLIT_BLE)
+  if (NOT CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL)
+    target_sources(app PRIVATE src/split_listener.c)
+    target_sources(app PRIVATE src/split/bluetooth/service.c)
+    target_sources(app PRIVATE src/split/bluetooth/peripheral.c)
+    target_sources(app PRIVATE src/events/split_peripheral_status_changed.c)
+  endif()
+  if (CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL)
+    target_sources(app PRIVATE src/split/bluetooth/central.c)
+  endif()
 endif()
 target_sources_ifdef(CONFIG_USB_DEVICE_STACK app PRIVATE src/usb.c)
 target_sources_ifdef(CONFIG_ZMK_USB app PRIVATE src/usb_hid.c)
-target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/hog.c)
 target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/rgb_underglow.c)
 target_sources_ifdef(CONFIG_ZMK_BACKLIGHT app PRIVATE src/backlight.c)
-target_sources(app PRIVATE src/endpoints.c)
-target_sources(app PRIVATE src/hid_listener.c)
 target_sources(app PRIVATE src/main.c)
 
 add_subdirectory(src/display/)

diff --git a/app/Kconfig b/app/Kconfig
@@ -518,6 +518,11 @@ config ZMK_SETTINGS_SAVE_DEBOUNCE
 #SETTINGS
 endif
 
+config ZMK_BATTERY_REPORT_INTERVAL
+	depends on ZMK_BLE
+	int "Battery level report interval in seconds"
+	default 60
+
 #Advanced
 endmenu