mirror of
https://github.com/zmkfirmware/zmk.git
synced 2026-04-21 15:25:42 +02:00
Compare commits
6 Commits
dependabot
...
2c82c74093
| Author | SHA1 | Date | |
|---|---|---|---|
|
2c82c74093 | ||
|
|
0331b7d16e | ||
|
|
8a44ef109a | ||
|
|
3538843a09 | ||
|
|
c62da0e166 | ||
|
|
327cbb587b |
4
.github/workflows/ble-test.yml
vendored
4
.github/workflows/ble-test.yml
vendored
@@ -40,7 +40,7 @@ jobs:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
- name: Cache west modules
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
env:
|
||||
cache-name: cache-zephyr-modules
|
||||
with:
|
||||
@@ -72,7 +72,7 @@ jobs:
|
||||
run: BSIM_COMPONENTS_PATH="${GITHUB_WORKSPACE}/tools/bsim/components" BSIM_OUT_PATH="${GITHUB_WORKSPACE}/tools/bsim" ./run-ble-test.sh tests/ble/${{ matrix.test }}
|
||||
- name: Archive artifacts
|
||||
if: ${{ always() }}
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: "${{ matrix.test }}-log-files"
|
||||
path: app/build/**/*.log
|
||||
|
||||
6
.github/workflows/build-user-config.yml
vendored
6
.github/workflows/build-user-config.yml
vendored
@@ -108,7 +108,7 @@ jobs:
|
||||
fi
|
||||
|
||||
- name: Cache west modules
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
continue-on-error: true
|
||||
env:
|
||||
cache_name: cache-zephyr-${{ env.zephyr_version }}-modules
|
||||
@@ -217,7 +217,7 @@ jobs:
|
||||
fi
|
||||
|
||||
- name: Archive (${{ env.display_name }})
|
||||
uses: actions/upload-artifact@v6
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: artifact-${{ env.artifact_name }}
|
||||
path: ${{ env.build_dir }}/artifacts
|
||||
@@ -229,7 +229,7 @@ jobs:
|
||||
name: Merge Output Artifacts
|
||||
steps:
|
||||
- name: Merge Artifacts
|
||||
uses: actions/upload-artifact/merge@v4
|
||||
uses: actions/upload-artifact/merge@v7
|
||||
with:
|
||||
name: ${{ inputs.archive_name }}
|
||||
pattern: artifact-*
|
||||
|
||||
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -34,7 +34,7 @@ jobs:
|
||||
with:
|
||||
persist-credentials: false
|
||||
- name: Cache west modules
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
env:
|
||||
cache-name: cache-zephyr-modules
|
||||
with:
|
||||
|
||||
4
.github/workflows/test.yml
vendored
4
.github/workflows/test.yml
vendored
@@ -42,7 +42,7 @@ jobs:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
- name: Cache west modules
|
||||
uses: actions/cache@v4
|
||||
uses: actions/cache@v5
|
||||
env:
|
||||
cache-name: cache-zephyr-modules
|
||||
with:
|
||||
@@ -69,7 +69,7 @@ jobs:
|
||||
run: ZMK_TESTS_VERBOSE=1 west test tests/${{ matrix.test }}
|
||||
- name: Archive artifacts
|
||||
if: ${{ always() }}
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: "${{ matrix.test }}-log-files"
|
||||
path: app/build/**/*.log
|
||||
|
||||
10
app/boards/seeed/xiao_rp2040/Kconfig.xiao_rp2040
Normal file
10
app/boards/seeed/xiao_rp2040/Kconfig.xiao_rp2040
Normal file
@@ -0,0 +1,10 @@
|
||||
# Copyright (c) 2026 Pete Johanson
|
||||
# SPDX-License-Identifier: MIT
|
||||
|
||||
config BOARD_XIAO_RP2040
|
||||
select ZMK_BOARD_COMPAT if BOARD_XIAO_RP2040_RP2040_ZMK
|
||||
imply RETAINED_MEM if BOARD_XIAO_RP2040_RP2040_ZMK
|
||||
imply RETENTION if BOARD_XIAO_RP2040_RP2040_ZMK
|
||||
imply RETENTION_BOOT_MODE if BOARD_XIAO_RP2040_RP2040_ZMK
|
||||
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
|
||||
if SHIELD_NICE_VIEW
|
||||
|
||||
config LS0XX_VCOM_THREAD_PRIO
|
||||
default 11
|
||||
|
||||
config LV_Z_VDB_SIZE
|
||||
default 100
|
||||
|
||||
|
||||
@@ -12,6 +12,8 @@
|
||||
reg = <0>;
|
||||
width = <160>;
|
||||
height = <68>;
|
||||
serial-vcom-inversion;
|
||||
serial-vcom-interval = <33>;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -6,4 +6,5 @@
|
||||
|
||||
#define OUT_TOG 0
|
||||
#define OUT_USB 1
|
||||
#define OUT_BLE 2
|
||||
#define OUT_BLE 2
|
||||
#define OUT_NONE 3
|
||||
@@ -42,6 +42,11 @@ static const struct behavior_parameter_value_metadata std_values[] = {
|
||||
.type = BEHAVIOR_PARAMETER_VALUE_TYPE_VALUE,
|
||||
},
|
||||
#endif // IS_ENABLED(CONFIG_ZMK_BLE)
|
||||
{
|
||||
.value = OUT_NONE,
|
||||
.display_name = "No Output",
|
||||
.type = BEHAVIOR_PARAMETER_VALUE_TYPE_VALUE,
|
||||
},
|
||||
};
|
||||
|
||||
static const struct behavior_parameter_metadata_set std_set = {
|
||||
@@ -65,6 +70,8 @@ static int on_keymap_binding_pressed(struct zmk_behavior_binding *binding,
|
||||
return zmk_endpoint_set_preferred_transport(ZMK_TRANSPORT_USB);
|
||||
case OUT_BLE:
|
||||
return zmk_endpoint_set_preferred_transport(ZMK_TRANSPORT_BLE);
|
||||
case OUT_NONE:
|
||||
return zmk_endpoint_set_preferred_transport(ZMK_TRANSPORT_NONE);
|
||||
default:
|
||||
LOG_ERR("Unknown output command: %d", binding->param1);
|
||||
}
|
||||
|
||||
@@ -29,11 +29,12 @@ header, which is added at the top of the keymap file:
|
||||
|
||||
This allows you to reference the actions defined in this header:
|
||||
|
||||
| Define | Action |
|
||||
| --------- | ----------------------------------------------- |
|
||||
| `OUT_USB` | Prefer sending to USB |
|
||||
| `OUT_BLE` | Prefer sending to the current bluetooth profile |
|
||||
| `OUT_TOG` | Toggle between USB and BLE |
|
||||
| Define | Action |
|
||||
| ---------- | ----------------------------------------------- |
|
||||
| `OUT_USB` | Prefer sending to USB |
|
||||
| `OUT_BLE` | Prefer sending to the current bluetooth profile |
|
||||
| `OUT_TOG` | Toggle between USB and BLE |
|
||||
| `OUT_NONE` | Prevent from sending any output |
|
||||
|
||||
## Output Selection Behavior
|
||||
|
||||
|
||||
4054
docs/package-lock.json
generated
4054
docs/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -18,17 +18,17 @@
|
||||
"@docusaurus/core": "^3.9.2",
|
||||
"@docusaurus/preset-classic": "^3.9.2",
|
||||
"@docusaurus/theme-mermaid": "^3.9.2",
|
||||
"@fortawesome/fontawesome-svg-core": "^6.7.1",
|
||||
"@fortawesome/free-solid-svg-icons": "^6.7.1",
|
||||
"@fortawesome/react-fontawesome": "^0.2.0",
|
||||
"@fortawesome/fontawesome-svg-core": "^7.2.0",
|
||||
"@fortawesome/free-solid-svg-icons": "^7.2.0",
|
||||
"@fortawesome/react-fontawesome": "^3.3.0",
|
||||
"@mdx-js/react": "^3.1.0",
|
||||
"classnames": "^2.2.6",
|
||||
"js-yaml": "^4.1.1",
|
||||
"react": "^18.0.0",
|
||||
"react": "^19.2.5",
|
||||
"react-async": "^10.0.1",
|
||||
"react-copy-to-clipboard": "^5.0.3",
|
||||
"react-dom": "^18.0.0",
|
||||
"react-toastify": "^10.0.6",
|
||||
"react-dom": "^19.2.5",
|
||||
"react-toastify": "^11.0.5",
|
||||
"tree-sitter-devicetree": "^0.12.1",
|
||||
"web-tree-sitter": "^0.24.3"
|
||||
},
|
||||
@@ -51,7 +51,7 @@
|
||||
"@eslint/js": "^9.39.2",
|
||||
"@types/glob": "^8.1.0",
|
||||
"@types/js-yaml": "^4.0.5",
|
||||
"@types/react": "^18.3.12",
|
||||
"@types/react": "^19.2.14",
|
||||
"@types/react-helmet": "^6.1.6",
|
||||
"@types/react-router-dom": "^5.1.7",
|
||||
"eslint": "^9.39.2",
|
||||
|
||||
Reference in New Issue
Block a user