From 46510619a25bdb7d11ea2077cb92e06e69b75596 Mon Sep 17 00:00:00 2001 From: "Chow Castro, Marcos" Date: Thu, 22 Aug 2024 15:11:25 +0200 Subject: [PATCH] 1. local/github integration module 2. makefile redundancy eliminated --- CHANGELOG.txt | 28 ++ Makefile | 411 ++++++------------ README.md | 3 + {config/boards => boards}/.DS_Store.gz | Bin {config/boards => boards}/nice_nano.overlay | 0 .../boards => boards}/nice_nano_v2.overlay | 0 {config/boards => boards}/nrfmicro_11.overlay | 0 .../nrfmicro_11_flipped.overlay | 0 {config/boards => boards}/nrfmicro_13.overlay | 0 .../boards => boards}/puchi_ble_v1.overlay | 0 .../shields/corne/Kconfig.defconfig | 0 .../shields/corne/Kconfig.shield | 0 .../shields/corne/boards/nice_nano.overlay | 0 .../shields/corne/boards/nice_nano_v2.overlay | 0 .../shields/corne/corne.conf | 0 .../shields/corne/corne.dtsi | 0 boards/shields/corne/corne.keymap.zip | Bin 0 -> 1063 bytes .../shields/corne/corne.zmk.yml | 0 .../shields/corne/corne_dongle_pro_micro.conf | 0 .../corne/corne_dongle_pro_micro.overlay | 0 .../shields/corne/corne_dongle_xiao.conf | 0 .../shields/corne/corne_dongle_xiao.overlay | 0 .../shields/corne/corne_left.conf | 0 .../shields/corne/corne_left.overlay | 0 .../shields/corne/corne_left_peripheral.conf | 0 .../corne/corne_left_peripheral.overlay | 0 .../shields/corne/corne_right.conf | 0 .../shields/corne/corne_right.overlay | 0 .../shields/dongle_display/CMakeLists.txt | 0 .../shields/dongle_display/Kconfig.defconfig | 0 .../shields/dongle_display/Kconfig.shield | 0 .../dongle_display/custom_status_screen.c | 0 .../dongle_display/custom_status_screen.h | 0 .../dongle_display/dongle_display.conf | 0 .../dongle_display/dongle_display.overlay | 0 .../dongle_display/dongle_display.zmk.yml | 0 .../dongle_display/widgets/battery_status.c | 0 .../dongle_display/widgets/battery_status.h | 0 .../dongle_display/widgets/bongo_cat.c | 0 .../dongle_display/widgets/bongo_cat.h | 0 .../dongle_display/widgets/bongo_cat_images.c | 0 .../dongle_display/widgets/hid_indicators.c | 0 .../dongle_display/widgets/hid_indicators.h | 0 .../dongle_display/widgets/layer_status.c | 0 .../dongle_display/widgets/layer_status.h | 0 .../dongle_display/widgets/modifiers.c | 0 .../dongle_display/widgets/modifiers.h | 0 .../dongle_display/widgets/modifiers_sym.c | 0 .../dongle_display/widgets/output_status.c | 0 .../dongle_display/widgets/output_status.h | 0 .../widgets/output_status_sym.c | 0 config/boards/shields/corne/corne.keymap | 58 --- zephyr/module.yml | 3 + 53 files changed, 162 insertions(+), 341 deletions(-) create mode 100644 CHANGELOG.txt rename {config/boards => boards}/.DS_Store.gz (100%) rename {config/boards => boards}/nice_nano.overlay (100%) rename {config/boards => boards}/nice_nano_v2.overlay (100%) rename {config/boards => boards}/nrfmicro_11.overlay (100%) rename {config/boards => boards}/nrfmicro_11_flipped.overlay (100%) rename {config/boards => boards}/nrfmicro_13.overlay (100%) rename {config/boards => boards}/puchi_ble_v1.overlay (100%) rename {config/boards => boards}/shields/corne/Kconfig.defconfig (100%) rename {config/boards => boards}/shields/corne/Kconfig.shield (100%) rename {config/boards => boards}/shields/corne/boards/nice_nano.overlay (100%) rename {config/boards => boards}/shields/corne/boards/nice_nano_v2.overlay (100%) rename {config/boards => boards}/shields/corne/corne.conf (100%) rename {config/boards => boards}/shields/corne/corne.dtsi (100%) create mode 100644 boards/shields/corne/corne.keymap.zip rename {config/boards => boards}/shields/corne/corne.zmk.yml (100%) rename {config/boards => boards}/shields/corne/corne_dongle_pro_micro.conf (100%) rename {config/boards => boards}/shields/corne/corne_dongle_pro_micro.overlay (100%) rename {config/boards => boards}/shields/corne/corne_dongle_xiao.conf (100%) rename {config/boards => boards}/shields/corne/corne_dongle_xiao.overlay (100%) rename {config/boards => boards}/shields/corne/corne_left.conf (100%) rename {config/boards => boards}/shields/corne/corne_left.overlay (100%) rename {config/boards => boards}/shields/corne/corne_left_peripheral.conf (100%) rename {config/boards => boards}/shields/corne/corne_left_peripheral.overlay (100%) rename {config/boards => boards}/shields/corne/corne_right.conf (100%) rename {config/boards => boards}/shields/corne/corne_right.overlay (100%) rename {config/boards => boards}/shields/dongle_display/CMakeLists.txt (100%) rename {config/boards => boards}/shields/dongle_display/Kconfig.defconfig (100%) rename {config/boards => boards}/shields/dongle_display/Kconfig.shield (100%) rename {config/boards => boards}/shields/dongle_display/custom_status_screen.c (100%) rename {config/boards => boards}/shields/dongle_display/custom_status_screen.h (100%) rename {config/boards => boards}/shields/dongle_display/dongle_display.conf (100%) rename {config/boards => boards}/shields/dongle_display/dongle_display.overlay (100%) rename {config/boards => boards}/shields/dongle_display/dongle_display.zmk.yml (100%) rename {config/boards => boards}/shields/dongle_display/widgets/battery_status.c (100%) rename {config/boards => boards}/shields/dongle_display/widgets/battery_status.h (100%) rename {config/boards => boards}/shields/dongle_display/widgets/bongo_cat.c (100%) rename {config/boards => boards}/shields/dongle_display/widgets/bongo_cat.h (100%) rename {config/boards => boards}/shields/dongle_display/widgets/bongo_cat_images.c (100%) rename {config/boards => boards}/shields/dongle_display/widgets/hid_indicators.c (100%) rename {config/boards => boards}/shields/dongle_display/widgets/hid_indicators.h (100%) rename {config/boards => boards}/shields/dongle_display/widgets/layer_status.c (100%) rename {config/boards => boards}/shields/dongle_display/widgets/layer_status.h (100%) rename {config/boards => boards}/shields/dongle_display/widgets/modifiers.c (100%) rename {config/boards => boards}/shields/dongle_display/widgets/modifiers.h (100%) rename {config/boards => boards}/shields/dongle_display/widgets/modifiers_sym.c (100%) rename {config/boards => boards}/shields/dongle_display/widgets/output_status.c (100%) rename {config/boards => boards}/shields/dongle_display/widgets/output_status.h (100%) rename {config/boards => boards}/shields/dongle_display/widgets/output_status_sym.c (100%) delete mode 100644 config/boards/shields/corne/corne.keymap create mode 100644 zephyr/module.yml diff --git a/CHANGELOG.txt b/CHANGELOG.txt new file mode 100644 index 0000000..fa6ee01 --- /dev/null +++ b/CHANGELOG.txt @@ -0,0 +1,28 @@ +Changelog file for Structures extra. +https://github.com/mctechnology17/zmk-config/blob/main/CHANGELOG.txt + +# FEATURES 0.0.1-beta1 (Aug 22, 2024) +======================================= + +# List of exciting new features ++ NEW FEATURES +- [x] local/github integration module +- [x] makefile redundancy eliminated +- [x] CHANGELOG.md file added +- [x] dongle support +- [x] rgb support +- [x] oled display support +- [x] rgb + oled display support +- [x] rgb + oled display + dongle support + ++ TODO +- [ ] Add set up the workspace https://github.com/urob/zmk-config?tab=readme-ov-file#set-up-the-workspace +- [ ] Add a wiki to the repository +- [ ] Add a video tutorial to the repository +- [ ] Add EXTRA_CONF_FILE for each device +- [ ] Add build for rgb + oled display +- [ ] Add build for rgb + oled display + dongle +- [ ] Add zmk modules from the community +- [ ] Add better keymap-drawer customization +- [ ] NiceView support for seeeduino_xiao_ble +- [ ] Dongle with NiceView support for all nrf52840 diff --git a/Makefile b/Makefile index 0eff9c6..7ae1832 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,8 @@ # Email: mctechnology170318@gmail.com # GitHub: https://github.com/mctechnology17 # Brief: Makefile for ZMK firmware with Docker -# Board: nice_nano_v2 puchi_ble_v1 seeeduino_xiao_ble +# Shields: corne sofle splitkb_aurora_sofle +# Boards: nice_nano_v2 puchi_ble_v1 seeeduino_xiao_ble # ========================================= # ╔═╦═╦═╗ # ╔════╗ ║║║║║╔╝ @@ -18,10 +19,22 @@ # to update the branch # https://hub.docker.com/r/zmkfirmware/zmk-dev-arm/tags # https://github.com/zmkfirmware/zmk/blob/main/.devcontainer/Dockerfile -# docker pull zmkfirmware/zmk-dev-arm:3.5 -# extra_conf_file_oled_rgb= -DEXTRA_CONF_FILE=${PWD}/config/config_ready/nice/oled_rgb/corne.conf +# docker pull zmkfirmware/zmk-dev-arm:3.2-branch +# +# CUSTOM BRANCH EXAMPLE: +# git clone https://github.com/petejohanson/zmk -b v3.4.0+zmk-fixes +# +# WIDGET BRANCH ANIMATED +# cmake-args: -DKEYMAP_FILE=../../config/other-corne.keymap -DCONFIG_ZMK_KEYBOARD_NAME=\"other-corne\" -DEXTRA_CONF_FILE=../../config/other-corne.conf +# /Users/marcos/zmk-privat/config/config_ready/nice/oled_rgb/corne.conf +# -DKEYMAP_FILE=../../config/other-corne.keymap -DCONFIG_ZMK_KEYBOARD_NAME=\"other-corne\" -DEXTRA_CONF_FILE=../../config/other-corne.conf +# module: +# https://github.com/caksoylar/zmk-rgbled-widget ### config +# extra_conf_file_oled_rgb= -DEXTRA_CONF_FILE=${PWD}/config/config_ready/nice/oled_rgb/corne.conf +extra_modules_dir=${PWD} +extra_modules= -DZMK_EXTRA_MODULES="/boards" config=${PWD}/config nice_mount=/Volumes/NICENANO puchi_mount=/Volumes/NRF52BOOT @@ -38,8 +51,9 @@ docker_opts= \ --tty \ --name zmk-$@ \ --workdir /zmk \ - --volume zmk:/zmk \ --volume "${config}:/zmk-config:Z" \ + --volume "${PWD}/zmk:/zmk:Z" \ + --volume "${extra_modules_dir}:/boards:Z" \ ${zmk_image} ### name @@ -58,15 +72,15 @@ keyboard_name_xiao_dongle_oled= '-DCONFIG_ZMK_KEYBOARD_NAME="Xiao_Dongle_O"' keyboard_name_xiao_dongle_view= '-DCONFIG_ZMK_KEYBOARD_NAME="Xiao_Dongle_V"' ### west -west_built_puchi_ble_v1= \ +west_built_puchi= \ west build /zmk/app \ --pristine --board "${puchi}" -west_built_nice_nano_v2= \ +west_built_nice= \ west build /zmk/app \ --pristine --board "${nice}" -west_built_seeeduino_xiao_ble= \ +west_built_xiao= \ west build /zmk/app \ --pristine --board "${xiao}" @@ -111,9 +125,9 @@ uf2_copy_puchi_corne_left=/zmk/build/zephyr/zmk.uf2 \ firmware/puchi_corne_left.uf2 uf2_copy_puchi_corne_right=/zmk/build/zephyr/zmk.uf2 \ firmware/puchi_corne_right.uf2 -uf2_copy_puchi_corne_left_peripheral=/zmk/build/zephyr/zmk.uf2 \ +uf2_copy_puchi_corne_left_peripheral_view=/zmk/build/zephyr/zmk.uf2 \ firmware/puchi_corne_left_peripheral.uf2 -uf2_copy_puchi_corne_dongle_pro_micro=/zmk/build/zephyr/zmk.uf2 \ +uf2_copy_niceuf2_copy_puchi_corne_dongle_pro_micro=/zmk/build/zephyr/zmk.uf2 \ firmware/puchi_corne_dongle_pro_micro.uf2 uf2_copy_puchi_corne_dongle_pro_micro_dongle_display=/zmk/build/zephyr/zmk.uf2 \ firmware/puchi_corne_dongle_pro_micro_dongle_display.uf2 @@ -140,12 +154,11 @@ uf2_copy_xiao_corne_dongle_xiao_rgbled_adapter=/zmk/build/zephyr/zmk.uf2 \ uf2_copy_xiao_corne_dongle_xiao_dongle_display_rgbled_adapter=/zmk/build/zephyr/zmk.uf2 \ firmware/xiao_corne_dongle_xiao_dongle_display_rgbled_adapter.uf2 ### chmod -# many times you cannot copy the uf2 file so try this solution uf2_chmod_puchi_corne_settings_reset=chmod go+wrx \ firmware/puchi_corne_settings_reset.uf2 uf2_chmod_puchi_corne_left=chmod go+wrx firmware/puchi_corne_left.uf2 uf2_chmod_puchi_corne_right=chmod go+wrx firmware/puchi_corne_right.uf2 -uf2_chmod_puchi_corne_left_peripheral=chmod go+wrx firmware/puchi_corne_left_peripheral.uf2 +uf2_chmod_puchi_corne_left_peripheral_view=chmod go+wrx firmware/puchi_corne_left_peripheral.uf2 uf2_chmod_puchi_corne_dongle_pro_micro=chmod go+wrx firmware/puchi_corne_dongle_pro_micro.uf2 uf2_chmod_puchi_corne_dongle_pro_micro_dongle_display=chmod go+wrx firmware/puchi_corne_dongle_pro_micro_dongle_display.uf2 uf2_chmod_nice_corne_settings_reset=chmod go+wrx \ @@ -163,313 +176,141 @@ uf2_chmod_xiao_corne_dongle_xiao_dongle_display=chmod go+wrx firmware/xiao_corne uf2_chmod_xiao_corne_dongle_xiao_rgbled_adapter=chmod go+wrx firmware/xiao_corne_dongle_xiao_rgbled_adapter.uf2 uf2_chmod_xiao_corne_dongle_xiao_dongle_display_rgbled_adapter=chmod go+wrx firmware/xiao_corne_dongle_xiao_dongle_display_rgbled_adapter.uf2 -codebase_default: +clone_zmk_default: + if [ ! -d zmk ]; then git clone https://github.com/zmkfirmware/zmk; fi + +codebase_default: clone_zmk_default docker run ${docker_opts} sh -c '\ - git clone https://github.com/zmkfirmware/zmk /zmk/; \ west init -l /zmk/app/; \ west update' +clone_zmk_urob: + if [ ! -d zmk ]; then git clone https://github.com/urob/zmk; fi -codebase_urob: +codebase_urob: clone_zmk_urob docker run ${docker_opts} sh -c '\ - git clone https://github.com/urob/zmk /zmk/; \ west init -l /zmk/app/; \ west update' -### CODEBASE_DEFAULT START -### CODEBASE_DEFAULT END - ### CODEBASE_UROB START -xiao_corne_dongle_rgbled_adapter_urob: +only_nice_corne_left_view_urob: docker run --rm ${docker_opts} \ - ${west_built_seeeduino_xiao_ble} ${shield_xiao_corne_dongle_xiao_rgbled_adapter} \ - ${keyboard_name_xiao_dongle} - docker cp ${urob}:${uf2_copy_xiao_corne_dongle_xiao_rgbled_adapter} - ${uf2_chmod_xiao_corne_dongle_xiao_rgbled_adapter} - -xiao_corne_dongle_urob: - docker run --rm ${docker_opts} \ - ${west_built_seeeduino_xiao_ble} ${shield_xiao_corne_dongle_xiao_dongle_display} \ - ${keyboard_name_xiao_dongle_oled} - docker cp ${urob}:${uf2_copy_xiao_corne_dongle_xiao_dongle_display} - ${uf2_chmod_xiao_corne_dongle_xiao_dongle_display} - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_left_view} \ - ${keyboard_name_nice} + ${west_built_nice} ${shield_corne_left_view} \ + ${keyboard_name_nice} ${extra_modules} docker cp ${urob}:${uf2_copy_nice_corne_left} ${uf2_chmod_nice_corne_left} +only_nice_corne_right_view_urob: docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_right_view} + ${west_built_nice} ${shield_corne_right_view} ${extra_modules} docker cp ${urob}:${uf2_copy_nice_corne_right} ${uf2_chmod_nice_corne_right} +only_puchi_corne_left_view_urob: docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_left_peripheral_view} + ${west_built_puchi} ${shield_corne_left_view} \ + ${keyboard_name_puchi} ${extra_modules} + docker cp ${urob}:${uf2_copy_puchi_corne_left} + ${uf2_chmod_puchi_corne_left} +only_puchi_corne_right_view_urob: + docker run --rm ${docker_opts} \ + ${west_built_puchi} ${shield_corne_right} ${extra_modules} + docker cp ${urob}:${uf2_copy_puchi_corne_right} + ${uf2_chmod_puchi_corne_right} +only_nice_corne_left_peripheral_view_urob: + docker run --rm ${docker_opts} \ + ${west_built_nice} ${shield_corne_left_peripheral_view} ${extra_modules} docker cp ${urob}:${uf2_copy_nice_corne_left_peripheral_view} ${uf2_chmod_nice_corne_left_peripheral_view} - -only_xiao_dongle_urob: +only_puchi_corne_left_peripheral_view_urob: docker run --rm ${docker_opts} \ - ${west_built_seeeduino_xiao_ble} ${shield_xiao_corne_dongle_xiao_dongle_display} \ - ${keyboard_name_xiao_dongle_oled} - docker cp ${urob}:${uf2_copy_xiao_corne_dongle_xiao_dongle_display} - ${uf2_chmod_xiao_corne_dongle_xiao_dongle_display} -only_nice_dongle_urob: + ${west_built_puchi} ${shield_corne_left_peripheral_view} ${extra_modules} + docker cp ${urob}:${uf2_copy_puchi_corne_left_peripheral_view} + ${uf2_chmod_puchi_corne_left_peripheral_view} +only_nice_corne_dongle_pro_micro_dongle_display_urob: docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_dongle_pro_micro_dongle_display} \ - ${keyboard_name_nice_dongle_oled} + ${west_built_nice} ${shield_corne_dongle_pro_micro_dongle_display} ${extra_modules} docker cp ${urob}:${uf2_copy_nice_corne_dongle_pro_micro_dongle_display} ${uf2_chmod_nice_corne_dongle_pro_micro_dongle_display} -only_puchi_dongle_urob: +only_puchi_corne_dongle_pro_micro_dongle_display_urob: docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_corne_dongle_pro_micro_dongle_display} \ - ${keyboard_name_puchi_dongle_oled} + ${west_built_puchi} ${shield_corne_dongle_pro_micro_dongle_display} ${extra_modules} docker cp ${urob}:${uf2_copy_puchi_corne_dongle_pro_micro_dongle_display} ${uf2_chmod_puchi_corne_dongle_pro_micro_dongle_display} +only_corne_xiao_corne_dongle_xiao_dongle_display_urob: + docker run --rm ${docker_opts} \ + ${west_built_xiao} ${shield_xiao_corne_dongle_xiao_dongle_display} ${extra_modules} + docker cp ${urob}:${uf2_copy_xiao_corne_dongle_xiao_dongle_display} + ${uf2_chmod_xiao_corne_dongle_xiao_dongle_display} +only_nice_settings_reset_urob: + docker run --rm ${docker_opts} \ + ${west_built_nice} ${shield_settings_reset} + docker cp ${urob}:${uf2_copy_nice_corne_settings_reset} + ${uf2_chmod_nice_corne_settings_reset} +only_puchi_settings_reset_urob: + docker run --rm ${docker_opts} \ + ${west_built_puchi} ${shield_settings_reset} + docker cp ${urob}:${uf2_copy_puchi_corne_settings_reset} + ${uf2_chmod_puchi_corne_settings_reset} +only_xiao_settings_reset_urob: + docker run --rm ${docker_opts} \ + ${west_built_xiao} ${shield_settings_reset} + docker cp ${urob}:${uf2_copy_xiao_corne_settings_reset} + ${uf2_chmod_xiao_corne_settings_reset} -only_dongle_urob: only_xiao_dongle_urob only_nice_dongle_urob only_puchi_dongle_urob - @echo "only dongle urob and not other shields" - -corne_dongle_pro_micro_urob: +### MC: TODO: excluded for the moment START +only_corne_left_peripheral_oled_urob: docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_dongle_pro_micro} \ - ${keyboard_name_nice_dongle} - docker cp ${urob}:${uf2_copy_nice_corne_dongle_pro_micro} - ${uf2_chmod_nice_corne_dongle_pro_micro} - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_dongle_pro_micro_dongle_display} \ - ${keyboard_name_nice_dongle_oled} - docker cp ${urob}:${uf2_copy_nice_corne_dongle_pro_micro_dongle_display} - ${uf2_chmod_nice_corne_dongle_pro_micro_dongle_display} - -corne_dongle_pro_micro_display_urob: - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_dongle_pro_micro} \ - ${keyboard_name_nice_dongle} - docker cp ${urob}:${uf2_copy_nice_corne_dongle_pro_micro} - ${uf2_chmod_nice_corne_dongle_pro_micro} - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_dongle_pro_micro_dongle_display} \ - ${keyboard_name_nice_dongle_oled} - docker cp ${urob}:${uf2_copy_nice_corne_dongle_pro_micro_dongle_display} - ${uf2_chmod_nice_corne_dongle_pro_micro_dongle_display} - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_left} \ - ${keyboard_name_nice_oled} - docker cp ${urob}:${uf2_copy_nice_corne_left} - ${uf2_chmod_nice_corne_left} - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_right} - docker cp ${urob}:${uf2_copy_nice_corne_right} - ${uf2_chmod_nice_corne_right} - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_left_peripheral_oled} + ${west_built_nice} ${shield_corne_left_peripheral_oled} ${extra_modules} docker cp ${urob}:${uf2_copy_nice_corne_left_peripheral_oled} ${uf2_chmod_nice_corne_left_peripheral_oled} - -# full compilation -corne_urob: docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_left_view} \ - ${keyboard_name_nice} - docker cp ${urob}:${uf2_copy_nice_corne_left} - ${uf2_chmod_nice_corne_left} + ${west_built_puchi} ${shield_corne_left_peripheral_oled} ${extra_modules} + docker cp ${urob}:${uf2_copy_puchi_corne_left_peripheral_oled} + ${uf2_chmod_puchi_corne_left_peripheral_oled} +only_corne_dongle_pro_micro_urob: docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_right_view} - docker cp ${urob}:${uf2_copy_nice_corne_right} - ${uf2_chmod_nice_corne_right} - docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_corne_left_view} \ - ${keyboard_name_puchi_view} - docker cp ${urob}:${uf2_copy_puchi_corne_left} - ${uf2_chmod_puchi_corne_left} - docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_corne_right_view} - docker cp ${urob}:${uf2_copy_puchi_corne_right} - ${uf2_chmod_puchi_corne_right} - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_left_peripheral_view} - docker cp ${urob}:${uf2_copy_nice_corne_left_peripheral_view} - ${uf2_chmod_nice_corne_left_peripheral_view} - docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_corne_left_peripheral_view} - docker cp ${urob}:${uf2_copy_puchi_corne_left_peripheral} - ${uf2_chmod_puchi_corne_left_peripheral} - docker run --rm ${docker_opts} \ - ${west_built_seeeduino_xiao_ble} ${shield_xiao_corne_dongle_xiao} \ - ${keyboard_name_xiao_dongle} - docker cp ${urob}:${uf2_copy_xiao_corne_dongle_xiao} - ${uf2_chmod_xiao_corne_dongle_xiao} - docker run --rm ${docker_opts} \ - ${west_built_seeeduino_xiao_ble} ${shield_xiao_corne_dongle_xiao_dongle_display} \ - ${keyboard_name_xiao_dongle_oled} - docker cp ${urob}:${uf2_copy_xiao_corne_dongle_xiao_dongle_display} - ${uf2_chmod_xiao_corne_dongle_xiao_dongle_display} - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_dongle_pro_micro} \ - ${keyboard_name_nice_dongle} + ${west_built_nice} ${shield_corne_dongle_pro_micro} ${extra_modules} docker cp ${urob}:${uf2_copy_nice_corne_dongle_pro_micro} ${uf2_chmod_nice_corne_dongle_pro_micro} docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_dongle_pro_micro_dongle_display} \ - ${keyboard_name_nice_dongle_oled} - docker cp ${urob}:${uf2_copy_nice_corne_dongle_pro_micro_dongle_display} - ${uf2_chmod_nice_corne_dongle_pro_micro_dongle_display} - docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_corne_dongle_pro_micro} \ - ${keyboard_name_puchi_dongle} + ${west_built_puchi} ${shield_corne_dongle_pro_micro} ${extra_modules} docker cp ${urob}:${uf2_copy_puchi_corne_dongle_pro_micro} ${uf2_chmod_puchi_corne_dongle_pro_micro} +only_corne_xiao_corne_dongle_xiao_urob: docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_corne_dongle_pro_micro_dongle_display} \ - ${keyboard_name_puchi_dongle_oled} - docker cp ${urob}:${uf2_copy_puchi_corne_dongle_pro_micro_dongle_display} - ${uf2_chmod_puchi_corne_dongle_pro_micro_dongle_display} - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_settings_reset} - docker cp ${urob}:${uf2_copy_nice_corne_settings_reset} - ${uf2_chmod_nice_corne_settings_reset} - docker run --rm ${docker_opts} \ - ${west_built_seeeduino_xiao_ble} ${shield_settings_reset} - docker cp ${urob}:${uf2_copy_xiao_corne_settings_reset} - ${uf2_chmod_xiao_corne_settings_reset} - docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_settings_reset} - docker cp ${urob}:${uf2_copy_puchi_corne_settings_reset} - ${uf2_chmod_puchi_corne_settings_reset} - -corne_view_urob: - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_left_view} \ - ${keyboard_name_nice} - docker cp ${urob}:${uf2_copy_nice_corne_left} - ${uf2_chmod_nice_corne_left} - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_right_view} - docker cp ${urob}:${uf2_copy_nice_corne_right} - ${uf2_chmod_nice_corne_right} - docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_corne_left_view} \ - ${keyboard_name_puchi_view} - docker cp ${urob}:${uf2_copy_puchi_corne_left} - ${uf2_chmod_puchi_corne_left} - docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_corne_right_view} - docker cp ${urob}:${uf2_copy_puchi_corne_right} - ${uf2_chmod_puchi_corne_right} - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_left_peripheral_view} - docker cp ${urob}:${uf2_copy_nice_corne_left_peripheral_view} - ${uf2_chmod_nice_corne_left_peripheral_view} - docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_corne_left_peripheral_view} - docker cp ${urob}:${uf2_copy_puchi_corne_left_peripheral} - ${uf2_chmod_puchi_corne_left_peripheral} - docker run --rm ${docker_opts} \ - ${west_built_seeeduino_xiao_ble} ${shield_xiao_corne_dongle_xiao} \ - ${keyboard_name_xiao_dongle} + ${west_built_xiao} ${shield_xiao_corne_dongle_xiao} ${extra_modules} docker cp ${urob}:${uf2_copy_xiao_corne_dongle_xiao} ${uf2_chmod_xiao_corne_dongle_xiao} - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_settings_reset} - docker cp ${urob}:${uf2_copy_nice_corne_settings_reset} - ${uf2_chmod_nice_corne_settings_reset} - docker run --rm ${docker_opts} \ - ${west_built_seeeduino_xiao_ble} ${shield_settings_reset} - docker cp ${urob}:${uf2_copy_xiao_corne_settings_reset} - ${uf2_chmod_xiao_corne_settings_reset} - docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_settings_reset} - docker cp ${urob}:${uf2_copy_puchi_corne_settings_reset} - ${uf2_chmod_puchi_corne_settings_reset} +### MC: TODO: excluded for the moment END -nice_corne_view_urob: +### MC: rgbled_adapter TODO: START +only_corne_xiao_corne_dongle_xiao_rgbled_adapter_urob: docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_left_view} \ - ${keyboard_name_nice} - docker cp ${urob}:${uf2_copy_nice_corne_left} - ${uf2_chmod_nice_corne_left} + ${west_built_xiao} ${shield_xiao_corne_dongle_xiao_rgbled_adapter} ${extra_modules} + docker cp ${urob}:${uf2_copy_xiao_corne_dongle_xiao_rgbled_adapter} + ${uf2_chmod_xiao_corne_dongle_xiao_rgbled_adapter} +only_corne_xiao_corne_dongle_xiao_dongle_display_rgbled_adapter_urob: docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_right_view} - docker cp ${urob}:${uf2_copy_nice_corne_right} - ${uf2_chmod_nice_corne_right} + ${west_built_xiao} ${shield_xiao_corne_dongle_xiao_dongle_display_rgbled_adapter} ${extra_modules} + docker cp ${urob}:${uf2_copy_xiao_corne_dongle_xiao_dongle_display_rgbled_adapter} + ${uf2_chmod_xiao_corne_dongle_xiao_dongle_display_rgbled_adapter} +### MC: rgbled_adapter TODO: END -corne_left_peripheral_view_urob: - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_left_peripheral_view} - docker cp ${urob}:${uf2_copy_nice_corne_left_peripheral_view} - ${uf2_chmod_nice_corne_left_peripheral_view} - -nice_corne_view_left_urob: - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_left_view} \ - ${keyboard_name_nice} - docker cp ${urob}:${uf2_copy_nice_corne_left} - ${uf2_chmod_nice_corne_left} - -nice_corne_view_right_urob: - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_right_view} - docker cp ${urob}:${uf2_copy_nice_corne_right} - ${uf2_chmod_nice_corne_right} - -nice_corne_oled_urob: - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_left} \ - ${keyboard_name_nice_oled} - docker cp ${urob}:${uf2_copy_nice_corne_left} - ${uf2_chmod_nice_corne_left} - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_corne_right} - docker cp ${urob}:${uf2_copy_nice_corne_right} - ${uf2_chmod_nice_corne_right} - -puchi_corne_view_urob: - docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_corne_left_view} \ - ${keyboard_name_puchi_view} - docker cp ${urob}:${uf2_copy_puchi_corne_left} - ${uf2_chmod_puchi_corne_left} - docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_corne_right_view} - docker cp ${urob}:${uf2_copy_puchi_corne_right} - ${uf2_chmod_puchi_corne_right} - -puchi_corne_view_left_urob: - docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_corne_left_view} \ - ${keyboard_name_puchi_view} - docker cp ${urob}:${uf2_copy_puchi_corne_left} - ${uf2_chmod_puchi_corne_left} - -puchi_corne_view_right_urob: - docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_corne_right_view} - docker cp ${urob}:${uf2_copy_puchi_corne_right} - ${uf2_chmod_puchi_corne_right} - -puchi_corne_oled_urob: - docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_corne_left} \ - ${keyboard_name_puchi_view} - docker cp ${urob}:${uf2_copy_puchi_corne_left} - ${uf2_chmod_puchi_corne_left} - docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_corne_right} - docker cp ${urob}:${uf2_copy_puchi_corne_right} - ${uf2_chmod_puchi_corne_right} - -reset_urob: - docker run --rm ${docker_opts} \ - ${west_built_nice_nano_v2} ${shield_settings_reset} - docker cp ${urob}:${uf2_copy_nice_corne_settings_reset} - ${uf2_chmod_nice_corne_settings_reset} - docker run --rm ${docker_opts} \ - ${west_built_seeeduino_xiao_ble} ${shield_settings_reset} - docker cp ${urob}:${uf2_copy_xiao_corne_settings_reset} - ${uf2_chmod_xiao_corne_settings_reset} - docker run --rm ${docker_opts} \ - ${west_built_puchi_ble_v1} ${shield_settings_reset} - docker cp ${urob}:${uf2_copy_puchi_corne_settings_reset} - ${uf2_chmod_puchi_corne_settings_reset} +only_corne_left_view_urob: only_nice_corne_left_view_urob \ + only_puchi_corne_left_view_urob +only_corne_right_view_urob: only_nice_corne_right_view_urob \ + only_puchi_corne_right_view_urob +only_corne_left_peripheral_view_urob: only_nice_corne_left_peripheral_view_urob \ + only_puchi_corne_left_peripheral_view_urob +only_corne_dongle_pro_micro_dongle_display_urob: only_nice_corne_dongle_pro_micro_dongle_display_urob \ + only_puchi_corne_dongle_pro_micro_dongle_display_urob +settings_reset_urob: only_nice_settings_reset_urob \ + only_puchi_settings_reset_urob \ + only_xiao_settings_reset_urob +corne_urob: only_corne_left_view_urob \ + only_corne_right_view_urob \ + only_corne_left_peripheral_view_urob \ + only_corne_dongle_pro_micro_dongle_display_urob \ + only_corne_xiao_corne_dongle_xiao_dongle_display_urob \ + settings_reset_urob ### CODEBASE_UROB END # Open a shell within the ZMK environment @@ -497,13 +338,17 @@ puchi_corne_flash_right: @ while [ ! -d ${puchi_mount} ]; do sleep 1; printf "."; done; printf "\n" cp -av firmware/puchi_corne_right.uf2 ${puchi_mount} -clean: - docker ps -aq --filter name='^zmk' | xargs -r docker container rm - docker volume list -q --filter name='zmk' | xargs -r docker volume rm - -clean_docker: - docker ps -aq --filter name='^zmk' | xargs -r docker container rm - docker volume list -q --filter name='zmk' | xargs -r docker volume rm - clean_firmware: find firmware/*.uf2 -type f -delete + +clean_zmk: + if [ -d zmk ]; then rm -rfv zmk; fi + +clean: clean_zmk + docker ps -aq --filter name='^zmk' | xargs -r docker container rm + docker volume list -q --filter name='zmk' | xargs -r docker volume rm + +clean_all: clean clean_firmware + @echo "cleaning all" + +# vim: set ft=make fdm=marker: diff --git a/README.md b/README.md index 3df7783..b7e9e51 100644 --- a/README.md +++ b/README.md @@ -351,12 +351,15 @@ MACRO(dongle_boot, &bootloader) / { keymap { compatible = "zmk,keymap"; + ... // other layers config_layer { display-name = "CON"; bindings = < ... // other bindings &dongle_boot ... // other bindings + }; + ... // other layers }; ``` diff --git a/config/boards/.DS_Store.gz b/boards/.DS_Store.gz similarity index 100% rename from config/boards/.DS_Store.gz rename to boards/.DS_Store.gz diff --git a/config/boards/nice_nano.overlay b/boards/nice_nano.overlay similarity index 100% rename from config/boards/nice_nano.overlay rename to boards/nice_nano.overlay diff --git a/config/boards/nice_nano_v2.overlay b/boards/nice_nano_v2.overlay similarity index 100% rename from config/boards/nice_nano_v2.overlay rename to boards/nice_nano_v2.overlay diff --git a/config/boards/nrfmicro_11.overlay b/boards/nrfmicro_11.overlay similarity index 100% rename from config/boards/nrfmicro_11.overlay rename to boards/nrfmicro_11.overlay diff --git a/config/boards/nrfmicro_11_flipped.overlay b/boards/nrfmicro_11_flipped.overlay similarity index 100% rename from config/boards/nrfmicro_11_flipped.overlay rename to boards/nrfmicro_11_flipped.overlay diff --git a/config/boards/nrfmicro_13.overlay b/boards/nrfmicro_13.overlay similarity index 100% rename from config/boards/nrfmicro_13.overlay rename to boards/nrfmicro_13.overlay diff --git a/config/boards/puchi_ble_v1.overlay b/boards/puchi_ble_v1.overlay similarity index 100% rename from config/boards/puchi_ble_v1.overlay rename to boards/puchi_ble_v1.overlay diff --git a/config/boards/shields/corne/Kconfig.defconfig b/boards/shields/corne/Kconfig.defconfig similarity index 100% rename from config/boards/shields/corne/Kconfig.defconfig rename to boards/shields/corne/Kconfig.defconfig diff --git a/config/boards/shields/corne/Kconfig.shield b/boards/shields/corne/Kconfig.shield similarity index 100% rename from config/boards/shields/corne/Kconfig.shield rename to boards/shields/corne/Kconfig.shield diff --git a/config/boards/shields/corne/boards/nice_nano.overlay b/boards/shields/corne/boards/nice_nano.overlay similarity index 100% rename from config/boards/shields/corne/boards/nice_nano.overlay rename to boards/shields/corne/boards/nice_nano.overlay diff --git a/config/boards/shields/corne/boards/nice_nano_v2.overlay b/boards/shields/corne/boards/nice_nano_v2.overlay similarity index 100% rename from config/boards/shields/corne/boards/nice_nano_v2.overlay rename to boards/shields/corne/boards/nice_nano_v2.overlay diff --git a/config/boards/shields/corne/corne.conf b/boards/shields/corne/corne.conf similarity index 100% rename from config/boards/shields/corne/corne.conf rename to boards/shields/corne/corne.conf diff --git a/config/boards/shields/corne/corne.dtsi b/boards/shields/corne/corne.dtsi similarity index 100% rename from config/boards/shields/corne/corne.dtsi rename to boards/shields/corne/corne.dtsi diff --git a/boards/shields/corne/corne.keymap.zip b/boards/shields/corne/corne.keymap.zip new file mode 100644 index 0000000000000000000000000000000000000000..7fc7b5d7167e5866b7ea572f48e6f30c72994427 GIT binary patch literal 1063 zcmWIWW@Zs#U|`^2U?~xa{LbdOwUU{E!Ig)BfrmkcAvwP&FI6u)wK6xcAT)%Nf%!zw zk+chJ$I?nGxEUB(zA`c}fOQ|8RvUcTLEzZ`_scC-D=o^+V7wo2%!D)d#Zq2RFTwZ? z`hiAMrg=8=b=8%0b85n-foTJ>BHC|DcLo z`_soC{wyhv(h=D*l_@&$*pn|deRlGyIh7wKgodwPtz*G;v+=UX!a^bUznfEp{Er4$ z-YP%)SE!%uVTIJRH;ER0i~Iv6_9yhocI*h#Ncp_)O}qPE{fQOZZG4tp4AV36@%o!# z({pV8@>|;{C;RGTM%n$k+fk?Vn6L@Ii);#Cqj9fpja}tt z1M@P8x>s|1CmjxaZ`0$d=bOB={_BY+;ytWYzGl09HgQKSU}szKr<%F!#KwbWFTAeJ z+ILz{W4T~O3|mP{?FE+Y2dk!SW_&l{GK=L7PP++=r(T+GW4>A1aKJ93p*lhL^i3w& zBDv<&fXQ2GoS(*gh}lqeTsrI6<6DtxjjEL(|YF@&-I-aucsGXxb#tT z+l)1_8-NzOD~J5yy`gyA%_(zh=<8*&rW?1JSRXI*_GSlLyi4jPL-~o!w3|D#YEN%G zd4qS;lN;rkvJJl%FuuDObmfHDiwVhFWZT1%x4rzDJOA>RM+{;)a?d8s-d|#rC>qte zT6!8+Wmtp9RGUJU>v9LKJ&Sp9yykkwC)1w)&1bZBbcPo2#;}`jdi|TFhRcq5e)H-L;1&FEBfDGp7EOfbxsJD7J(;^t*cT_iI*j?pWHAzHRps-NKR`f6MkNDtX?K_75!%U7P7sdtP_W9P8|uzS+?Sd;Qfu z{k&ORl|Fsa`LlJ_H_v}Px;I1WAN$?=je2p-V z{ekTdsz1p7n0VLed;0_B57s}NH&p~q`F7sqY18xjFXpxM@7k2VLd#=Q<_kMfnaRak zo7Saox#X1nLPN7?$KzjDmj7pZDrP0y3?-D zYTR}A(xR0iOV?EYnr9l^@xS7d-{~z^o`3H96%hBirzEI9YiIWEFaJFfiZB1#J4-*i zG;Z$Zr&jx??AN( -#include -#include - -/ { - keymap { - compatible = "zmk,keymap"; - - default_layer { -// ----------------------------------------------------------------------------------------- -// | TAB | Q | W | E | R | T | | Y | U | I | O | P | BKSP | -// | CTRL | A | S | D | F | G | | H | J | K | L | ; | ' | -// | SHFT | Z | X | C | V | B | | N | M | , | . | / | ESC | -// | GUI | LWR | SPC | | ENT | RSE | ALT | - bindings = < - &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC - &kp LCTRL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT - &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp ESC - &kp LGUI &mo 1 &kp SPACE &kp RET &mo 2 &kp RALT - >; - }; - lower_layer { -// ----------------------------------------------------------------------------------------- -// | TAB | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BKSP | -// | BTCLR| BT1 | BT2 | BT3 | BT4 | BT5 | | LFT | DWN | UP | RGT | | | -// | SHFT | | | | | | | | | | | | | -// | GUI | | SPC | | ENT | | ALT | - bindings = < - &kp TAB &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC - &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans - &kp LSHFT &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &kp LGUI &trans &kp SPACE &kp RET &trans &kp RALT - >; - }; - - raise_layer { -// ----------------------------------------------------------------------------------------- -// | TAB | ! | @ | # | $ | % | | ^ | & | * | ( | ) | BKSP | -// | CTRL | | | | | | | - | = | [ | ] | \ | ` | -// | SHFT | | | | | | | _ | + | { | } | "|" | ~ | -// | GUI | | SPC | | ENT | | ALT | - bindings = < - &kp TAB &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp ASTRK &kp LPAR &kp RPAR &kp BSPC - &kp LCTRL &trans &trans &trans &trans &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &kp GRAVE - &kp LSHFT &trans &trans &trans &trans &trans &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE - &kp LGUI &trans &kp SPACE &kp RET &trans &kp RALT - >; - }; - }; -}; diff --git a/zephyr/module.yml b/zephyr/module.yml new file mode 100644 index 0000000..1cc2b35 --- /dev/null +++ b/zephyr/module.yml @@ -0,0 +1,3 @@ +build: + settings: + board_root: .