From 8565de648085bd6d0e183c0e8cea5dd4f00b6acf Mon Sep 17 00:00:00 2001
From: honorless <86894501+lesshonor@users.noreply.github.com>
Date: Tue, 12 Nov 2024 23:34:29 -0500
Subject: [PATCH] refactor: rename and modularize
---
.gitignore | 3 +--
README.md | 2 +-
.../arm/eyelash_corne}/Kconfig.board | 8 ++++----
.../arm/eyelash_corne}/Kconfig.defconfig | 14 +++++++-------
.../arm/eyelash_corne}/board.cmake | 0
.../arm/eyelash_corne/eyelash_corne.dtsi | 4 ++--
.../arm/eyelash_corne/eyelash_corne.yaml | 6 +++---
boards/arm/eyelash_corne/eyelash_corne.zmk.yml | 17 +++++++++++++++++
.../arm/eyelash_corne/eyelash_corne_left.dts | 2 +-
.../eyelash_corne/eyelash_corne_left_defconfig | 3 +--
.../arm/eyelash_corne/eyelash_corne_right.dts | 2 +-
.../eyelash_corne/eyelash_corne_right_defconfig | 2 +-
build.yaml | 6 +++---
config/boards/arm/corne/corne.zmk.yml | 17 -----------------
config/{corne.conf => eyelash_corne.conf} | 0
config/{corne.json => eyelash_corne.json} | 4 ++--
config/{corne.keymap => eyelash_corne.keymap} | 0
config/west.yml | 3 +++
zephyr/module.yml | 3 +++
19 files changed, 50 insertions(+), 46 deletions(-)
rename {config/boards/arm/corne => boards/arm/eyelash_corne}/Kconfig.board (53%)
rename {config/boards/arm/corne => boards/arm/eyelash_corne}/Kconfig.defconfig (68%)
rename {config/boards/arm/corne => boards/arm/eyelash_corne}/board.cmake (100%)
rename config/boards/arm/corne/corne.dtsi => boards/arm/eyelash_corne/eyelash_corne.dtsi (98%)
rename config/boards/arm/corne/corne.yaml => boards/arm/eyelash_corne/eyelash_corne.yaml (63%)
create mode 100644 boards/arm/eyelash_corne/eyelash_corne.zmk.yml
rename config/boards/arm/corne/corne_left.dts => boards/arm/eyelash_corne/eyelash_corne_left.dts (80%)
rename config/boards/arm/corne/corne_left_defconfig => boards/arm/eyelash_corne/eyelash_corne_left_defconfig (93%)
rename config/boards/arm/corne/corne_right.dts => boards/arm/eyelash_corne/eyelash_corne_right.dts (81%)
rename config/boards/arm/corne/corne_right_defconfig => boards/arm/eyelash_corne/eyelash_corne_right_defconfig (94%)
delete mode 100644 config/boards/arm/corne/corne.zmk.yml
rename config/{corne.conf => eyelash_corne.conf} (100%)
rename config/{corne.json => eyelash_corne.json} (98%)
rename config/{corne.keymap => eyelash_corne.keymap} (100%)
create mode 100644 zephyr/module.yml
diff --git a/.gitignore b/.gitignore
index 36f5dd9..2a22fd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
build/
zmk/
-zephyr/
modules/
tools/
-.west/
\ No newline at end of file
+.west/
diff --git a/README.md b/README.md
index f8a2a64..77d175c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
if you need the 3D modle of this keyboard，you can connect me by Email。380465425@qq.com
-# zmk-config-corne
+# 睫毛外设店 (Eyelash Peripherals) Corne
diff --git a/config/boards/arm/corne/Kconfig.board b/boards/arm/eyelash_corne/Kconfig.board
similarity index 53%
rename from config/boards/arm/corne/Kconfig.board
rename to boards/arm/eyelash_corne/Kconfig.board
index ccdf020..27596f9 100644
--- a/config/boards/arm/corne/Kconfig.board
+++ b/boards/arm/eyelash_corne/Kconfig.board
@@ -3,10 +3,10 @@
# SPDX-License-Identifier: MIT
#
-config BOARD_CORNE_LEFT
- bool "corne left"
+config BOARD_EYELASH_CORNE_LEFT
+ bool "eyelash_corne left"
depends on SOC_NRF52840_QIAA
-config BOARD_CORNE_RIGHT
- bool "corne right"
+config BOARD_EYELASH_CORNE_RIGHT
+ bool "eyelash_corne right"
depends on SOC_NRF52840_QIAA
diff --git a/config/boards/arm/corne/Kconfig.defconfig b/boards/arm/eyelash_corne/Kconfig.defconfig
similarity index 68%
rename from config/boards/arm/corne/Kconfig.defconfig
rename to boards/arm/eyelash_corne/Kconfig.defconfig
index 00fa85c..c8f11bb 100644
--- a/config/boards/arm/corne/Kconfig.defconfig
+++ b/boards/arm/eyelash_corne/Kconfig.defconfig
@@ -3,20 +3,20 @@
# SPDX-License-Identifier: MIT
#
-if BOARD_CORNE_LEFT
+if BOARD_EYELASH_CORNE_LEFT
config ZMK_KEYBOARD_NAME
- default "Corne"
+ default "Eyelash Corne"
config ZMK_SPLIT_ROLE_CENTRAL
default y
-endif # BOARD_CORNE_LEFT
+endif # BOARD_EYELASH_CORNE_LEFT
-if BOARD_CORNE_LEFT || BOARD_CORNE_RIGHT
+if BOARD_EYELASH_CORNE_LEFT || BOARD_EYELASH_CORNE_RIGHT
config BOARD
- default "corne"
+ default "eyelash_corne"
config BOARD_ENABLE_DCDC
bool "Enable DCDC mode"
@@ -27,7 +27,7 @@ config BOARD_ENABLE_DCDC_HV
bool "Enable High Voltage DCDC converter"
default y
select SOC_DCDC_NRF52X_HV
- depends on (BOARD_CORNE_LEFT || BOARD_CORNE_RIGHT)
+ depends on (BOARD_EYELASH_CORNE_LEFT || BOARD_EYELASH_CORNE_RIGHT)
config ZMK_SLEEP
default y
@@ -58,4 +58,4 @@ config LED_PWM
endif # ZMK_BACKLIGHT
-endif # BOARD_CORNE_LEFT || BOARD_CORNE_RIGHT
+endif # BOARD_EYELASH_CORNE_LEFT || BOARD_EYELASH_CORNE_RIGHT
diff --git a/config/boards/arm/corne/board.cmake b/boards/arm/eyelash_corne/board.cmake
similarity index 100%
rename from config/boards/arm/corne/board.cmake
rename to boards/arm/eyelash_corne/board.cmake
diff --git a/config/boards/arm/corne/corne.dtsi b/boards/arm/eyelash_corne/eyelash_corne.dtsi
similarity index 98%
rename from config/boards/arm/corne/corne.dtsi
rename to boards/arm/eyelash_corne/eyelash_corne.dtsi
index 42d6aba..3d00e35 100644
--- a/config/boards/arm/corne/corne.dtsi
+++ b/boards/arm/eyelash_corne/eyelash_corne.dtsi
@@ -11,8 +11,8 @@
#include
/ {
- model = "corne";
- compatible = "corne";
+ model = "eyelash_corne";
+ compatible = "eyelashperipherals,eyelash_corne";
chosen {
zephyr,code-partition = &code_partition;
diff --git a/config/boards/arm/corne/corne.yaml b/boards/arm/eyelash_corne/eyelash_corne.yaml
similarity index 63%
rename from config/boards/arm/corne/corne.yaml
rename to boards/arm/eyelash_corne/eyelash_corne.yaml
index 65d6300..b28db79 100644
--- a/config/boards/arm/corne/corne.yaml
+++ b/boards/arm/eyelash_corne/eyelash_corne.yaml
@@ -1,6 +1,6 @@
-identifier: corne
-name: Solfe
-url: https://github.com/tokyo2006/zmk-config-corne
+identifier: eyelash_corne
+name: Eyelash Corne
+url: https://github.com/a741725193/zmk-new_corne
type: mcu
arch: arm
toolchain:
diff --git a/boards/arm/eyelash_corne/eyelash_corne.zmk.yml b/boards/arm/eyelash_corne/eyelash_corne.zmk.yml
new file mode 100644
index 0000000..962a4fa
--- /dev/null
+++ b/boards/arm/eyelash_corne/eyelash_corne.zmk.yml
@@ -0,0 +1,17 @@
+file_format: "1"
+id: eyelash_corne
+name: Eyelash Corne
+url: https://github.com/a741725193/zmk-new_corne
+type: board
+arch: arm
+features:
+ - keys
+ - display
+ - underglow
+ - encoder
+outputs:
+ - usb
+ - ble
+siblings:
+ - eyelash_corne_left
+ - eyelash_corne_right
diff --git a/config/boards/arm/corne/corne_left.dts b/boards/arm/eyelash_corne/eyelash_corne_left.dts
similarity index 80%
rename from config/boards/arm/corne/corne_left.dts
rename to boards/arm/eyelash_corne/eyelash_corne_left.dts
index 57a2506..e784b86 100644
--- a/config/boards/arm/corne/corne_left.dts
+++ b/boards/arm/eyelash_corne/eyelash_corne_left.dts
@@ -5,7 +5,7 @@
*
*/
-#include "corne.dtsi"
+#include "eyelash_corne.dtsi"
&left_encoder {
status = "okay";
diff --git a/config/boards/arm/corne/corne_left_defconfig b/boards/arm/eyelash_corne/eyelash_corne_left_defconfig
similarity index 93%
rename from config/boards/arm/corne/corne_left_defconfig
rename to boards/arm/eyelash_corne/eyelash_corne_left_defconfig
index 681c3a0..3a04fcb 100644
--- a/config/boards/arm/corne/corne_left_defconfig
+++ b/boards/arm/eyelash_corne/eyelash_corne_left_defconfig
@@ -5,8 +5,7 @@
CONFIG_SOC_SERIES_NRF52X=y
CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_CORNE_LEFT=y
-CONFIG_ZMK_SLEEP=y
+CONFIG_BOARD_EYELASH_CORNE_LEFT=y
# Enable 32kHz crystal
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
diff --git a/config/boards/arm/corne/corne_right.dts b/boards/arm/eyelash_corne/eyelash_corne_right.dts
similarity index 81%
rename from config/boards/arm/corne/corne_right.dts
rename to boards/arm/eyelash_corne/eyelash_corne_right.dts
index 744c7b4..b7b4db1 100644
--- a/config/boards/arm/corne/corne_right.dts
+++ b/boards/arm/eyelash_corne/eyelash_corne_right.dts
@@ -5,7 +5,7 @@
*
*/
-#include "corne.dtsi"
+#include "eyelash_corne.dtsi"
&default_transform {
col-offset = <7>;
diff --git a/config/boards/arm/corne/corne_right_defconfig b/boards/arm/eyelash_corne/eyelash_corne_right_defconfig
similarity index 94%
rename from config/boards/arm/corne/corne_right_defconfig
rename to boards/arm/eyelash_corne/eyelash_corne_right_defconfig
index 3840a18..11a9bea 100644
--- a/config/boards/arm/corne/corne_right_defconfig
+++ b/boards/arm/eyelash_corne/eyelash_corne_right_defconfig
@@ -5,7 +5,7 @@
CONFIG_SOC_SERIES_NRF52X=y
CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_CORNE_RIGHT=y
+CONFIG_BOARD_EYELASH_CORNE_RIGHT=y
# Enable 32kHz crystal
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y
diff --git a/build.yaml b/build.yaml
index fbde14d..95d4f4c 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1,11 +1,11 @@
---
include:
- - board: corne_left
+ - board: eyelash_corne_left
shield: nice_view
#snippet: zmk-usb-logging # Uncomment to log over USB.
- - board: corne_right
+ - board: eyelash_corne_right
shield: nice_view
#snippet: zmk-usb-logging
- - board: corne_left
+ - board: eyelash_corne_left
shield: settings_reset
#snippet: zmk-usb-logging
diff --git a/config/boards/arm/corne/corne.zmk.yml b/config/boards/arm/corne/corne.zmk.yml
deleted file mode 100644
index 562427d..0000000
--- a/config/boards/arm/corne/corne.zmk.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-file_format: "1"
-id: corne
-name: Sofle
-url: https://github.com/tokyo2006/zmk-config-corne
-type: board
-arch: arm
-features:
- - keys
- - display
- - underglow
- - encoder
-outputs:
- - usb
- - ble
-siblings:
- - corne_left
- - corne_right
diff --git a/config/corne.conf b/config/eyelash_corne.conf
similarity index 100%
rename from config/corne.conf
rename to config/eyelash_corne.conf
diff --git a/config/corne.json b/config/eyelash_corne.json
similarity index 98%
rename from config/corne.json
rename to config/eyelash_corne.json
index 583cc34..13fbf37 100644
--- a/config/corne.json
+++ b/config/eyelash_corne.json
@@ -1,6 +1,6 @@
{
- "id": "corne",
- "name": "Corne",
+ "id": "eyelash_corne",
+ "name": "Eyelash Corne",
"layouts": {
"default_layout": {
"name": "default_layout",
diff --git a/config/corne.keymap b/config/eyelash_corne.keymap
similarity index 100%
rename from config/corne.keymap
rename to config/eyelash_corne.keymap
diff --git a/config/west.yml b/config/west.yml
index d658e23..eeff179 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -7,6 +7,9 @@ manifest:
# - https://zmk.dev/docs/features/modules
# - https://docs.zephyrproject.org/3.5.0/develop/west/manifest.html#projects
projects:
+ - name: eyelash_corne
+ url: https://github.com/a741725193/zmk-new_corne
+ revision: main
- name: zmk
remote: zmkfirmware
revision: main
diff --git a/zephyr/module.yml b/zephyr/module.yml
new file mode 100644
index 0000000..165b623
--- /dev/null
+++ b/zephyr/module.yml
@@ -0,0 +1,3 @@
+build:
+ settings:
+ board_root: .