diff --git a/app/boards/arm/corneish_zen/corneish_zen_v2_left.dts b/app/boards/arm/corneish_zen/corneish_zen_v2_left.dts index 2c624590..6347ee02 100644 --- a/app/boards/arm/corneish_zen/corneish_zen_v2_left.dts +++ b/app/boards/arm/corneish_zen/corneish_zen_v2_left.dts @@ -10,6 +10,7 @@ /{ chosen { zephyr,display = &epd; + zmk,battery = &vbatt; }; kscan0: kscan { @@ -42,10 +43,6 @@ }; }; - chosen { - zmk,battery = &vbatt; - }; - vbatt: vbatt { compatible = "zmk,battery-voltage-divider"; label = "BATTERY"; diff --git a/app/boards/arm/corneish_zen/corneish_zen_v2_left_defconfig b/app/boards/arm/corneish_zen/corneish_zen_v2_left_defconfig index 40d447e5..eb1e552a 100644 --- a/app/boards/arm/corneish_zen/corneish_zen_v2_left_defconfig +++ b/app/boards/arm/corneish_zen/corneish_zen_v2_left_defconfig @@ -39,8 +39,6 @@ CONFIG_ZMK_DISPLAY_WORK_QUEUE_DEDICATED=y CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=2048 CONFIG_SSD1306=n CONFIG_IL0323=y -CONFIG_LVGL_HOR_RES_MAX=80 -CONFIG_LVGL_VER_RES_MAX=128 CONFIG_LVGL_BITS_PER_PIXEL=1 CONFIG_LVGL_COLOR_DEPTH_1=y CONFIG_LVGL_DPI=145 diff --git a/app/boards/arm/corneish_zen/corneish_zen_v2_right.dts b/app/boards/arm/corneish_zen/corneish_zen_v2_right.dts index d037cf4e..9cb04273 100644 --- a/app/boards/arm/corneish_zen/corneish_zen_v2_right.dts +++ b/app/boards/arm/corneish_zen/corneish_zen_v2_right.dts @@ -10,6 +10,7 @@ /{ chosen { zephyr,display = &epd; + zmk,battery = &vbatt; }; kscan0: kscan { @@ -42,9 +43,6 @@ label = "Blue LED"; }; }; - chosen { - zmk,battery = &vbatt; - }; vbatt: vbatt { compatible = "zmk,battery-voltage-divider"; @@ -56,34 +54,12 @@ }; &default_transform { - col-offset = <6>; - }; + col-offset = <6>; +}; &five_column_transform { col-offset = <6>; }; - - -/* &i2c0 { - status = "ok"; - compatible = "nordic,nrf-twim"; - sda-pin = <16>; - scl-pin = <13>; - //clock-frequency = ; - clock-frequency = <100000>; - //gpios = <&gpio1 05 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; - - fuelgauge: bq274xx@55 { - compatible = "ti,bq274xx"; - label = "BATTERY"; - reg = <0x55>; - design-voltage = <3700>; //Battery Design Volatge in mV - design-capacity = <180>; //Battery Design Capacity in mAh - taper-current = <2>; //Battery Taper current in mAh 2.1 - terminate-voltage = <2750>; //Battery Terminate Voltage in mV - }; -}; */ - &spi0 { status = "okay"; compatible = "nordic,nrf-spim"; diff --git a/app/boards/arm/corneish_zen/corneish_zen_v2_right_defconfig b/app/boards/arm/corneish_zen/corneish_zen_v2_right_defconfig index 1d3e6159..46b40dee 100644 --- a/app/boards/arm/corneish_zen/corneish_zen_v2_right_defconfig +++ b/app/boards/arm/corneish_zen/corneish_zen_v2_right_defconfig @@ -39,8 +39,6 @@ CONFIG_ZMK_DISPLAY_WORK_QUEUE_DEDICATED=y CONFIG_ZMK_DISPLAY_DEDICATED_THREAD_STACK_SIZE=2048 CONFIG_SSD1306=n CONFIG_IL0323=y -CONFIG_LVGL_HOR_RES_MAX=80 -CONFIG_LVGL_VER_RES_MAX=128 CONFIG_LVGL_BITS_PER_PIXEL=1 CONFIG_LVGL_COLOR_DEPTH_1=y CONFIG_LVGL_DPI=145