From ea3e47c417393872b8758ad7264bdded2c7ac4c4 Mon Sep 17 00:00:00 2001 From: Max Dubrinsky Date: Wed, 6 Jan 2021 19:47:14 -0500 Subject: [PATCH] make requested changes --- .github/workflows/build.yml | 16 ++++++++-------- app/boards/shields/helix_4/Kconfig.defconfig | 6 ++++-- app/boards/shields/helix_4/Kconfig.shield | 2 +- .../shields/helix_4/boards/nice_nano.overlay | 2 +- app/boards/shields/helix_4/helix_4.conf | 4 ++++ app/boards/shields/helix_4/helix_4.dtsi | 6 +----- app/boards/shields/helix_4/helix_4.keymap | 2 +- app/boards/shields/helix_4/helix_4_left.overlay | 6 +----- app/boards/shields/helix_4/helix_4_right.overlay | 6 +----- docs/static/setup.ps1 | 6 +++--- docs/static/setup.sh | 6 +++++- 11 files changed, 30 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f169d5cb942..a93f16ef572 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,12 +3,12 @@ name: Build on: push: paths: - - ".github/workflows/build.yml" - - "app/**" + - '.github/workflows/build.yml' + - 'app/**' pull_request: paths: - - ".github/workflows/build.yml" - - "app/**" + - '.github/workflows/build.yml' + - 'app/**' jobs: build: @@ -34,6 +34,8 @@ jobs: - eek - helix_left - helix_right + - helix_4_left + - helix_4_right - iris_left - iris_right - jian_left @@ -60,9 +62,7 @@ jobs: - splitreus62_right - tg4x - tidbit - - helix_4_left - - helix_4_right - cmake-args: [""] + cmake-args: [''] include: - board: bdn9_rev2 - board: dz60rgb_rev1 @@ -126,7 +126,7 @@ jobs: if: ${{ !matrix.skip-archive }} uses: actions/upload-artifact@v2 with: - name: "${{ steps.variables.outputs.artifact-name }}" + name: '${{ steps.variables.outputs.artifact-name }}' path: | build/zephyr/zmk.hex build/zephyr/zmk.uf2 diff --git a/app/boards/shields/helix_4/Kconfig.defconfig b/app/boards/shields/helix_4/Kconfig.defconfig index 15bce7b9264..48be7af3527 100644 --- a/app/boards/shields/helix_4/Kconfig.defconfig +++ b/app/boards/shields/helix_4/Kconfig.defconfig @@ -1,3 +1,5 @@ +# Copyright (c) 2021 The ZMK Contributors +# SPDX-License-Identifier: MIT if SHIELD_HELIX_4_LEFT @@ -24,8 +26,8 @@ if SHIELD_HELIX_4_LEFT || SHIELD_HELIX_4_RIGHT config ZMK_SPLIT default y -config DEVICE_POWER_MANAGEMENT - default y +# config DEVICE_POWER_MANAGEMENT +# default y if ZMK_RGB_UNDERGLOW diff --git a/app/boards/shields/helix_4/Kconfig.shield b/app/boards/shields/helix_4/Kconfig.shield index 6163b752e9c..ec799c48bae 100644 --- a/app/boards/shields/helix_4/Kconfig.shield +++ b/app/boards/shields/helix_4/Kconfig.shield @@ -1,4 +1,4 @@ -# Copyright (c) 2020 The ZMK Contributors +# Copyright (c) 2021 The ZMK Contributors # SPDX-License-Identifier: MIT config SHIELD_HELIX_4_LEFT diff --git a/app/boards/shields/helix_4/boards/nice_nano.overlay b/app/boards/shields/helix_4/boards/nice_nano.overlay index 35b95239ba3..0aadf905b00 100644 --- a/app/boards/shields/helix_4/boards/nice_nano.overlay +++ b/app/boards/shields/helix_4/boards/nice_nano.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 The ZMK Contributors + * Copyright (c) 2021 The ZMK Contributors * * SPDX-License-Identifier: MIT */ diff --git a/app/boards/shields/helix_4/helix_4.conf b/app/boards/shields/helix_4/helix_4.conf index e69de29bb2d..a7cfe73d44e 100644 --- a/app/boards/shields/helix_4/helix_4.conf +++ b/app/boards/shields/helix_4/helix_4.conf @@ -0,0 +1,4 @@ +# Copyright (c) 2021 The ZMK Contributors +# SPDX-License-Identifier: MIT + +# CONFIG_ ZMK_RGB_UNDERGLOW=y diff --git a/app/boards/shields/helix_4/helix_4.dtsi b/app/boards/shields/helix_4/helix_4.dtsi index 374b8801d83..d964227e671 100644 --- a/app/boards/shields/helix_4/helix_4.dtsi +++ b/app/boards/shields/helix_4/helix_4.dtsi @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 The ZMK Contributors + * Copyright (c) 2021 The ZMK Contributors * * SPDX-License-Identifier: MIT */ @@ -37,10 +37,6 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) , <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> ; }; - - bt_unpair_combo: bt_unpair_combo { - compatible = "zmk,bt-unpair-combo"; - }; }; &pro_micro_i2c { diff --git a/app/boards/shields/helix_4/helix_4.keymap b/app/boards/shields/helix_4/helix_4.keymap index 1d8d9a90e1e..4a2f362930d 100644 --- a/app/boards/shields/helix_4/helix_4.keymap +++ b/app/boards/shields/helix_4/helix_4.keymap @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 The ZMK Contributors + * Copyright (c) 2021 The ZMK Contributors * * SPDX-License-Identifier: MIT */ diff --git a/app/boards/shields/helix_4/helix_4_left.overlay b/app/boards/shields/helix_4/helix_4_left.overlay index 0ea9fe2b073..e408b8e9499 100644 --- a/app/boards/shields/helix_4/helix_4_left.overlay +++ b/app/boards/shields/helix_4/helix_4_left.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 The ZMK Contributors + * Copyright (c) 2021 The ZMK Contributors * * SPDX-License-Identifier: MIT */ @@ -17,7 +17,3 @@ , <&pro_micro_d 16 GPIO_ACTIVE_HIGH> ; }; - -&bt_unpair_combo { - key-positions = <40 42>; -}; diff --git a/app/boards/shields/helix_4/helix_4_right.overlay b/app/boards/shields/helix_4/helix_4_right.overlay index 5ff34a6318b..dce8ee89b7b 100644 --- a/app/boards/shields/helix_4/helix_4_right.overlay +++ b/app/boards/shields/helix_4/helix_4_right.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 The ZMK Contributors + * Copyright (c) 2021 The ZMK Contributors * * SPDX-License-Identifier: MIT */ @@ -22,7 +22,3 @@ ; }; -&bt_unpair_combo { - key-positions = <43 45>; -}; - diff --git a/docs/static/setup.ps1 b/docs/static/setup.ps1 index bcea9f7a953..f857e524f02 100644 --- a/docs/static/setup.ps1 +++ b/docs/static/setup.ps1 @@ -90,9 +90,9 @@ Write-Host "Keyboard Shield Selection:" $prompt = "Pick a keyboard" # TODO: Add support for "Other" and linking to docs on adding custom shields in user config repos. -$options = "Kyria", "Lily58", "Corne", "Splitreus62", "Sofle", "Iris", "Reviung41", "RoMac", "RoMac+", "makerdiary M60", "Microdox", "TG4X", "QAZ", "NIBBLE", "Jorne", "Jian", "CRBN", "Tidbit", "Eek!", "BFO-9000", "Helix" -$names = "kyria", "lily58", "corne", "splitreus62", "sofle", "iris", "reviung41", "romac", "romac_plus", "m60", "microdox", "tg4x", "qaz", "nibble", "jorne", "jian", "crbn", "tidbit", "eek", "bfo9000", "helix" -$splits = "y", "y", "y", "y", "y", "y", "n", "n", "n", "n", "y", "n", "n", "n", "y", "y", "n", "n", "n", "n", "y" +$options = "Kyria", "Lily58", "Corne", "Splitreus62", "Sofle", "Iris", "Reviung41", "RoMac", "RoMac+", "makerdiary M60", "Microdox", "TG4X", "QAZ", "NIBBLE", "Jorne", "Jian", "CRBN", "Tidbit", "Eek!", "BFO-9000", "Helix", "Helix 4 Row" +$names = "kyria", "lily58", "corne", "splitreus62", "sofle", "iris", "reviung41", "romac", "romac_plus", "m60", "microdox", "tg4x", "qaz", "nibble", "jorne", "jian", "crbn", "tidbit", "eek", "bfo9000", "helix", "helix_4" +$splits = "y", "y", "y", "y", "y", "y", "n", "n", "n", "n", "y", "n", "n", "n", "y", "y", "n", "n", "n", "n", "y", "y" $choice = Get-Choice-From-Options -Options $options -Prompt $prompt $shield_title = $($options[$choice]) diff --git a/docs/static/setup.sh b/docs/static/setup.sh index f5e10e0b1ef..ad59465481a 100644 --- a/docs/static/setup.sh +++ b/docs/static/setup.sh @@ -92,10 +92,14 @@ echo "Keyboard Shield Selection:" prompt="Pick an keyboard:" <<<<<<< HEAD +<<<<<<< HEAD options=("Kyria" "Lily58" "Corne" "Splitreus62" "Sofle" "Iris" "Reviung41" "RoMac" "RoMac+" "makerdiary M60" "Microdox" "TG4X" "QAZ" "NIBBLE" "Jorne" "Jian" "CRBN" "Tidbit" "Eek!" "BFO-9000" "Helix") ======= options=("Kyria" "Lily58" "Corne" "Splitreus62" "Sofle" "Iris" "Reviung41" "RoMac" "RoMac+" "makerdiary M60" "Microdox" "TG4X" "QAZ" "NIBBLE" "Jorne" "Jian" "CRBN" "Tidbit" "Eek!" "BF0-9000" "Helix (5)" "Helix (4)") >>>>>>> 66d3d70 (fix setup script) +======= +options=("Kyria" "Lily58" "Corne" "Splitreus62" "Sofle" "Iris" "Reviung41" "RoMac" "RoMac+" "makerdiary M60" "Microdox" "TG4X" "QAZ" "NIBBLE" "Jorne" "Jian" "CRBN" "Tidbit" "Eek!" "BF0-9000" "Helix" "Helix 4 Row") +>>>>>>> 48fdb31 (make requested changes) PS3="$prompt " # TODO: Add support for "Other" and linking to docs on adding custom shields in user config repos. @@ -125,7 +129,7 @@ select opt in "${options[@]}" "Quit"; do 19 ) shield_title="Eek!" shield="eek"; split="n" break;; 20 ) shield_title="BFO-9000" shield="bfo9000"; split="y"; break;; 21 ) shield_title="Helix" shield="helix"; split="y"; break;; - 21 ) shield_title="Helix (4)" shield="helix_4"; split="y"; break;; + 22 ) shield_title="Helix 4 Row" shield="helix_4"; split="y"; break;; # Add link to docs on adding your own custom shield in your ZMK config! # $(( ${#options[@]}+1 )) ) echo "Other!"; break;;