From 3d67a40954f8f2f69e97d3afce14488962f84c40 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 3 Aug 2023 21:42:07 +0200 Subject: [PATCH] naming things --- build.sh | 4 ++-- build.yaml | 4 ++-- .../shields/{ownkb => corax56}/Kconfig.defconfig | 6 +++--- config/boards/shields/corax56/Kconfig.shield | 5 +++++ .../{ownkb/ownkb.conf => corax56/corax56.conf} | 0 .../{ownkb/ownkb.dtsi => corax56/corax56.dtsi} | 0 .../{ownkb/ownkb.keymap => corax56/corax56.keymap} | 0 config/boards/shields/corax56/corax56.zmk.yml | 12 ++++++++++++ .../corax56_left.overlay} | 2 +- .../corax56_right.overlay} | 2 +- config/boards/shields/ownkb/Kconfig.shield | 5 ----- config/boards/shields/ownkb/ownkb.zmk.yml | 12 ------------ config/{ownkb.conf => corax56.conf} | 2 +- config/{ownkb.json => corax56.json} | 0 config/{ownkb.keymap => corax56.keymap} | 0 15 files changed, 27 insertions(+), 27 deletions(-) rename config/boards/shields/{ownkb => corax56}/Kconfig.defconfig (56%) create mode 100644 config/boards/shields/corax56/Kconfig.shield rename config/boards/shields/{ownkb/ownkb.conf => corax56/corax56.conf} (100%) rename config/boards/shields/{ownkb/ownkb.dtsi => corax56/corax56.dtsi} (100%) rename config/boards/shields/{ownkb/ownkb.keymap => corax56/corax56.keymap} (100%) create mode 100644 config/boards/shields/corax56/corax56.zmk.yml rename config/boards/shields/{ownkb/ownkb_left.overlay => corax56/corax56_left.overlay} (98%) rename config/boards/shields/{ownkb/ownkb_right.overlay => corax56/corax56_right.overlay} (98%) delete mode 100644 config/boards/shields/ownkb/Kconfig.shield delete mode 100644 config/boards/shields/ownkb/ownkb.zmk.yml rename config/{ownkb.conf => corax56.conf} (90%) rename config/{ownkb.json => corax56.json} (100%) rename config/{ownkb.keymap => corax56.keymap} (100%) diff --git a/build.sh b/build.sh index 9556e01..a282f8c 100644 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -west build -p -b nice_nano_v2 -- -DSHIELD="ownkb_left nice_view_adapter nice_view" -DZMK_CONFIG=/workspaces/zmk-config/config +west build -p -b nice_nano_v2 -- -DSHIELD="corax56_left nice_view_adapter nice_view" -DZMK_CONFIG=/workspaces/zmk-config/config mv /workspaces/zmk/app/build/zephyr/zmk.uf2 /workspaces/zmk-config/left.uf2 -west build -p -b nice_nano_v2 -- -DSHIELD="ownkb_right nice_view_adapter nice_view" -DZMK_CONFIG=/workspaces/zmk-config/config +west build -p -b nice_nano_v2 -- -DSHIELD="corax56_right nice_view_adapter nice_view" -DZMK_CONFIG=/workspaces/zmk-config/config mv /workspaces/zmk/app/build/zephyr/zmk.uf2 /workspaces/zmk-config/right.uf2 diff --git a/build.yaml b/build.yaml index 8be95bd..36619c1 100644 --- a/build.yaml +++ b/build.yaml @@ -14,8 +14,8 @@ --- include: - board: nice_nano_v2 - shield: ownkb_left nice_view_adapter nice_view + shield: corax56_left nice_view_adapter nice_view - board: nice_nano_v2 - shield: ownkb_right nice_view_adapter nice_view + shield: corax56_right nice_view_adapter nice_view #- board: nice_nano_v2 #shield: settings_reset diff --git a/config/boards/shields/ownkb/Kconfig.defconfig b/config/boards/shields/corax56/Kconfig.defconfig similarity index 56% rename from config/boards/shields/ownkb/Kconfig.defconfig rename to config/boards/shields/corax56/Kconfig.defconfig index 2061cfe..a9163e1 100644 --- a/config/boards/shields/ownkb/Kconfig.defconfig +++ b/config/boards/shields/corax56/Kconfig.defconfig @@ -1,14 +1,14 @@ -if SHIELD_OWNKB_LEFT +if SHIELD_CORAX56_LEFT config ZMK_KEYBOARD_NAME - default "ownkb" + default "Corax56" config ZMK_SPLIT_ROLE_CENTRAL default y endif -if SHIELD_OWNKB_LEFT || SHIELD_OWNKB_RIGHT +if SHIELD_CORAX56_LEFT || SHIELD_CORAX56_RIGHT config ZMK_SPLIT default y diff --git a/config/boards/shields/corax56/Kconfig.shield b/config/boards/shields/corax56/Kconfig.shield new file mode 100644 index 0000000..5a860c6 --- /dev/null +++ b/config/boards/shields/corax56/Kconfig.shield @@ -0,0 +1,5 @@ +config SHIELD_CORAX56_LEFT + def_bool $(shields_list_contains,corax56_left) + +config SHIELD_CORAX56_RIGHT + def_bool $(shields_list_contains,corax56_right) diff --git a/config/boards/shields/ownkb/ownkb.conf b/config/boards/shields/corax56/corax56.conf similarity index 100% rename from config/boards/shields/ownkb/ownkb.conf rename to config/boards/shields/corax56/corax56.conf diff --git a/config/boards/shields/ownkb/ownkb.dtsi b/config/boards/shields/corax56/corax56.dtsi similarity index 100% rename from config/boards/shields/ownkb/ownkb.dtsi rename to config/boards/shields/corax56/corax56.dtsi diff --git a/config/boards/shields/ownkb/ownkb.keymap b/config/boards/shields/corax56/corax56.keymap similarity index 100% rename from config/boards/shields/ownkb/ownkb.keymap rename to config/boards/shields/corax56/corax56.keymap diff --git a/config/boards/shields/corax56/corax56.zmk.yml b/config/boards/shields/corax56/corax56.zmk.yml new file mode 100644 index 0000000..0c12381 --- /dev/null +++ b/config/boards/shields/corax56/corax56.zmk.yml @@ -0,0 +1,12 @@ +file_format: "1" +id: corax56 +name: Corax56 +type: shield +url: https://github.com/dnlbauer/corax56-keyboard +requires: [pro_micro] +features: + - keys + - encoder +siblings: + - corax56_left + - corax56_right diff --git a/config/boards/shields/ownkb/ownkb_left.overlay b/config/boards/shields/corax56/corax56_left.overlay similarity index 98% rename from config/boards/shields/ownkb/ownkb_left.overlay rename to config/boards/shields/corax56/corax56_left.overlay index d52f723..04a60e1 100644 --- a/config/boards/shields/ownkb/ownkb_left.overlay +++ b/config/boards/shields/corax56/corax56_left.overlay @@ -1,4 +1,4 @@ -#include "ownkb.dtsi" +#include "corax56.dtsi" &kscan0 { diode-direction = "col2row"; diff --git a/config/boards/shields/ownkb/ownkb_right.overlay b/config/boards/shields/corax56/corax56_right.overlay similarity index 98% rename from config/boards/shields/ownkb/ownkb_right.overlay rename to config/boards/shields/corax56/corax56_right.overlay index 8143761..b3dae13 100644 --- a/config/boards/shields/ownkb/ownkb_right.overlay +++ b/config/boards/shields/corax56/corax56_right.overlay @@ -1,4 +1,4 @@ -#include "ownkb.dtsi" +#include "corax56.dtsi" &default_transform { col-offset = <6>; diff --git a/config/boards/shields/ownkb/Kconfig.shield b/config/boards/shields/ownkb/Kconfig.shield deleted file mode 100644 index c2d1818..0000000 --- a/config/boards/shields/ownkb/Kconfig.shield +++ /dev/null @@ -1,5 +0,0 @@ -config SHIELD_OWNKB_LEFT - def_bool $(shields_list_contains,ownkb_left) - -config SHIELD_OWNKB_RIGHT - def_bool $(shields_list_contains,ownkb_right) diff --git a/config/boards/shields/ownkb/ownkb.zmk.yml b/config/boards/shields/ownkb/ownkb.zmk.yml deleted file mode 100644 index e7b14a8..0000000 --- a/config/boards/shields/ownkb/ownkb.zmk.yml +++ /dev/null @@ -1,12 +0,0 @@ -file_format: "1" -id: ownkb -name: ownkb -type: shield -url: https://github.com/dnlbauer/splitkeyboard -requires: [pro_micro] -features: - - keys - - encoder -siblings: - - ownkb_left - - ownkb_right diff --git a/config/ownkb.conf b/config/corax56.conf similarity index 90% rename from config/ownkb.conf rename to config/corax56.conf index 2664f51..a2a2190 100644 --- a/config/ownkb.conf +++ b/config/corax56.conf @@ -2,7 +2,7 @@ CONFIG_EC11=y CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y -CONFIG_ZMK_KEYBOARD_NAME="DB OwnKB" +CONFIG_ZMK_KEYBOARD_NAME="Corax56" CONFIG_ZMK_IDLE_TIMEOUT=30000 #CONFIG_ZMK_SLEEP=y diff --git a/config/ownkb.json b/config/corax56.json similarity index 100% rename from config/ownkb.json rename to config/corax56.json diff --git a/config/ownkb.keymap b/config/corax56.keymap similarity index 100% rename from config/ownkb.keymap rename to config/corax56.keymap