1. local/github integration module 2. makefile redundancy eliminated

mctechnology17 · Aug 22, 2024 · 4651061 · 4651061
1 parent 95d732a
commit 4651061
Show file tree

Hide file tree

Showing 53 changed files with 155 additions and 334 deletions.
diff --git a/CHANGELOG.txt 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
diff --git 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 → boards/.DS_Store.gz b/config/boards/.DS_Store.gz → boards/.DS_Store.gz
diff --git a/config/boards/nice_nano.overlay → boards/nice_nano.overlay b/config/boards/nice_nano.overlay → boards/nice_nano.overlay
diff --git a/config/boards/nice_nano_v2.overlay → boards/nice_nano_v2.overlay b/config/boards/nice_nano_v2.overlay → boards/nice_nano_v2.overlay
diff --git a/config/boards/nrfmicro_11.overlay → boards/nrfmicro_11.overlay b/config/boards/nrfmicro_11.overlay → boards/nrfmicro_11.overlay
diff --git a/config/boards/nrfmicro_11_flipped.overlay → boards/nrfmicro_11_flipped.overlay b/config/boards/nrfmicro_11_flipped.overlay → boards/nrfmicro_11_flipped.overlay
diff --git a/config/boards/nrfmicro_13.overlay → boards/nrfmicro_13.overlay b/config/boards/nrfmicro_13.overlay → boards/nrfmicro_13.overlay
diff --git a/config/boards/puchi_ble_v1.overlay → boards/puchi_ble_v1.overlay b/config/boards/puchi_ble_v1.overlay → boards/puchi_ble_v1.overlay
diff --git a/...ig/boards/shields/corne/Kconfig.defconfig → boards/shields/corne/Kconfig.defconfig b/...ig/boards/shields/corne/Kconfig.defconfig → boards/shields/corne/Kconfig.defconfig
diff --git a/config/boards/shields/corne/Kconfig.shield → boards/shields/corne/Kconfig.shield b/config/boards/shields/corne/Kconfig.shield → boards/shields/corne/Kconfig.shield
diff --git a/...ds/shields/corne/boards/nice_nano.overlay → ...ds/shields/corne/boards/nice_nano.overlay b/...ds/shields/corne/boards/nice_nano.overlay → ...ds/shields/corne/boards/nice_nano.overlay
diff --git a/...shields/corne/boards/nice_nano_v2.overlay → ...shields/corne/boards/nice_nano_v2.overlay b/...shields/corne/boards/nice_nano_v2.overlay → ...shields/corne/boards/nice_nano_v2.overlay
diff --git a/config/boards/shields/corne/corne.conf → boards/shields/corne/corne.conf b/config/boards/shields/corne/corne.conf → boards/shields/corne/corne.conf
diff --git a/config/boards/shields/corne/corne.dtsi → boards/shields/corne/corne.dtsi b/config/boards/shields/corne/corne.dtsi → boards/shields/corne/corne.dtsi
diff --git a/boards/shields/corne/corne.keymap.zip b/boards/shields/corne/corne.keymap.zip
diff --git a/config/boards/shields/corne/corne.zmk.yml → boards/shields/corne/corne.zmk.yml b/config/boards/shields/corne/corne.zmk.yml → boards/shields/corne/corne.zmk.yml
diff --git a/...shields/corne/corne_dongle_pro_micro.conf → ...shields/corne/corne_dongle_pro_micro.conf b/...shields/corne/corne_dongle_pro_micro.conf → ...shields/corne/corne_dongle_pro_micro.conf
diff --git a/...elds/corne/corne_dongle_pro_micro.overlay → ...elds/corne/corne_dongle_pro_micro.overlay b/...elds/corne/corne_dongle_pro_micro.overlay → ...elds/corne/corne_dongle_pro_micro.overlay
diff --git a/...ards/shields/corne/corne_dongle_xiao.conf → boards/shields/corne/corne_dongle_xiao.conf b/...ards/shields/corne/corne_dongle_xiao.conf → boards/shields/corne/corne_dongle_xiao.conf
diff --git a/...s/shields/corne/corne_dongle_xiao.overlay → ...s/shields/corne/corne_dongle_xiao.overlay b/...s/shields/corne/corne_dongle_xiao.overlay → ...s/shields/corne/corne_dongle_xiao.overlay
diff --git a/config/boards/shields/corne/corne_left.conf → boards/shields/corne/corne_left.conf b/config/boards/shields/corne/corne_left.conf → boards/shields/corne/corne_left.conf
diff --git a/...g/boards/shields/corne/corne_left.overlay → boards/shields/corne/corne_left.overlay b/...g/boards/shields/corne/corne_left.overlay → boards/shields/corne/corne_left.overlay
diff --git a/.../shields/corne/corne_left_peripheral.conf → .../shields/corne/corne_left_peripheral.conf b/.../shields/corne/corne_left_peripheral.conf → .../shields/corne/corne_left_peripheral.conf
diff --git a/...ields/corne/corne_left_peripheral.overlay → ...ields/corne/corne_left_peripheral.overlay b/...ields/corne/corne_left_peripheral.overlay → ...ields/corne/corne_left_peripheral.overlay
diff --git a/config/boards/shields/corne/corne_right.conf → boards/shields/corne/corne_right.conf b/config/boards/shields/corne/corne_right.conf → boards/shields/corne/corne_right.conf
diff --git a/.../boards/shields/corne/corne_right.overlay → boards/shields/corne/corne_right.overlay b/.../boards/shields/corne/corne_right.overlay → boards/shields/corne/corne_right.overlay
diff --git a/...rds/shields/dongle_display/CMakeLists.txt → boards/shields/dongle_display/CMakeLists.txt b/...rds/shields/dongle_display/CMakeLists.txt → boards/shields/dongle_display/CMakeLists.txt
diff --git a/.../shields/dongle_display/Kconfig.defconfig → .../shields/dongle_display/Kconfig.defconfig b/.../shields/dongle_display/Kconfig.defconfig → .../shields/dongle_display/Kconfig.defconfig
diff --git a/...rds/shields/dongle_display/Kconfig.shield → boards/shields/dongle_display/Kconfig.shield b/...rds/shields/dongle_display/Kconfig.shield → boards/shields/dongle_display/Kconfig.shield
diff --git a/...lds/dongle_display/custom_status_screen.c → ...lds/dongle_display/custom_status_screen.c b/...lds/dongle_display/custom_status_screen.c → ...lds/dongle_display/custom_status_screen.c
diff --git a/...lds/dongle_display/custom_status_screen.h → ...lds/dongle_display/custom_status_screen.h b/...lds/dongle_display/custom_status_screen.h → ...lds/dongle_display/custom_status_screen.h
diff --git a/...hields/dongle_display/dongle_display.conf → ...hields/dongle_display/dongle_display.conf b/...hields/dongle_display/dongle_display.conf → ...hields/dongle_display/dongle_display.conf
diff --git a/...lds/dongle_display/dongle_display.overlay → ...lds/dongle_display/dongle_display.overlay b/...lds/dongle_display/dongle_display.overlay → ...lds/dongle_display/dongle_display.overlay
diff --git a/...lds/dongle_display/dongle_display.zmk.yml → ...lds/dongle_display/dongle_display.zmk.yml b/...lds/dongle_display/dongle_display.zmk.yml → ...lds/dongle_display/dongle_display.zmk.yml
diff --git a/...s/dongle_display/widgets/battery_status.c → ...s/dongle_display/widgets/battery_status.c b/...s/dongle_display/widgets/battery_status.c → ...s/dongle_display/widgets/battery_status.c
diff --git a/...s/dongle_display/widgets/battery_status.h → ...s/dongle_display/widgets/battery_status.h b/...s/dongle_display/widgets/battery_status.h → ...s/dongle_display/widgets/battery_status.h
diff --git a/...hields/dongle_display/widgets/bongo_cat.c → ...hields/dongle_display/widgets/bongo_cat.c b/...hields/dongle_display/widgets/bongo_cat.c → ...hields/dongle_display/widgets/bongo_cat.c
diff --git a/...hields/dongle_display/widgets/bongo_cat.h → ...hields/dongle_display/widgets/bongo_cat.h b/...hields/dongle_display/widgets/bongo_cat.h → ...hields/dongle_display/widgets/bongo_cat.h
diff --git a/...dongle_display/widgets/bongo_cat_images.c → ...dongle_display/widgets/bongo_cat_images.c b/...dongle_display/widgets/bongo_cat_images.c → ...dongle_display/widgets/bongo_cat_images.c
diff --git a/...s/dongle_display/widgets/hid_indicators.c → ...s/dongle_display/widgets/hid_indicators.c b/...s/dongle_display/widgets/hid_indicators.c → ...s/dongle_display/widgets/hid_indicators.c
diff --git a/...s/dongle_display/widgets/hid_indicators.h → ...s/dongle_display/widgets/hid_indicators.h b/...s/dongle_display/widgets/hid_indicators.h → ...s/dongle_display/widgets/hid_indicators.h
diff --git a/...lds/dongle_display/widgets/layer_status.c → ...lds/dongle_display/widgets/layer_status.c b/...lds/dongle_display/widgets/layer_status.c → ...lds/dongle_display/widgets/layer_status.c
diff --git a/...lds/dongle_display/widgets/layer_status.h → ...lds/dongle_display/widgets/layer_status.h b/...lds/dongle_display/widgets/layer_status.h → ...lds/dongle_display/widgets/layer_status.h
diff --git a/...hields/dongle_display/widgets/modifiers.c → ...hields/dongle_display/widgets/modifiers.c b/...hields/dongle_display/widgets/modifiers.c → ...hields/dongle_display/widgets/modifiers.c
diff --git a/...hields/dongle_display/widgets/modifiers.h → ...hields/dongle_display/widgets/modifiers.h b/...hields/dongle_display/widgets/modifiers.h → ...hields/dongle_display/widgets/modifiers.h
diff --git a/...ds/dongle_display/widgets/modifiers_sym.c → ...ds/dongle_display/widgets/modifiers_sym.c b/...ds/dongle_display/widgets/modifiers_sym.c → ...ds/dongle_display/widgets/modifiers_sym.c
diff --git a/...ds/dongle_display/widgets/output_status.c → ...ds/dongle_display/widgets/output_status.c b/...ds/dongle_display/widgets/output_status.c → ...ds/dongle_display/widgets/output_status.c
diff --git a/...ds/dongle_display/widgets/output_status.h → ...ds/dongle_display/widgets/output_status.h b/...ds/dongle_display/widgets/output_status.h → ...ds/dongle_display/widgets/output_status.h
diff --git a/...ongle_display/widgets/output_status_sym.c → ...ongle_display/widgets/output_status_sym.c b/...ongle_display/widgets/output_status_sym.c → ...ongle_display/widgets/output_status_sym.c
diff --git a/config/boards/shields/corne/corne.keymap b/config/boards/shields/corne/corne.keymap
diff --git a/zephyr/module.yml b/zephyr/module.yml
@@ -0,0 +1,3 @@
+build:
+  settings:
+    board_root: .