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

Merge branch 'main' into splitkb-aurora-lily58-with-double-encoders-infused-kim

Browse source
This commit is contained in:
Manassarn "Noom" Manoonchai 2023-01-15 17:07:47 +07:00 • committed by GitHub
commit 75e91fa684
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@ on:
- ".github/workflows/build.yml" - ".github/workflows/build.yml"
- "app/**" - "app/**"
schedule: schedule:
- cron: '22 4 * * *' - cron: "22 4 * * *"
jobs: jobs:
build: build:
@ -51,7 +51,7 @@ jobs:
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v2 uses: actions/setup-node@v2
with: with:
node-version: '14.x' node-version: "14.x"
- name: Install @actions/artifact - name: Install @actions/artifact
run: npm install @actions/artifact run: npm install @actions/artifact
- name: Build and upload artifacts - name: Build and upload artifacts
@ -155,7 +155,7 @@ jobs:
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v2 uses: actions/setup-node@v2
with: with:
node-version: '14.x' node-version: "14.x"
- name: Install js-yaml - name: Install js-yaml
run: npm install js-yaml run: npm install js-yaml
- uses: actions/github-script@v4 - uses: actions/github-script@v4
@ -184,7 +184,7 @@ jobs:
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v2 uses: actions/setup-node@v2
with: with:
node-version: '14.x' node-version: "14.x"
- name: Install js-yaml - name: Install js-yaml
run: npm install js-yaml run: npm install js-yaml
- uses: actions/github-script@v4 - uses: actions/github-script@v4
@ -311,7 +311,7 @@ jobs:
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v2 uses: actions/setup-node@v2
with: with:
node-version: '14.x' node-version: "14.x"
- name: Install js-yaml - name: Install js-yaml
run: npm install js-yaml run: npm install js-yaml
- name: Aggregate Metadata - name: Aggregate Metadata
@ -329,7 +329,7 @@ jobs:
yaml.loadAll(fs.readFileSync(f, "utf8")) yaml.loadAll(fs.readFileSync(f, "utf8"))
); );
return JSON.stringify(aggregated).replace(/\\/g,"\\\\"); return JSON.stringify(aggregated).replace(/\\/g,"\\\\").replace(/`/g,"\\`");
result-encoding: string result-encoding: string
- name: Organize Metadata - name: Organize Metadata
@ -376,7 +376,7 @@ jobs:
}, },
{ onboard: [], interconnects: {} }); { onboard: [], interconnects: {} });
return JSON.stringify(grouped).replace(/\\/g,"\\\\"); return JSON.stringify(grouped).replace(/\\/g,"\\\\").replace(/`/g,"\\`");
result-encoding: string result-encoding: string
get-changed-files: get-changed-files:
if: ${{ github.event_name != 'schedule' }} if: ${{ github.event_name != 'schedule' }}
@ -389,7 +389,7 @@ jobs:
- uses: Ana06/get-changed-files@v2.0.0 - uses: Ana06/get-changed-files@v2.0.0
id: changed-files id: changed-files
with: with:
format: 'json' format: "json"
- uses: actions/github-script@v4 - uses: actions/github-script@v4
id: board-changes id: board-changes
with: with:

2
app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.conf
View file

@ -2,7 +2,7 @@
# CONFIG_EC11=y # CONFIG_EC11=y
# CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y # CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
# Uncomment the following line to enable the Kyria OLED Display # Uncomment the following line to enable the OLED Display
# CONFIG_ZMK_DISPLAY=y # CONFIG_ZMK_DISPLAY=y
# Uncomment the following lines to enable RGB underglow # Uncomment the following lines to enable RGB underglow

2
app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.dtsi
View file

@ -15,7 +15,7 @@
default_transform: keymap_transform_0 { default_transform: keymap_transform_0 {
compatible = "zmk,matrix-transform"; compatible = "zmk,matrix-transform";
columns = <16>; columns = <14>;
rows = <5>; rows = <5>;
// | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 | // | SW6 | SW5 | SW4 | SW3 | SW2 | SW1 | | SW1 | SW2 | SW3 | SW4 | SW5 | SW6 |
// | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 | // | SW12 | SW11 | SW10 | SW9 | SW8 | SW7 | | SW7 | SW8 | SW9 | SW10 | SW11 | SW12 |

4
app/boards/shields/splitkb_aurora_lily58/splitkb_aurora_lily58.keymap
View file

@ -41,8 +41,8 @@
bindings = < bindings = <
&bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &trans &trans &trans &trans &trans &trans &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &trans &trans &trans &trans &trans &trans
&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12
&kp GRAVE &kp EXCL &kp AT &kp HASH &kp DOLLAR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp TILDE &kp GRAVE &kp EXCL &kp AT &kp HASH &kp DOLLAR &kp PRCNT &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR &kp TILDE
&trans &ext_power EP_ON &ext_power EP_OFF &ext_power EP_TOG &trans &trans &trans &trans &trans &kp MINUS &kp KP_PLUS &kp LBRC &kp RBRC &kp PIPE &trans &ext_power EP_ON &ext_power EP_OFF &ext_power EP_TOG &trans &trans &trans &trans &trans &kp MINUS &kp PLUS &kp LBRC &kp RBRC &kp PIPE
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
>; >;