mirror of
https://github.com/zmkfirmware/zmk.git
synced 2026-04-10 15:25:18 -05:00
Compare commits
5 Commits
dependabot
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e1682597bc | ||
|
|
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-*
|
||||
|
||||
22
.github/workflows/build.yml
vendored
22
.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:
|
||||
@@ -63,7 +63,7 @@ jobs:
|
||||
- name: Install @actions/artifact
|
||||
run: npm install @actions/artifact@5.0.3
|
||||
- name: Build
|
||||
uses: actions/github-script@v7
|
||||
uses: actions/github-script@v9
|
||||
id: boards-list
|
||||
with:
|
||||
script: |
|
||||
@@ -95,7 +95,7 @@ jobs:
|
||||
throw new Error('Failed to build one or more configurations');
|
||||
}
|
||||
- name: Upload artifacts
|
||||
uses: actions/github-script@v7
|
||||
uses: actions/github-script@v9
|
||||
continue-on-error: ${{ github.event_name == 'pull_request' }}
|
||||
id: boards-upload
|
||||
with:
|
||||
@@ -146,7 +146,7 @@ jobs:
|
||||
include-list: ${{ steps.compile-list.outputs.result }}
|
||||
steps:
|
||||
- name: Join build lists
|
||||
uses: actions/github-script@v7
|
||||
uses: actions/github-script@v9
|
||||
id: compile-list
|
||||
with:
|
||||
script: |
|
||||
@@ -196,7 +196,7 @@ jobs:
|
||||
node-version: "14.x"
|
||||
- name: Install js-yaml
|
||||
run: npm install js-yaml
|
||||
- uses: actions/github-script@v7
|
||||
- uses: actions/github-script@v9
|
||||
id: core-list
|
||||
with:
|
||||
script: |
|
||||
@@ -225,7 +225,7 @@ jobs:
|
||||
node-version: "14.x"
|
||||
- name: Install js-yaml
|
||||
run: npm install js-yaml
|
||||
- uses: actions/github-script@v7
|
||||
- uses: actions/github-script@v9
|
||||
id: boards-list
|
||||
with:
|
||||
script: |
|
||||
@@ -303,7 +303,7 @@ jobs:
|
||||
nightly-include: ${{ steps.nightly-list.outputs.result }}
|
||||
steps:
|
||||
- name: Create nightly list
|
||||
uses: actions/github-script@v7
|
||||
uses: actions/github-script@v9
|
||||
id: nightly-list
|
||||
with:
|
||||
script: |
|
||||
@@ -356,7 +356,7 @@ jobs:
|
||||
- name: Install js-yaml
|
||||
run: npm install js-yaml
|
||||
- name: Aggregate Metadata
|
||||
uses: actions/github-script@v7
|
||||
uses: actions/github-script@v9
|
||||
id: aggregate-metadata
|
||||
with:
|
||||
script: |
|
||||
@@ -374,7 +374,7 @@ jobs:
|
||||
result-encoding: string
|
||||
|
||||
- name: Organize Metadata
|
||||
uses: actions/github-script@v7
|
||||
uses: actions/github-script@v9
|
||||
id: organize-metadata
|
||||
with:
|
||||
script: |
|
||||
@@ -436,7 +436,7 @@ jobs:
|
||||
with:
|
||||
json: true
|
||||
escape_json: false
|
||||
- uses: actions/github-script@v7
|
||||
- uses: actions/github-script@v9
|
||||
id: board-changes
|
||||
with:
|
||||
script: |
|
||||
@@ -444,7 +444,7 @@ jobs:
|
||||
const boardChanges = changedFiles.filter(f => f.startsWith('app/boards'));
|
||||
return boardChanges.length ? 'true' : 'false';
|
||||
result-encoding: string
|
||||
- uses: actions/github-script@v7
|
||||
- uses: actions/github-script@v9
|
||||
id: core-changes
|
||||
with:
|
||||
script: |
|
||||
|
||||
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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
8
docs/package-lock.json
generated
8
docs/package-lock.json
generated
@@ -38,7 +38,7 @@
|
||||
"eslint": "^9.39.2",
|
||||
"eslint-plugin-mdx": "^3.6.2",
|
||||
"eslint-plugin-react": "^7.37.5",
|
||||
"globals": "^17.4.0",
|
||||
"globals": "^16.5.0",
|
||||
"json-schema-to-typescript": "^15.0.3",
|
||||
"mustache": "^4.2.0",
|
||||
"null-loader": "^4.0.0",
|
||||
@@ -11884,9 +11884,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/globals": {
|
||||
"version": "17.4.0",
|
||||
"resolved": "https://registry.npmjs.org/globals/-/globals-17.4.0.tgz",
|
||||
"integrity": "sha512-hjrNztw/VajQwOLsMNT1cbJiH2muO3OROCHnbehc8eY5JyD2gqz4AcMHPqgaOR59DjgUjYAYLeH699g/eWi2jw==",
|
||||
"version": "16.5.0",
|
||||
"resolved": "https://registry.npmjs.org/globals/-/globals-16.5.0.tgz",
|
||||
"integrity": "sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
"eslint": "^9.39.2",
|
||||
"eslint-plugin-mdx": "^3.6.2",
|
||||
"eslint-plugin-react": "^7.37.5",
|
||||
"globals": "^17.4.0",
|
||||
"globals": "^16.5.0",
|
||||
"json-schema-to-typescript": "^15.0.3",
|
||||
"mustache": "^4.2.0",
|
||||
"null-loader": "^4.0.0",
|
||||
|
||||
Reference in New Issue
Block a user