refactor: rename and modularize

This commit is contained in:
honorless 2024-11-12 23:34:29 -05:00
parent d6b2ce7e6a
commit 8565de6480
No known key found for this signature in database
GPG Key ID: 1B48A311ABE8DA4D
19 changed files with 50 additions and 46 deletions

1
.gitignore vendored
View File

@ -1,6 +1,5 @@
build/ build/
zmk/ zmk/
zephyr/
modules/ modules/
tools/ tools/
.west/ .west/

View File

@ -1,5 +1,5 @@
if you need the 3D modle of this keyboardyou can connect me by Email。380465425@qq.com if you need the 3D modle of this keyboardyou can connect me by Email。380465425@qq.com
# zmk-config-corne # 睫毛外设店 (Eyelash Peripherals) Corne
<img src="keymap-drawer/corne.svg" > <img src="keymap-drawer/corne.svg" >

View File

@ -3,10 +3,10 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# #
config BOARD_CORNE_LEFT config BOARD_EYELASH_CORNE_LEFT
bool "corne left" bool "eyelash_corne left"
depends on SOC_NRF52840_QIAA depends on SOC_NRF52840_QIAA
config BOARD_CORNE_RIGHT config BOARD_EYELASH_CORNE_RIGHT
bool "corne right" bool "eyelash_corne right"
depends on SOC_NRF52840_QIAA depends on SOC_NRF52840_QIAA

View File

@ -3,20 +3,20 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# #
if BOARD_CORNE_LEFT if BOARD_EYELASH_CORNE_LEFT
config ZMK_KEYBOARD_NAME config ZMK_KEYBOARD_NAME
default "Corne" default "Eyelash Corne"
config ZMK_SPLIT_ROLE_CENTRAL config ZMK_SPLIT_ROLE_CENTRAL
default y 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 config BOARD
default "corne" default "eyelash_corne"
config BOARD_ENABLE_DCDC config BOARD_ENABLE_DCDC
bool "Enable DCDC mode" bool "Enable DCDC mode"
@ -27,7 +27,7 @@ config BOARD_ENABLE_DCDC_HV
bool "Enable High Voltage DCDC converter" bool "Enable High Voltage DCDC converter"
default y default y
select SOC_DCDC_NRF52X_HV 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 config ZMK_SLEEP
default y default y
@ -58,4 +58,4 @@ config LED_PWM
endif # ZMK_BACKLIGHT endif # ZMK_BACKLIGHT
endif # BOARD_CORNE_LEFT || BOARD_CORNE_RIGHT endif # BOARD_EYELASH_CORNE_LEFT || BOARD_EYELASH_CORNE_RIGHT

View File

@ -11,8 +11,8 @@
#include <dt-bindings/zmk/matrix_transform.h> #include <dt-bindings/zmk/matrix_transform.h>
/ { / {
model = "corne"; model = "eyelash_corne";
compatible = "corne"; compatible = "eyelashperipherals,eyelash_corne";
chosen { chosen {
zephyr,code-partition = &code_partition; zephyr,code-partition = &code_partition;

View File

@ -1,6 +1,6 @@
identifier: corne identifier: eyelash_corne
name: Solfe name: Eyelash Corne
url: https://github.com/tokyo2006/zmk-config-corne url: https://github.com/a741725193/zmk-new_corne
type: mcu type: mcu
arch: arm arch: arm
toolchain: toolchain:

View File

@ -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

View File

@ -5,7 +5,7 @@
* *
*/ */
#include "corne.dtsi" #include "eyelash_corne.dtsi"
&left_encoder { &left_encoder {
status = "okay"; status = "okay";

View File

@ -5,8 +5,7 @@
CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_SERIES_NRF52X=y
CONFIG_SOC_NRF52840_QIAA=y CONFIG_SOC_NRF52840_QIAA=y
CONFIG_BOARD_CORNE_LEFT=y CONFIG_BOARD_EYELASH_CORNE_LEFT=y
CONFIG_ZMK_SLEEP=y
# Enable 32kHz crystal # Enable 32kHz crystal
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y

View File

@ -5,7 +5,7 @@
* *
*/ */
#include "corne.dtsi" #include "eyelash_corne.dtsi"
&default_transform { &default_transform {
col-offset = <7>; col-offset = <7>;

View File

@ -5,7 +5,7 @@
CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_SERIES_NRF52X=y
CONFIG_SOC_NRF52840_QIAA=y CONFIG_SOC_NRF52840_QIAA=y
CONFIG_BOARD_CORNE_RIGHT=y CONFIG_BOARD_EYELASH_CORNE_RIGHT=y
# Enable 32kHz crystal # Enable 32kHz crystal
CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y CONFIG_CLOCK_CONTROL_NRF_K32SRC_XTAL=y

View File

@ -1,11 +1,11 @@
--- ---
include: include:
- board: corne_left - board: eyelash_corne_left
shield: nice_view shield: nice_view
#snippet: zmk-usb-logging # Uncomment to log over USB. #snippet: zmk-usb-logging # Uncomment to log over USB.
- board: corne_right - board: eyelash_corne_right
shield: nice_view shield: nice_view
#snippet: zmk-usb-logging #snippet: zmk-usb-logging
- board: corne_left - board: eyelash_corne_left
shield: settings_reset shield: settings_reset
#snippet: zmk-usb-logging #snippet: zmk-usb-logging

View File

@ -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

View File

@ -1,6 +1,6 @@
{ {
"id": "corne", "id": "eyelash_corne",
"name": "Corne", "name": "Eyelash Corne",
"layouts": { "layouts": {
"default_layout": { "default_layout": {
"name": "default_layout", "name": "default_layout",

View File

@ -7,6 +7,9 @@ manifest:
# - https://zmk.dev/docs/features/modules # - https://zmk.dev/docs/features/modules
# - https://docs.zephyrproject.org/3.5.0/develop/west/manifest.html#projects # - https://docs.zephyrproject.org/3.5.0/develop/west/manifest.html#projects
projects: projects:
- name: eyelash_corne
url: https://github.com/a741725193/zmk-new_corne
revision: main
- name: zmk - name: zmk
remote: zmkfirmware remote: zmkfirmware
revision: main revision: main

3
zephyr/module.yml Normal file
View File

@ -0,0 +1,3 @@
build:
settings:
board_root: .