kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'zmkfirmware:main' into main

Browse source
This commit is contained in:
WSTRN 2024-01-30 21:18:52 +08:00 • committed by GitHub
commit 67d139f6f4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
201 changed files with 11584 additions and 17351 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/ble-test.yml vendored
View file

@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Find test directories
id: test-dirs
run: |
@ -38,9 +38,9 @@ jobs:
image: docker.io/zmkfirmware/zmk-build-arm:3.2
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache west modules
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-zephyr-modules
with:

22
.github/workflows/build-user-config.yml vendored
View file

@ -32,7 +32,7 @@ jobs:
build_matrix: ${{ env.build_matrix }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install yaml2json
run: python3 -m pip install remarshal
@ -53,7 +53,7 @@ jobs:
matrix: ${{ fromJson(needs.matrix.outputs.build_matrix) }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Create build directory
run: |
@ -87,7 +87,7 @@ jobs:
fi
- name: Cache west modules
uses: actions/cache@v3.0.11
uses: actions/cache@v4
continue-on-error: true
env:
cache_name: cache-zephyr-${{ env.zephyr_version }}-modules
@ -157,7 +157,19 @@ jobs:
fi
- name: Archive (${{ env.display_name }})
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: artifact-${{ env.artifact_name }}
path: ${{ env.build_dir }}/artifacts
merge:
runs-on: ubuntu-latest
needs: build
name: Merge Output Artifacts
steps:
- name: Merge Artifacts
uses: actions/upload-artifact/merge@v4
with:
name: ${{ inputs.archive_name }}
path: ${{ env.build_dir }}/artifacts
pattern: artifact-*
delete-merged: true

65
.github/workflows/build.yml vendored
View file

@ -24,9 +24,9 @@ jobs:
include: ${{ fromJSON(needs.compile-matrix.outputs.include-list) }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache west modules
uses: actions/cache@v3.0.2
uses: actions/cache@v4
env:
cache-name: cache-zephyr-modules
with:
@ -49,18 +49,17 @@ jobs:
- name: Export Zephyr CMake package (west zephyr-export)
run: west zephyr-export
- name: Use Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: "14.x"
- name: Install @actions/artifact
run: npm install @actions/artifact
- name: Build and upload artifacts
- name: Build
uses: actions/github-script@v7
id: boards-list
with:
script: |
const fs = require('fs');
const {default: artifact} = require('@actions/artifact');
const execSync = require('child_process').execSync;
@ -70,10 +69,39 @@ jobs:
for (const shieldArgs of buildShieldArgs) {
try {
console.log(`::group::${{ matrix.board}} ${shieldArgs.shield} Build`)
const output = execSync(`west build -s app -p -b ${{ matrix.board }} -- ${shieldArgs.shield ? '-DSHIELD="' + shieldArgs.shield + '"' : ''} ${shieldArgs['cmake-args'] || ''}`);
console.log(`::group::${{ matrix.board}} ${shieldArgs.shield} Build`)
console.log(output.toString());
} catch (e) {
console.error(`::error::Failed to build ${{ matrix.board }} ${shieldArgs.shield} ${shieldArgs['cmake-args']}`);
console.error(e);
error = true;
} finally {
console.log('::endgroup::');
}
}
if (error) {
throw new Error('Failed to build one or more configurations');
}
- name: Upload artifacts
uses: actions/github-script@v7
continue-on-error: ${{ github.event_name == 'pull_request' }}
id: boards-upload
with:
script: |
const fs = require('fs');
const {default: artifact} = require('@actions/artifact');
const buildShieldArgs = JSON.parse(`${{ matrix.shieldArgs }}`);
let error = false;
for (const shieldArgs of buildShieldArgs) {
try {
console.log(`::group::${{ matrix.board}} ${shieldArgs.shield} Upload`)
const fileExtensions = ["hex", "uf2"];
@ -91,7 +119,7 @@ jobs:
await artifact.uploadArtifact(artifactName, files, rootDirectory, options);
} catch (e) {
console.error(`::error::Failed to build or upload ${{ matrix.board }} ${shieldArgs.shield} ${shieldArgs['cmake-args']}`);
console.error(`::error::Failed to upload ${{ matrix.board }} ${shieldArgs.shield} ${shieldArgs['cmake-args']}`);
console.error(e);
error = true;
} finally {
@ -150,9 +178,9 @@ jobs:
core-include: ${{ steps.core-list.outputs.result }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: "14.x"
- name: Install js-yaml
@ -179,9 +207,9 @@ jobs:
boards-include: ${{ steps.boards-list.outputs.result }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: "14.x"
- name: Install js-yaml
@ -306,9 +334,9 @@ jobs:
organized-metadata: ${{ steps.organize-metadata.outputs.result }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: "14.x"
- name: Install js-yaml
@ -381,19 +409,20 @@ jobs:
if: ${{ github.event_name != 'schedule' }}
runs-on: ubuntu-latest
outputs:
changed-files: ${{ steps.changed-files.outputs.all }}
changed-files: ${{ steps.changed-files.outputs.all_changed_files }}
board-changes: ${{ steps.board-changes.outputs.result }}
core-changes: ${{ steps.core-changes.outputs.result }}
steps:
- uses: Ana06/get-changed-files@v2.0.0
- uses: tj-actions/changed-files@v42
id: changed-files
with:
format: "json"
json: true
escape_json: false
- uses: actions/github-script@v7
id: board-changes
with:
script: |
const changedFiles = JSON.parse(`${{ steps.changed-files.outputs.all }}`);
const changedFiles = JSON.parse(`${{ steps.changed-files.outputs.all_changed_files }}`);
const boardChanges = changedFiles.filter(f => f.startsWith('app/boards'));
return boardChanges.length ? 'true' : 'false';
result-encoding: string
@ -401,7 +430,7 @@ jobs:
id: core-changes
with:
script: |
const changedFiles = JSON.parse(`${{ steps.changed-files.outputs.all }}`);
const changedFiles = JSON.parse(`${{ steps.changed-files.outputs.all_changed_files }}`);
const boardChanges = changedFiles.filter(f => f.startsWith('app/boards'));
const appChanges = changedFiles.filter(f => f.startsWith('app'));
const ymlChanges = changedFiles.includes('.github/workflows/build.yml');

4
.github/workflows/doc-checks.yml vendored
View file

@ -14,7 +14,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: bahmutov/npm-install@v1
with:
working-directory: docs
@ -24,7 +24,7 @@ jobs:
typecheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: bahmutov/npm-install@v1
with:
working-directory: docs

2
.github/workflows/hardware-metadata-validation.yml vendored
View file

@ -20,7 +20,7 @@ jobs:
container:
image: docker.io/zmkfirmware/zmk-dev-arm:3.2
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies
run: pip install -r app/scripts/requirements.txt
- name: West init

4
.github/workflows/pre-commit.yml vendored
View file

@ -8,8 +8,8 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.x
- uses: pre-commit/action@v3.0.0

8
.github/workflows/test.yml vendored
View file

@ -6,11 +6,13 @@ on:
- ".github/workflows/test.yml"
- "app/tests/**"
- "app/src/**"
- "app/include/**"
pull_request:
paths:
- ".github/workflows/test.yml"
- "app/tests/**"
- "app/src/**"
- "app/include/**"
jobs:
collect-tests:
@ -19,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Find test directories
id: test-dirs
run: |
@ -36,9 +38,9 @@ jobs:
image: docker.io/zmkfirmware/zmk-build-arm:3.2
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache west modules
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-zephyr-modules
with:

7
app/Kconfig
View file

@ -217,7 +217,7 @@ config BT_GATT_NOTIFY_MULTIPLE
default n
config BT_GATT_AUTO_SEC_REQ
default n
default (ZMK_SPLIT_BLE && !ZMK_SPLIT_ROLE_CENTRAL)
config BT_DEVICE_APPEARANCE
default 961
@ -595,7 +595,7 @@ endmenu
endmenu
config HEAP_MEM_POOL_SIZE
default 8192
default 8192 if ZMK_DISPLAY
config KERNEL_BIN_NAME
default "zmk"
@ -606,6 +606,9 @@ config REBOOT
config USB_DEVICE_STACK
default y if HAS_HW_NRF_USBD
config FPU
default CPU_HAS_FPU
config ZMK_WPM
bool "Calculate WPM"
default n

6
app/boards/arm/adv360pro/adv360pro.dtsi
View file

@ -25,7 +25,7 @@
zmk,kscan = &kscan0;
zmk,backlight = &backlight;
zmk,battery = &vbatt;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
zmk,underglow = &led_strip;
};
@ -44,7 +44,9 @@
>;
};
ext-power {
// Node name must match original "EXT_POWER" label to preserve user settings.
EXT_POWER {
compatible = "zmk,ext-power-generic";
control-gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
};

2
app/boards/arm/bt60/bt60.dtsi
View file

@ -19,7 +19,7 @@
zephyr,console = &cdc_acm_uart;
zmk,battery = &vbatt;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
sensors: sensors {

2
app/boards/arm/bt60/bt60_v1.dts
View file

@ -11,7 +11,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &ansi_transform;
zmk,matrix-transform = &ansi_transform;
};
ansi_transform: keymap_transform_0 {

10
app/boards/arm/bt60/bt60_v1.keymap
View file

@ -13,15 +13,15 @@
/ {
chosen {
#ifdef ANSI
zmk,matrix_transform = &ansi_transform;
zmk,matrix-transform = &ansi_transform;
#elif defined(HHKB)
zmk,matrix_transform = &hhkb_transform;
zmk,matrix-transform = &hhkb_transform;
#elif defined(ISO)
zmk,matrix_transform = &iso_transform;
zmk,matrix-transform = &iso_transform;
#elif defined(ALL_1U)
zmk,matrix_transform = &all_1u_transform;
zmk,matrix-transform = &all_1u_transform;
#else
zmk,matrix_transform = &split_transform;
zmk,matrix-transform = &split_transform;
#endif
};

2
app/boards/arm/bt60/bt60_v1_hs.dts
View file

@ -11,7 +11,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/arm/ckp/bt60_v2.dts
View file

@ -13,7 +13,7 @@
compatible = "polarityworks,bt60_v2";
chosen {
zmk,matrix_transform = &ansi_transform;
zmk,matrix-transform = &ansi_transform;
};

8
app/boards/arm/ckp/bt60_v2.keymap
View file

@ -12,13 +12,13 @@
/ {
chosen {
#ifdef ANSI
zmk,matrix_transform = &ansi_transform;
zmk,matrix-transform = &ansi_transform;
#elif defined(ISO)
zmk,matrix_transform = &iso_transform;
zmk,matrix-transform = &iso_transform;
#elif defined(ALL_1U)
zmk,matrix_transform = &all_1u_transform;
zmk,matrix-transform = &all_1u_transform;
#elif defined(HHKB)
zmk,matrix_transform = &hhkb_transform;
zmk,matrix-transform = &hhkb_transform;
#else
#error "Layout not defined, please define a layout by uncommenting the appropriate line in bt60_v2.keymap"
#endif

2
app/boards/arm/ckp/bt65_v1.dts
View file

@ -13,7 +13,7 @@
compatible = "polarityworks,bt65_v1";
chosen {
zmk,matrix_transform = &ansi_transform;
zmk,matrix-transform = &ansi_transform;
};

8
app/boards/arm/ckp/bt65_v1.keymap
View file

@ -12,13 +12,13 @@
/ {
chosen {
#ifdef ANSI
zmk,matrix_transform = &ansi_transform;
zmk,matrix-transform = &ansi_transform;
#elif defined(ISO)
zmk,matrix_transform = &iso_transform;
zmk,matrix-transform = &iso_transform;
#elif defined(ALL_1U)
zmk,matrix_transform = &all_1u_transform;
zmk,matrix-transform = &all_1u_transform;
#elif defined(HHKB)
zmk,matrix_transform = &hhkb_transform;
zmk,matrix-transform = &hhkb_transform;
#else
#error "Layout not defined, please define a layout by uncommenting the appropriate line in bt65_v1.keymap"
#endif

2
app/boards/arm/ckp/bt75_v1.dts
View file

@ -13,7 +13,7 @@
compatible = "polarityworks,bt75_v1";
chosen {
zmk,matrix_transform = &ansi_transform;
zmk,matrix-transform = &ansi_transform;
};

6
app/boards/arm/ckp/bt75_v1.keymap
View file

@ -11,11 +11,11 @@
/ {
chosen {
#ifdef ANSI
zmk,matrix_transform = &ansi_transform;
zmk,matrix-transform = &ansi_transform;
#elif defined(ISO)
zmk,matrix_transform = &iso_transform;
zmk,matrix-transform = &iso_transform;
#elif defined(ALL_1U)
zmk,matrix_transform = &all_1u_transform;
zmk,matrix-transform = &all_1u_transform;
#else
#error "Layout not defined, please define a layout using by uncommenting the appropriate line in bt75_v1.keymap"
#endif

2
app/boards/arm/corneish_zen/corneish_zen.dtsi
View file

@ -21,7 +21,7 @@
zmk,kscan = &kscan0;
zmk,display = &epd;
zephyr,console = &cdc_acm_uart;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

4
app/boards/arm/corneish_zen/corneish_zen.keymap
View file

@ -11,8 +11,8 @@
/ {
chosen {
zmk,matrix_transform = &default_transform;
// zmk,matrix_transform = &five_column_transform;
zmk,matrix-transform = &default_transform;
// zmk,matrix-transform = &five_column_transform;
};
};

2
app/boards/arm/dz60rgb/dz60rgb_rev1.dts
View file

@ -18,7 +18,7 @@
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/arm/ferris/ferris_rev02.dts
View file

@ -19,7 +19,7 @@
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
zmk,kscan = &kscan;
zmk,matrix_transform = &transform;
zmk,matrix-transform = &transform;
/* TODO: Enable once we support the IC for underglow
zmk,underglow = &led_strip;
*/

2
app/boards/arm/glove80/glove80.dtsi
View file

@ -11,7 +11,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
zephyr,code-partition = &code_partition;
zephyr,sram = &sram0;
zephyr,flash = &flash0;

2
app/boards/arm/kbdfans_tofu65/kbdfans_tofu65_v2.dts
View file

@ -17,7 +17,7 @@
zephyr,shell-uart = &cdc_acm_uart;
zephyr,code-partition = &code_partition;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
xtal_clk: xtal-clk {

2
app/boards/arm/nice60/nice60.dts
View file

@ -23,7 +23,7 @@
zephyr,console = &cdc_acm_uart;
zmk,battery = &vbatt;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
zmk,underglow = &led_strip;
};

2
app/boards/arm/planck/planck_rev6.dts
View file

@ -18,7 +18,7 @@
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
zmk,kscan = &kscan0;
zmk,matrix_transform = &layout_grid_transform;
zmk,matrix-transform = &layout_grid_transform;
};
kscan0: kscan {

3
app/boards/arm/preonic/preonic_rev3.dts
View file

@ -17,8 +17,9 @@
chosen {
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart;
zmk,kscan = &kscan0;
zmk,matrix_transform = &layout_grid_transform;
zmk,matrix-transform = &layout_grid_transform;
};
kscan0: kscan_0 {

2
app/boards/arm/preonic/preonic_rev3.keymap
View file

@ -13,7 +13,7 @@
#define RAISE 2
/ {
chosen { zmk,matrix_transform = &layout_grid_transform; };
chosen { zmk,matrix-transform = &layout_grid_transform; };
keymap {
compatible = "zmk,keymap";
default_layer {

2
app/boards/arm/s40nc/s40nc.dts
View file

@ -19,7 +19,7 @@
zephyr,console = &cdc_acm_uart;
zmk,battery = &vbatt;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/a_dux/a_dux.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/bat43/bat43.overlay
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/bfo9000/bfo9000.dtsi
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/chalice/chalice.overlay
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};

2
app/boards/shields/clog/clog.dtsi
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/corne/corne.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zephyr,display = &oled;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/cradio/cradio.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/eek/eek.overlay
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/elephant42/elephant42.dtsi
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/ergodash/ergodash.dtsi
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/eternal_keypad/eternal_keypad.dtsi
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
kscan0: kscan {

2
app/boards/shields/eternal_keypad/eternal_keypad.keymap
View file

@ -17,7 +17,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
keymap {

2
app/boards/shields/eternal_keypad/eternal_keypad_lefty.keymap
View file

@ -17,7 +17,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
keymap {

2
app/boards/shields/fourier/fourier.dtsi
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
/*

2
app/boards/shields/helix/helix.dtsi
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/hummingbird/hummingbird.overlay
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
/delete-property/ zephyr,console;
/delete-property/ zephyr,shell-uart;
};

2
app/boards/shields/iris/iris.dtsi
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/jian/jian.dtsi
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/jiran/jiran.dtsi
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/jorne/jorne.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zephyr,display = &oled;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/kyria/kyria.dtsi
View file

@ -8,7 +8,7 @@
/ {
chosen {
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/kyria/kyria_common.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zephyr,display = &oled;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
kscan0: kscan {

2
app/boards/shields/kyria/kyria_rev2.dtsi
View file

@ -8,7 +8,7 @@
/ {
chosen {
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/kyria/kyria_rev3.dtsi
View file

@ -8,7 +8,7 @@
/ {
chosen {
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/leeloo/leeloo_common.dtsi
View file

@ -9,7 +9,7 @@
chosen {
zephyr,display = &oled;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/leeloo_micro/leeloo_micro.dtsi
View file

@ -9,7 +9,7 @@
chosen {
zephyr,display = &oled;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/lily58/lily58.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zephyr,display = &oled;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/lotus58/lotus58.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zephyr,display = &oled;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/m60/m60.overlay
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
kscan0: kscan {

2
app/boards/shields/microdox/microdox_common.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zephyr,display = &oled;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};

2
app/boards/shields/nibble/nibble.overlay
View file

@ -10,7 +10,7 @@
chosen {
zephyr,display = &oled;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
encoder_1: encoder_1 {

4
app/boards/shields/nice_view/widgets/peripheral_status.c
View file

@ -12,8 +12,8 @@
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/battery.h>
#include <zmk/display.h>
#include "peripheral_status.h"
#include <zmk/events/usb_conn_state_changed.h>
#include <zmk/event_manager.h>
#include <zmk/events/battery_state_changed.h>
@ -22,6 +22,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/usb.h>
#include <zmk/ble.h>
#include "peripheral_status.h"
LV_IMG_DECLARE(balloon);
LV_IMG_DECLARE(mountain);

1
app/boards/shields/nice_view/widgets/status.c
View file

@ -11,6 +11,7 @@
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/battery.h>
#include <zmk/display.h>
#include "status.h"
#include <zmk/events/usb_conn_state_changed.h>

2
app/boards/shields/osprette/osprette.overlay
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/qaz/qaz.overlay
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/quefrency/quefrency.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
/*

2
app/boards/shields/redox/redox.dtsi
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/reviung34/README.md
View file

@ -7,7 +7,7 @@ By default, the 2x1u layout is used. To use to the 1x2u layout, add the followin
```
/ {
chosen {
zmk,matrix_transform = &single_2u_transform;
zmk,matrix-transform = &single_2u_transform;
};
};
```

4
app/boards/shields/reviung34/reviung34.keymap
View file

@ -12,11 +12,11 @@
/ {
chosen {
// 34 keys.
zmk,matrix_transform = &dual_1u_transform;
zmk,matrix-transform = &dual_1u_transform;
// 33 keys. Center two thumb keys replaced by a single 2u key. Remember to adjust your
// keymap accordingly!
// zmk,matrix_transform = &single_2u_transform;
// zmk,matrix-transform = &single_2u_transform;
};
};

2
app/boards/shields/reviung34/reviung34.overlay
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &dual_1u_transform;
zmk,matrix-transform = &dual_1u_transform;
};
dual_1u_transform: keymap_transform_0 {

2
app/boards/shields/reviung41/reviung41.overlay
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/reviung5/reviung5.overlay
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/reviung53/reviung53.overlay
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/romac_plus/romac_plus.dtsi
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/snap/snap.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zephyr,display = &oled;
zmk,kscan = &kscan_composite;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
left_encoder: encoder_left {

2
app/boards/shields/sofle/sofle.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zephyr,display = &oled;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zephyr,display = &oled;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/splitkb_aurora_helix/splitkb_aurora_helix.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zephyr,display = &oled;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zephyr,display = &oled;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/splitkb_aurora_sofle/splitkb_aurora_sofle.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zephyr,display = &oled;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/splitkb_aurora_sweep/splitkb_aurora_sweep.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zephyr,display = &oled;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/splitreus62/splitreus62.dtsi
View file

@ -9,7 +9,7 @@
/ {
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/tg4x/tg4x.overlay
View file

@ -49,6 +49,6 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,4) RC(3,5) RC(7,1)
chosen {
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
};

2
app/boards/shields/tidbit/tidbit.dtsi
View file

@ -86,7 +86,7 @@
chosen {
zephyr,display = &oled;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
};

2
app/boards/shields/waterfowl/waterfowl.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zephyr,display = &oled;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

2
app/boards/shields/zodiark/zodiark.dtsi
View file

@ -10,7 +10,7 @@
chosen {
zephyr,display = &oled;
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
zmk,matrix-transform = &default_transform;
};
default_transform: keymap_transform_0 {

28
app/include/zmk/event_manager.h
View file

@ -38,7 +38,8 @@ struct zmk_event_subscription {
zmk_event_t header; \
struct event_type data; \
}; \
struct event_type##_event *new_##event_type(struct event_type); \
struct event_type##_event copy_raised_##event_type(const struct event_type *ev); \
int raise_##event_type(struct event_type); \
struct event_type *as_##event_type(const zmk_event_t *eh); \
extern const struct zmk_event_type zmk_event_##event_type;
@ -46,12 +47,14 @@ struct zmk_event_subscription {
const struct zmk_event_type zmk_event_##event_type = {.name = STRINGIFY(event_type)}; \
const struct zmk_event_type *zmk_event_ref_##event_type __used \
__attribute__((__section__(".event_type"))) = &zmk_event_##event_type; \
struct event_type##_event *new_##event_type(struct event_type data) { \
struct event_type##_event *ev = \
(struct event_type##_event *)k_malloc(sizeof(struct event_type##_event)); \
ev->header.event = &zmk_event_##event_type; \
ev->data = data; \
return ev; \
struct event_type##_event copy_raised_##event_type(const struct event_type *ev) { \
struct event_type##_event *outer = CONTAINER_OF(ev, struct event_type##_event, data); \
return *outer; \
}; \
int raise_##event_type(struct event_type data) { \
struct event_type##_event ev = {.data = data, \
.header = {.event = &zmk_event_##event_type}}; \
return ZMK_EVENT_RAISE(ev); \
}; \
struct event_type *as_##event_type(const zmk_event_t *eh) { \
return (eh->event == &zmk_event_##event_type) ? &((struct event_type##_event *)eh)->data \
@ -68,17 +71,14 @@ struct zmk_event_subscription {
.listener = &zmk_listener_##mod, \
};
#define ZMK_EVENT_RAISE(ev) zmk_event_manager_raise((zmk_event_t *)ev);
#define ZMK_EVENT_RAISE(ev) zmk_event_manager_raise(&(ev).header)
#define ZMK_EVENT_RAISE_AFTER(ev, mod) \
zmk_event_manager_raise_after((zmk_event_t *)ev, &zmk_listener_##mod);
zmk_event_manager_raise_after(&(ev).header, &zmk_listener_##mod)
#define ZMK_EVENT_RAISE_AT(ev, mod) \
zmk_event_manager_raise_at((zmk_event_t *)ev, &zmk_listener_##mod);
#define ZMK_EVENT_RAISE_AT(ev, mod) zmk_event_manager_raise_at(&(ev).header, &zmk_listener_##mod)
#define ZMK_EVENT_RELEASE(ev) zmk_event_manager_release((zmk_event_t *)ev);
#define ZMK_EVENT_FREE(ev) k_free((void *)ev);
#define ZMK_EVENT_RELEASE(ev) zmk_event_manager_release(&(ev).header)
int zmk_event_manager_raise(zmk_event_t *event);
int zmk_event_manager_raise_after(zmk_event_t *event, const struct zmk_listener *listener);

21
app/include/zmk/events/keycode_state_changed.h
View file

@ -21,7 +21,7 @@ struct zmk_keycode_state_changed {
ZMK_EVENT_DECLARE(zmk_keycode_state_changed);
static inline struct zmk_keycode_state_changed_event *
static inline struct zmk_keycode_state_changed
zmk_keycode_state_changed_from_encoded(uint32_t encoded, bool pressed, int64_t timestamp) {
uint16_t page = ZMK_HID_USAGE_PAGE(encoded);
uint16_t id = ZMK_HID_USAGE_ID(encoded);
@ -38,11 +38,16 @@ zmk_keycode_state_changed_from_encoded(uint32_t encoded, bool pressed, int64_t t
implicit_modifiers = SELECT_MODS(encoded);
}
return new_zmk_keycode_state_changed(
(struct zmk_keycode_state_changed){.usage_page = page,
.keycode = id,
.implicit_modifiers = implicit_modifiers,
.explicit_modifiers = explicit_modifiers,
.state = pressed,
.timestamp = timestamp});
return (struct zmk_keycode_state_changed){.usage_page = page,
.keycode = id,
.implicit_modifiers = implicit_modifiers,
.explicit_modifiers = explicit_modifiers,
.state = pressed,
.timestamp = timestamp};
}
static inline int raise_zmk_keycode_state_changed_from_encoded(uint32_t encoded, bool pressed,
int64_t timestamp) {
return raise_zmk_keycode_state_changed(
zmk_keycode_state_changed_from_encoded(encoded, pressed, timestamp));
}

5
app/include/zmk/events/layer_state_changed.h
View file

@ -17,8 +17,7 @@ struct zmk_layer_state_changed {
ZMK_EVENT_DECLARE(zmk_layer_state_changed);
static inline struct zmk_layer_state_changed_event *create_layer_state_changed(uint8_t layer,
bool state) {
return new_zmk_layer_state_changed((struct zmk_layer_state_changed){
static inline int raise_layer_state_changed(uint8_t layer, bool state) {
return raise_zmk_layer_state_changed((struct zmk_layer_state_changed){
.layer = layer, .state = state, .timestamp = k_uptime_get()});
}

6
app/include/zmk/events/mouse_button_state_changed.h
View file

@ -19,8 +19,8 @@ struct zmk_mouse_button_state_changed {
ZMK_EVENT_DECLARE(zmk_mouse_button_state_changed);
static inline struct zmk_mouse_button_state_changed_event *
zmk_mouse_button_state_changed_from_encoded(uint32_t encoded, bool pressed, int64_t timestamp) {
return new_zmk_mouse_button_state_changed((struct zmk_mouse_button_state_changed){
static inline int raise_zmk_mouse_button_state_changed_from_encoded(uint32_t encoded, bool pressed,
int64_t timestamp) {
return raise_zmk_mouse_button_state_changed((struct zmk_mouse_button_state_changed){
.buttons = ZMK_HID_USAGE_ID(encoded), .state = pressed, .timestamp = timestamp});
}

2
app/run-test.sh
View file

@ -26,7 +26,7 @@ fi
testcase="$path"
echo "Running $testcase:"
west build -d build/$testcase -b native_posix_64 -- -DZMK_CONFIG="$(pwd)/$testcase" > /dev/null 2>&1
west build -d build/$testcase -b native_posix_64 -- -DCONFIG_ASSERT=y -DZMK_CONFIG="$(pwd)/$testcase" > /dev/null 2>&1
if [ $? -gt 0 ]; then
echo "FAILED: $testcase did not build" | tee -a ./build/tests/pass-fail.log
exit 1

4
app/src/activity.c
View file

@ -43,8 +43,8 @@ static uint32_t activity_last_uptime;
#endif
int raise_event(void) {
return ZMK_EVENT_RAISE(new_zmk_activity_state_changed(
(struct zmk_activity_state_changed){.state = activity_state}));
return raise_zmk_activity_state_changed(
(struct zmk_activity_state_changed){.state = activity_state});
}
int set_state(enum zmk_activity_state state) {

8
app/src/battery.c
View file

@ -63,8 +63,8 @@ static int zmk_battery_update(const struct device *battery) {
return rc;
}
#endif
rc = ZMK_EVENT_RAISE(new_zmk_battery_state_changed(
(struct zmk_battery_state_changed){.state_of_charge = last_state_of_charge}));
rc = raise_zmk_battery_state_changed(
(struct zmk_battery_state_changed){.state_of_charge = last_state_of_charge});
}
return rc;
@ -87,7 +87,9 @@ static void zmk_battery_timer(struct k_timer *timer) {
K_TIMER_DEFINE(battery_timer, zmk_battery_timer, NULL);
static void zmk_battery_start_reporting() {
k_timer_start(&battery_timer, K_NO_WAIT, K_SECONDS(CONFIG_ZMK_BATTERY_REPORT_INTERVAL));
if (device_is_ready(battery)) {
k_timer_start(&battery_timer, K_NO_WAIT, K_SECONDS(CONFIG_ZMK_BATTERY_REPORT_INTERVAL));
}
}
static int zmk_battery_init(const struct device *_arg) {

90
app/src/behaviors/behavior_hold_tap.c
View file

@ -88,7 +88,24 @@ struct active_hold_tap {
struct active_hold_tap *undecided_hold_tap = NULL;
struct active_hold_tap active_hold_taps[ZMK_BHV_HOLD_TAP_MAX_HELD] = {};
// We capture most position_state_changed events and some modifiers_state_changed events.
const zmk_event_t *captured_events[ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS] = {};
enum captured_event_tag {
ET_NONE,
ET_POS_CHANGED,
ET_CODE_CHANGED,
};
union captured_event_data {
struct zmk_position_state_changed_event position;
struct zmk_keycode_state_changed_event keycode;
};
struct captured_event {
enum captured_event_tag tag;
union captured_event_data data;
};
struct captured_event captured_events[ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS] = {};
// Keep track of which key was tapped most recently for the standard, if it is a hold-tap
// a position, will be given, if not it will just be INT32_MIN
@ -122,33 +139,32 @@ static bool is_quick_tap(struct active_hold_tap *hold_tap) {
}
}
static int capture_event(const zmk_event_t *event) {
static int capture_event(struct captured_event *data) {
for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS; i++) {
if (captured_events[i] == NULL) {
captured_events[i] = event;
if (captured_events[i].tag == ET_NONE) {
captured_events[i] = *data;
return 0;
}
}
return -ENOMEM;
}
static struct zmk_position_state_changed *find_captured_keydown_event(uint32_t position) {
struct zmk_position_state_changed *last_match = NULL;
static bool have_captured_keydown_event(uint32_t position) {
for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS; i++) {
const zmk_event_t *eh = captured_events[i];
if (eh == NULL) {
return last_match;
struct captured_event *ev = &captured_events[i];
if (ev->tag == ET_NONE) {
return false;
}
struct zmk_position_state_changed *position_event = as_zmk_position_state_changed(eh);
if (position_event == NULL) {
if (ev->tag != ET_POS_CHANGED) {
continue;
}
if (position_event->position == position && position_event->state) {
last_match = position_event;
if (ev->data.position.data.position == position && ev->data.position.data.state) {
return true;
}
}
return last_match;
return false;
}
const struct zmk_listener zmk_listener_behavior_hold_tap;
@ -184,25 +200,35 @@ static void release_captured_events() {
// [k1_down, k1_up, null, null, null, ...]
// now mt2 will start releasing it's own captured positions.
for (int i = 0; i < ZMK_BHV_HOLD_TAP_MAX_CAPTURED_EVENTS; i++) {
const zmk_event_t *captured_event = captured_events[i];
if (captured_event == NULL) {
struct captured_event *captured_event = &captured_events[i];
enum captured_event_tag tag = captured_event->tag;
if (tag == ET_NONE) {
return;
}
captured_events[i] = NULL;
captured_events[i].tag = ET_NONE;
if (undecided_hold_tap != NULL) {
k_msleep(10);
}
struct zmk_position_state_changed *position_event;
struct zmk_keycode_state_changed *modifier_event;
if ((position_event = as_zmk_position_state_changed(captured_event)) != NULL) {
LOG_DBG("Releasing key position event for position %d %s", position_event->position,
(position_event->state ? "pressed" : "released"));
} else if ((modifier_event = as_zmk_keycode_state_changed(captured_event)) != NULL) {
LOG_DBG("Releasing mods changed event 0x%02X %s", modifier_event->keycode,
(modifier_event->state ? "pressed" : "released"));
switch (tag) {
case ET_CODE_CHANGED:
LOG_DBG("Releasing mods changed event 0x%02X %s",
captured_event->data.keycode.data.keycode,
(captured_event->data.keycode.data.state ? "pressed" : "released"));
ZMK_EVENT_RAISE_AT(captured_event->data.keycode, behavior_hold_tap);
break;
case ET_POS_CHANGED:
LOG_DBG("Releasing key position event for position %d %s",
captured_event->data.position.data.position,
(captured_event->data.position.data.state ? "pressed" : "released"));
ZMK_EVENT_RAISE_AT(captured_event->data.position, behavior_hold_tap);
break;
default:
LOG_ERR("Unhandled captured event type");
break;
}
ZMK_EVENT_RAISE_AT(captured_event, behavior_hold_tap);
}
}
@ -622,7 +648,7 @@ static int position_state_changed_listener(const zmk_event_t *eh) {
return ZMK_EV_EVENT_BUBBLE;
}
if (!ev->state && find_captured_keydown_event(ev->position) == NULL) {
if (!ev->state && !have_captured_keydown_event(ev->position)) {
// no keydown event has been captured, let it bubble.
// we'll catch modifiers later in modifier_state_changed_listener
LOG_DBG("%d bubbling %d %s event", undecided_hold_tap->position, ev->position,
@ -632,7 +658,11 @@ static int position_state_changed_listener(const zmk_event_t *eh) {
LOG_DBG("%d capturing %d %s event", undecided_hold_tap->position, ev->position,
ev->state ? "down" : "up");
capture_event(eh);
struct captured_event capture = {
.tag = ET_POS_CHANGED,
.data = {.position = copy_raised_zmk_position_state_changed(ev)},
};
capture_event(&capture);
decide_hold_tap(undecided_hold_tap, ev->state ? HT_OTHER_KEY_DOWN : HT_OTHER_KEY_UP);
return ZMK_EV_EVENT_CAPTURED;
}
@ -659,7 +689,9 @@ static int keycode_state_changed_listener(const zmk_event_t *eh) {
// if a undecided_hold_tap is active.
LOG_DBG("%d capturing 0x%02X %s event", undecided_hold_tap->position, ev->keycode,
ev->state ? "down" : "up");
capture_event(eh);
struct captured_event capture = {
.tag = ET_CODE_CHANGED, .data = {.keycode = copy_raised_zmk_keycode_state_changed(ev)}};
capture_event(&capture);
return ZMK_EV_EVENT_CAPTURED;
}

6
app/src/behaviors/behavior_key_press.c
View file

@ -21,15 +21,13 @@ static int behavior_key_press_init(const struct device *dev) { return 0; };
static int on_keymap_binding_pressed(struct zmk_behavior_binding *binding,
struct zmk_behavior_binding_event event) {
LOG_DBG("position %d keycode 0x%02X", event.position, binding->param1);
return ZMK_EVENT_RAISE(
zmk_keycode_state_changed_from_encoded(binding->param1, true, event.timestamp));
return raise_zmk_keycode_state_changed_from_encoded(binding->param1, true, event.timestamp);
}
static int on_keymap_binding_released(struct zmk_behavior_binding *binding,
struct zmk_behavior_binding_event event) {
LOG_DBG("position %d keycode 0x%02X", event.position, binding->param1);
return ZMK_EVENT_RAISE(
zmk_keycode_state_changed_from_encoded(binding->param1, false, event.timestamp));
return raise_zmk_keycode_state_changed_from_encoded(binding->param1, false, event.timestamp);
}
static const struct behavior_driver_api behavior_key_press_driver_api = {

4
app/src/behaviors/behavior_key_repeat.c
View file

@ -43,7 +43,7 @@ static int on_key_repeat_binding_pressed(struct zmk_behavior_binding *binding,
sizeof(struct zmk_keycode_state_changed));
data->current_keycode_pressed.timestamp = k_uptime_get();
ZMK_EVENT_RAISE(new_zmk_keycode_state_changed(data->current_keycode_pressed));
raise_zmk_keycode_state_changed(data->current_keycode_pressed);
return ZMK_BEHAVIOR_OPAQUE;
}
@ -60,7 +60,7 @@ static int on_key_repeat_binding_released(struct zmk_behavior_binding *binding,
data->current_keycode_pressed.timestamp = k_uptime_get();
data->current_keycode_pressed.state = false;
ZMK_EVENT_RAISE(new_zmk_keycode_state_changed(data->current_keycode_pressed));
raise_zmk_keycode_state_changed(data->current_keycode_pressed);
return ZMK_BEHAVIOR_OPAQUE;
}

3
app/src/behaviors/behavior_key_toggle.c
View file

@ -23,8 +23,7 @@ static int on_keymap_binding_pressed(struct zmk_behavior_binding *binding,
struct zmk_behavior_binding_event event) {
LOG_DBG("position %d keycode 0x%02X", event.position, binding->param1);
bool pressed = zmk_hid_is_pressed(binding->param1);
return ZMK_EVENT_RAISE(
zmk_keycode_state_changed_from_encoded(binding->param1, !pressed, event.timestamp));
return raise_zmk_keycode_state_changed_from_encoded(binding->param1, !pressed, event.timestamp);
}
static int on_keymap_binding_released(struct zmk_behavior_binding *binding,

8
app/src/behaviors/behavior_mouse_key_press.c
View file

@ -24,15 +24,15 @@ static int on_keymap_binding_pressed(struct zmk_behavior_binding *binding,
struct zmk_behavior_binding_event event) {
LOG_DBG("position %d keycode 0x%02X", event.position, binding->param1);
return ZMK_EVENT_RAISE(
zmk_mouse_button_state_changed_from_encoded(binding->param1, true, event.timestamp));
return raise_zmk_mouse_button_state_changed_from_encoded(binding->param1, true,
event.timestamp);
}
static int on_keymap_binding_released(struct zmk_behavior_binding *binding,
struct zmk_behavior_binding_event event) {
LOG_DBG("position %d keycode 0x%02X", event.position, binding->param1);
return ZMK_EVENT_RAISE(
zmk_mouse_button_state_changed_from_encoded(binding->param1, false, event.timestamp));
return raise_zmk_mouse_button_state_changed_from_encoded(binding->param1, false,
event.timestamp);
}
static const struct behavior_driver_api behavior_mouse_key_press_driver_api = {

4
app/src/behaviors/behavior_sticky_key.c
View file

@ -236,7 +236,9 @@ static int sticky_key_keycode_state_changed_listener(const zmk_event_t *eh) {
if (sticky_key->config->quick_release) {
// immediately release the sticky key after the key press is handled.
if (!event_reraised) {
ZMK_EVENT_RAISE_AFTER(eh, behavior_sticky_key);
struct zmk_keycode_state_changed_event dupe_ev =
copy_raised_zmk_keycode_state_changed(ev);
ZMK_EVENT_RAISE_AFTER(dupe_ev, behavior_sticky_key);
event_reraised = true;
}
release_sticky_key_behavior(sticky_key, ev_copy.timestamp);

4
app/src/ble.c
View file

@ -83,8 +83,8 @@ static bt_addr_le_t peripheral_addrs[ZMK_SPLIT_BLE_PERIPHERAL_COUNT];
#endif /* IS_ENABLED(CONFIG_ZMK_SPLIT_ROLE_CENTRAL) */
static void raise_profile_changed_event(void) {
ZMK_EVENT_RAISE(new_zmk_ble_active_profile_changed((struct zmk_ble_active_profile_changed){
.index = active_profile, .profile = &profiles[active_profile]}));
raise_zmk_ble_active_profile_changed((struct zmk_ble_active_profile_changed){
.index = active_profile, .profile = &profiles[active_profile]});
}
static void raise_profile_changed_event_callback(struct k_work *work) {

Some files were not shown because too many files have changed in this diff Show more