From f41f9aae9435d39db6c916185b3a405461877686 Mon Sep 17 00:00:00 2001 From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com> Date: Fri, 26 May 2023 21:25:27 +1000 Subject: [PATCH] Update Corne-ish Zen - v1 now in ZMK main - Remove corne-ish_zen - Use corneish_zen_v1 instead - Remove outboard --- ...corne-ish_zen.yml => build-example-corneish_zen_v1.yml} | 7 ++++--- .github/workflows/outboards/boards/corne-ish_zen | 4 ---- .github/workflows/outboards/boards/corneish_zen_v1 | 7 ------- .github/workflows/test-all-boards.yml | 3 +-- config/corne-ish_zen_left.keymap | 6 ------ config/corne-ish_zen_right.keymap | 6 ------ readme.org | 6 ++---- 7 files changed, 7 insertions(+), 32 deletions(-) rename .github/workflows/{build-example-corne-ish_zen.yml => build-example-corneish_zen_v1.yml} (52%) delete mode 100644 .github/workflows/outboards/boards/corne-ish_zen delete mode 100644 .github/workflows/outboards/boards/corneish_zen_v1 delete mode 100644 config/corne-ish_zen_left.keymap delete mode 100644 config/corne-ish_zen_right.keymap diff --git a/.github/workflows/build-example-corne-ish_zen.yml b/.github/workflows/build-example-corneish_zen_v1.yml similarity index 52% rename from .github/workflows/build-example-corne-ish_zen.yml rename to .github/workflows/build-example-corneish_zen_v1.yml index a392b04..01fc8b4 100644 --- a/.github/workflows/build-example-corne-ish_zen.yml +++ b/.github/workflows/build-example-corneish_zen_v1.yml @@ -1,11 +1,12 @@ -# Copyright 2021 Manna Harbour +# Copyright 2023 Manna Harbour # https://github.com/manna-harbour/miryoku -name: 'Build Example corne-ish_zen' +name: 'Build Example corneish_zen_v1' on: workflow_dispatch jobs: build: uses: ./.github/workflows/main.yml secrets: inherit with: - board: '["corne-ish_zen_left","corne-ish_zen_right"]' + board: '["corneish_zen_v1_left","corneish_zen_v1_right"]' + diff --git a/.github/workflows/outboards/boards/corne-ish_zen b/.github/workflows/outboards/boards/corne-ish_zen deleted file mode 100644 index c1196a9..0000000 --- a/.github/workflows/outboards/boards/corne-ish_zen +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright 2022 Manna Harbour -# https://github.com/manna-harbour/miryoku - -zmk=LOWPROKB/zmk/Board-Corne-ish-Zen-dedicated-work-queue diff --git a/.github/workflows/outboards/boards/corneish_zen_v1 b/.github/workflows/outboards/boards/corneish_zen_v1 deleted file mode 100644 index 0d9f227..0000000 --- a/.github/workflows/outboards/boards/corneish_zen_v1 +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2022 Manna Harbour -# https://github.com/manna-harbour/miryoku - -outboard_repository=caksoylar/zmk -outboard_ref=add-zen-v1 -outboard_from=app/boards/arm/corneish_zen -outboard_to=boards/arm/corneish_zen diff --git a/.github/workflows/test-all-boards.yml b/.github/workflows/test-all-boards.yml index 48e723d..3c8c904 100644 --- a/.github/workflows/test-all-boards.yml +++ b/.github/workflows/test-all-boards.yml @@ -1,4 +1,4 @@ -# Copyright 2021 Manna Harbour +# Copyright 2023 Manna Harbour # https://github.com/manna-harbour/miryoku name: 'Test All Boards' @@ -13,7 +13,6 @@ jobs: "adv360pro_left","adv360pro_right", "ahokore", "ble_chiffre", - "corne-ish_zen_left","corne-ish_zen_right", "corneish_zen_v1_left","corneish_zen_v1_right", "corneish_zen_v2_left","corneish_zen_v2_right", "ferris_rev02", diff --git a/config/corne-ish_zen_left.keymap b/config/corne-ish_zen_left.keymap deleted file mode 100644 index 7340e22..0000000 --- a/config/corne-ish_zen_left.keymap +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2021 Manna Harbour -// https://github.com/manna-harbour/miryoku - -#include "../miryoku/custom_config.h" -#include "../miryoku/mapping/42/corne.h" -#include "../miryoku/miryoku.dtsi" diff --git a/config/corne-ish_zen_right.keymap b/config/corne-ish_zen_right.keymap deleted file mode 100644 index 7340e22..0000000 --- a/config/corne-ish_zen_right.keymap +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2021 Manna Harbour -// https://github.com/manna-harbour/miryoku - -#include "../miryoku/custom_config.h" -#include "../miryoku/mapping/42/corne.h" -#include "../miryoku/miryoku.dtsi" diff --git a/readme.org b/readme.org index 14e7238..8eac190 100644 --- a/readme.org +++ b/readme.org @@ -1,4 +1,4 @@ -# Copyright 2022 Manna Harbour +# Copyright 2023 Manna Harbour # https://github.com/manna-harbour/miryoku * Miryoku ZMK [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/logos/miryoku-roa-32.png]] @@ -100,7 +100,7 @@ Specifies the ZMK board. For onboard controller keyboards (keyboards with an integrated controller), enter the keyboard name, e.g. ~ahokore~, ~ble_chiffre~, ~technikable~, ~zaphod~. -For split onboard controller keyboards (keyboards with an integrated controller on each side), enter the keyboard side name, e.g. ~corne-ish_zen_left~, ~corne-ish_zen_right~. To build both sides in the same run, enter both keyboard side names separated by a comma, e.g. ~corne-ish_zen_left,corne-ish_zen_right~. +For split onboard controller keyboards (keyboards with an integrated controller on each side), enter the keyboard side name, e.g. ~corneish_zen_v1_left~, ~corneish_zen_v1_right~. To build both sides in the same run, enter both keyboard side names separated by a comma, e.g. ~corneish_zen_v1_left,corneish_zen_v1_right~. For composite keyboards (keyboards with a separate controller), enter the controller name, e.g. ~nice_nano~, ~nice_nano_v2~, ~seeeduino_xiao~, ~seeeduino_xiao_ble~. Also specify the [[#shield][shield]]. @@ -206,8 +206,6 @@ For Corne-ish Zen v1 (GB R1 and R2) build with board ~corneish_zen_v1_left,corne A custom branch is also available at https://github.com/caksoylar/zmk/tree/caksoylar/zen-v1+v2 that includes additional display improvements and options. Documentation is at https://gist.github.com/caksoylar/c411313990978e1903c244f03039187a. Options can be selected with [[#kconfig-configuration][Kconfig configuration]]. For [[#workflow-builds][workflow builds]] using the [[#build-inputs][Build Inputs]] workflow, use ~caksoylar/zmk/caksoylar/zen-v1+v2~ with the ~branches~ option. For workflow builds using [[#build-examples][Build Example]] workflows, see the [[.github/workflows/build-example-corneish_zen-custom.yml][Build Example Corne-ish Zen Custom]] workflow. For local builds, make the changes locally. -Corne-ish Zen v1 can also be built with the original board ~corne-ish_zen_left,corne-ish_zen_right~ using the LowproKB fork, and workflow builds for this board will use this fork by default. - ** Config File