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

make requested changes

Browse source
This commit is contained in:
Max Dubrinsky 2021-01-06 19:47:14 -05:00
parent 0150764ed3
commit ea3e47c417
11 changed files with 30 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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

6
app/boards/shields/helix_4/Kconfig.defconfig
View file

@ -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

2
app/boards/shields/helix_4/Kconfig.shield
View file

@ -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

2
app/boards/shields/helix_4/boards/nice_nano.overlay
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 The ZMK Contributors
* Copyright (c) 2021 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

4
app/boards/shields/helix_4/helix_4.conf
View file

@ -0,0 +1,4 @@
# Copyright (c) 2021 The ZMK Contributors
# SPDX-License-Identifier: MIT
# CONFIG_ ZMK_RGB_UNDERGLOW=y

6
app/boards/shields/helix_4/helix_4.dtsi
View file

@ -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 {

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

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 The ZMK Contributors
* Copyright (c) 2021 The ZMK Contributors
*
* SPDX-License-Identifier: MIT
*/

6
app/boards/shields/helix_4/helix_4_left.overlay
View file

@ -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>;
};

6
app/boards/shields/helix_4/helix_4_right.overlay
View file

@ -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>;
};

6
docs/static/setup.ps1 vendored
View file

@ -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])

6
docs/static/setup.sh vendored
View file

@ -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;;