mirror of
https://github.com/zmkfirmware/zmk.git
synced 2026-04-11 15:46:57 -05:00
Compare commits
4 Commits
dependabot
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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
|
- name: Checkout
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
- name: Cache west modules
|
- name: Cache west modules
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v5
|
||||||
env:
|
env:
|
||||||
cache-name: cache-zephyr-modules
|
cache-name: cache-zephyr-modules
|
||||||
with:
|
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 }}
|
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
|
- name: Archive artifacts
|
||||||
if: ${{ always() }}
|
if: ${{ always() }}
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: "${{ matrix.test }}-log-files"
|
name: "${{ matrix.test }}-log-files"
|
||||||
path: app/build/**/*.log
|
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
|
fi
|
||||||
|
|
||||||
- name: Cache west modules
|
- name: Cache west modules
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v5
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
env:
|
env:
|
||||||
cache_name: cache-zephyr-${{ env.zephyr_version }}-modules
|
cache_name: cache-zephyr-${{ env.zephyr_version }}-modules
|
||||||
@@ -217,7 +217,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Archive (${{ env.display_name }})
|
- name: Archive (${{ env.display_name }})
|
||||||
uses: actions/upload-artifact@v6
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: artifact-${{ env.artifact_name }}
|
name: artifact-${{ env.artifact_name }}
|
||||||
path: ${{ env.build_dir }}/artifacts
|
path: ${{ env.build_dir }}/artifacts
|
||||||
@@ -229,7 +229,7 @@ jobs:
|
|||||||
name: Merge Output Artifacts
|
name: Merge Output Artifacts
|
||||||
steps:
|
steps:
|
||||||
- name: Merge Artifacts
|
- name: Merge Artifacts
|
||||||
uses: actions/upload-artifact/merge@v4
|
uses: actions/upload-artifact/merge@v7
|
||||||
with:
|
with:
|
||||||
name: ${{ inputs.archive_name }}
|
name: ${{ inputs.archive_name }}
|
||||||
pattern: artifact-*
|
pattern: artifact-*
|
||||||
|
|||||||
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -34,7 +34,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
- name: Cache west modules
|
- name: Cache west modules
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v5
|
||||||
env:
|
env:
|
||||||
cache-name: cache-zephyr-modules
|
cache-name: cache-zephyr-modules
|
||||||
with:
|
with:
|
||||||
|
|||||||
4
.github/workflows/test.yml
vendored
4
.github/workflows/test.yml
vendored
@@ -42,7 +42,7 @@ jobs:
|
|||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
- name: Cache west modules
|
- name: Cache west modules
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v5
|
||||||
env:
|
env:
|
||||||
cache-name: cache-zephyr-modules
|
cache-name: cache-zephyr-modules
|
||||||
with:
|
with:
|
||||||
@@ -69,7 +69,7 @@ jobs:
|
|||||||
run: ZMK_TESTS_VERBOSE=1 west test tests/${{ matrix.test }}
|
run: ZMK_TESTS_VERBOSE=1 west test tests/${{ matrix.test }}
|
||||||
- name: Archive artifacts
|
- name: Archive artifacts
|
||||||
if: ${{ always() }}
|
if: ${{ always() }}
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: "${{ matrix.test }}-log-files"
|
name: "${{ matrix.test }}-log-files"
|
||||||
path: app/build/**/*.log
|
path: app/build/**/*.log
|
||||||
|
|||||||
@@ -3,6 +3,9 @@
|
|||||||
|
|
||||||
if SHIELD_NICE_VIEW
|
if SHIELD_NICE_VIEW
|
||||||
|
|
||||||
|
config LS0XX_VCOM_THREAD_PRIO
|
||||||
|
default 11
|
||||||
|
|
||||||
config LV_Z_VDB_SIZE
|
config LV_Z_VDB_SIZE
|
||||||
default 100
|
default 100
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,8 @@
|
|||||||
reg = <0>;
|
reg = <0>;
|
||||||
width = <160>;
|
width = <160>;
|
||||||
height = <68>;
|
height = <68>;
|
||||||
|
serial-vcom-inversion;
|
||||||
|
serial-vcom-interval = <33>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -7,3 +7,4 @@
|
|||||||
#define OUT_TOG 0
|
#define OUT_TOG 0
|
||||||
#define OUT_USB 1
|
#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,
|
.type = BEHAVIOR_PARAMETER_VALUE_TYPE_VALUE,
|
||||||
},
|
},
|
||||||
#endif // IS_ENABLED(CONFIG_ZMK_BLE)
|
#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 = {
|
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);
|
return zmk_endpoint_set_preferred_transport(ZMK_TRANSPORT_USB);
|
||||||
case OUT_BLE:
|
case OUT_BLE:
|
||||||
return zmk_endpoint_set_preferred_transport(ZMK_TRANSPORT_BLE);
|
return zmk_endpoint_set_preferred_transport(ZMK_TRANSPORT_BLE);
|
||||||
|
case OUT_NONE:
|
||||||
|
return zmk_endpoint_set_preferred_transport(ZMK_TRANSPORT_NONE);
|
||||||
default:
|
default:
|
||||||
LOG_ERR("Unknown output command: %d", binding->param1);
|
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:
|
This allows you to reference the actions defined in this header:
|
||||||
|
|
||||||
| Define | Action |
|
| Define | Action |
|
||||||
| --------- | ----------------------------------------------- |
|
| ---------- | ----------------------------------------------- |
|
||||||
| `OUT_USB` | Prefer sending to USB |
|
| `OUT_USB` | Prefer sending to USB |
|
||||||
| `OUT_BLE` | Prefer sending to the current bluetooth profile |
|
| `OUT_BLE` | Prefer sending to the current bluetooth profile |
|
||||||
| `OUT_TOG` | Toggle between USB and BLE |
|
| `OUT_TOG` | Toggle between USB and BLE |
|
||||||
|
| `OUT_NONE` | Prevent from sending any output |
|
||||||
|
|
||||||
## Output Selection Behavior
|
## Output Selection Behavior
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user