diff --git a/boards/shields/sof/Kconfig.shield b/boards/shields/sof/Kconfig.shield deleted file mode 100644 index 28509f0..0000000 --- a/boards/shields/sof/Kconfig.shield +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2020 Ryan Cross -# SPDX-License-Identifier: MIT - -config SHIELD_SOF_LEFT - def_bool $(shields_list_contains,sof_left) - -config SHIELD_SOF_RIGHT - def_bool $(shields_list_contains,sof_right) \ No newline at end of file diff --git a/boards/shields/sof/Kconfig.defconfig b/boards/shields/sofle/Kconfig.defconfig similarity index 85% rename from boards/shields/sof/Kconfig.defconfig rename to boards/shields/sofle/Kconfig.defconfig index 23e5438..4106eaf 100644 --- a/boards/shields/sof/Kconfig.defconfig +++ b/boards/shields/sofle/Kconfig.defconfig @@ -1,17 +1,17 @@ # Copyright (c) 2020 Ryan Cross # SPDX-License-Identifier: MIT -if SHIELD_SOF_LEFT +if SHIELD_SOFLE_LEFT config ZMK_KEYBOARD_NAME - default "SOF" + default "SOFLE" config ZMK_SPLIT_ROLE_CENTRAL default y endif -if SHIELD_SOF_LEFT || SHIELD_SOF_RIGHT +if SHIELD_SOFLE_LEFT || SHIELD_SOFLE_RIGHT config ZMK_SPLIT default y @@ -49,4 +49,4 @@ config WS2812_STRIP default y endif -endif \ No newline at end of file +endif diff --git a/boards/shields/sofle/Kconfig.shield b/boards/shields/sofle/Kconfig.shield new file mode 100644 index 0000000..a865e83 --- /dev/null +++ b/boards/shields/sofle/Kconfig.shield @@ -0,0 +1,8 @@ +# Copyright (c) 2020 Ryan Cross +# SPDX-License-Identifier: MIT + +config SHIELD_SOFLE_LEFT + def_bool $(shields_list_contains,sofle_left) + +config SHIELD_SOFLE_RIGHT + def_bool $(shields_list_contains,sofle_right) diff --git a/boards/shields/sof/sof_left.overlay b/boards/shields/sofle/sofle-left.overlay similarity index 94% rename from boards/shields/sof/sof_left.overlay rename to boards/shields/sofle/sofle-left.overlay index 292acb6..7cd791f 100644 --- a/boards/shields/sof/sof_left.overlay +++ b/boards/shields/sofle/sofle-left.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include "sof.dtsi" +#include "sofle.dtsi" &kscan0 { col-gpios @@ -19,4 +19,4 @@ &left_encoder { status = "okay"; -}; \ No newline at end of file +}; diff --git a/boards/shields/sof/sof_right.overlay b/boards/shields/sofle/sofle-right.overlay similarity index 94% rename from boards/shields/sof/sof_right.overlay rename to boards/shields/sofle/sofle-right.overlay index 98aced5..65e5f33 100644 --- a/boards/shields/sof/sof_right.overlay +++ b/boards/shields/sofle/sofle-right.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include "sof.dtsi" +#include "sofle.dtsi" &default_transform { col-offset = <6>; @@ -23,4 +23,4 @@ &right_encoder { status = "okay"; -}; \ No newline at end of file +}; diff --git a/boards/shields/sof/sof.dtsi b/boards/shields/sofle/sofle.dtsi similarity index 99% rename from boards/shields/sof/sof.dtsi rename to boards/shields/sofle/sofle.dtsi index f50c061..f88339d 100644 --- a/boards/shields/sof/sof.dtsi +++ b/boards/shields/sofle/sofle.dtsi @@ -85,4 +85,4 @@ RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7) inversion-on; prechargep = <0x22>; }; -}; \ No newline at end of file +}; diff --git a/boards/shields/sof/sof.zmk.yml b/boards/shields/sofle/sofle.zmk.yml similarity index 76% rename from boards/shields/sof/sof.zmk.yml rename to boards/shields/sofle/sofle.zmk.yml index 61f4bfc..d359530 100644 --- a/boards/shields/sof/sof.zmk.yml +++ b/boards/shields/sofle/sofle.zmk.yml @@ -1,6 +1,6 @@ file_format: "1" -id: sof -name: sof +id: sofle +name: sofle type: shield url: https://github.com/DLBPointon requires: [pro_micro] @@ -11,5 +11,5 @@ features: - encoder - underglow siblings: - - sof_left - - sof_right \ No newline at end of file + - sofle_left + - sofle_right diff --git a/boards/shields/sof/sof_right.config b/boards/shields/sofle/sofle_left.config similarity index 50% rename from boards/shields/sof/sof_right.config rename to boards/shields/sofle/sofle_left.config index 751b937..e813720 100644 --- a/boards/shields/sof/sof_right.config +++ b/boards/shields/sofle/sofle_left.config @@ -1,2 +1,2 @@ # Copyright (c) 2020 Ryan Cross -# SPDX-License-Identifier: MIT \ No newline at end of file +# SPDX-License-Identifier: MIT diff --git a/boards/shields/sof/sof_left.config b/boards/shields/sofle/sofle_right.config similarity index 50% rename from boards/shields/sof/sof_left.config rename to boards/shields/sofle/sofle_right.config index 751b937..e813720 100644 --- a/boards/shields/sof/sof_left.config +++ b/boards/shields/sofle/sofle_right.config @@ -1,2 +1,2 @@ # Copyright (c) 2020 Ryan Cross -# SPDX-License-Identifier: MIT \ No newline at end of file +# SPDX-License-Identifier: MIT diff --git a/config/sof.conf b/config/sof.conf deleted file mode 100644 index b76cc26..0000000 --- a/config/sof.conf +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) 2020 Ryan Cross -# SPDX-License-Identifier: MIT - -# Uncomment the following line to enable the Sof OLED Display -CONFIG_ZMK_DISPLAY=y - -# Uncomment these two lines to add support for encoders -CONFIG_EC11=y -CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y - -# Adding some widgets -CONFIG_ZMK_WIDGET_BATTERY_STATUS_SHOW_PERCENTAGE=y -CONFIG_ZMK_WIDGET_WPM_STATUS=y - -# Bluetooth configs -CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y -CONFIG_BT_CTLR_TX_PWR_PLUS_8=y - -# Uncomment this line below to add rgb underglow / backlight support -# CONFIG_ZMK_RGB_UNDERGLOW=y - -# Uncomment the line below to disable external power toggling by the underglow. -# By default toggling the underglow on and off also toggles external power -# on and off. This also causes the display to turn off. -# CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=n