kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

working update

Browse source
This commit is contained in:
Darryldh 2022-07-23 08:12:19 -04:00
parent 9c33c3be14
commit 0007450a2e
4 changed files with 47 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/boards/arm/corne-ish_zen/CMakeLists.txt
View file

@ -53,7 +53,7 @@ endif()
zephyr_library_include_directories(${ZEPHYR_LVGL_MODULE_DIR}) zephyr_library_include_directories(${ZEPHYR_LVGL_MODULE_DIR})
zephyr_library_include_directories(${ZEPHYR_BASE}/lib/gui/lvgl/) zephyr_library_include_directories(${ZEPHYR_BASE}/lib/gui/lvgl/)
zephyr_library_sources_ifdef(CONFIG_ZMK_DISPLAY custom_status_screen.c) #zephyr_library_sources_ifdef(CONFIG_ZMK_DISPLAY custom_status_screen.c)
zephyr_library_sources(${ZEPHYR_BASE}/misc/empty_file.c) zephyr_library_sources(${ZEPHYR_BASE}/misc/empty_file.c)
zephyr_library_include_directories(${CMAKE_SOURCE_DIR}/include) zephyr_library_include_directories(${CMAKE_SOURCE_DIR}/include)
zephyr_library_include_directories(${ZEPHYR_BASE}/drivers) zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)

18
app/boards/arm/corne-ish_zen/Kconfig.defconfig
View file

@ -77,9 +77,9 @@ config ZMK_DISPLAY
select LVGL_USE_LABEL select LVGL_USE_LABEL
select LVGL_USE_IMG select LVGL_USE_IMG
choice ZMK_DISPLAY_STATUS_SCREEN #choice ZMK_DISPLAY_STATUS_SCREEN
default ZMK_DISPLAY_STATUS_SCREEN_CUSTOM # default ZMK_DISPLAY_STATUS_SCREEN_CUSTOM
endchoice #endchoice
if ZMK_DISPLAY if ZMK_DISPLAY
@ -101,14 +101,14 @@ config LVGL_DISPLAY_DEV_NAME
endif # ZMK_DISPLAY endif # ZMK_DISPLAY
menuconfig CUSTOM_WIDGET_BATTERY_STATUS #menuconfig CUSTOM_WIDGET_BATTERY_STATUS
bool "custom battery status widget" # bool "custom battery status widget"
menuconfig CUSTOM_WIDGET_OUTPUT_STATUS #menuconfig CUSTOM_WIDGET_OUTPUT_STATUS
bool "custom output status widget" # bool "custom output status widget"
menuconfig CUSTOM_WIDGET_LAYER_STATUS #menuconfig CUSTOM_WIDGET_LAYER_STATUS
bool "custom layer status widget" # bool "custom layer status widget"
# config CORNE_ISH_ZEN_20 # config CORNE_ISH_ZEN_20
# bool # bool

14
app/boards/arm/corne-ish_zen/corne-ish_zen_v2_right.dts
View file

@ -41,7 +41,17 @@
label = "Blue LED"; label = "Blue LED";
}; };
}; };
chosen {
zmk,battery = &vbatt;
};
vbatt: vbatt {
compatible = "zmk,battery-voltage-divider";
label = "BATTERY";
io-channels = <&adc 0>;
output-ohms = <1960000>;
full-ohms = <(1960000 + 810000)>;
};
}; };
&default_transform { &default_transform {
@ -51,6 +61,8 @@
col-offset = <6>; col-offset = <6>;
}; };
/* &i2c0 { /* &i2c0 {
status = "ok"; status = "ok";
compatible = "nordic,nrf-twim"; compatible = "nordic,nrf-twim";
@ -71,7 +83,7 @@
}; };
}; */ }; */
&spi2 { &spi0 {
status = "okay"; status = "okay";
compatible = "nordic,nrf-spim"; compatible = "nordic,nrf-spim";
sck-pin = <20>; sck-pin = <20>;

45
app/boards/arm/corne-ish_zen/corne-ish_zen_v2_right_defconfig
View file

@ -18,13 +18,13 @@ CONFIG_ARM_MPU=y
CONFIG_GPIO=y CONFIG_GPIO=y
# Enable I2C # Enable I2C
CONFIG_I2C=y #CONFIG_I2C=y
CONFIG_I2C_NRFX=y #CONFIG_I2C_NRFX=y
CONFIG_I2C_0=y #CONFIG_I2C_0=y
# Enable SPI # Enable SPI
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_SPI_2=y #CONFIG_SPI_2=y
CONFIG_SPI_NRFX=y CONFIG_SPI_NRFX=y
# Enable writing to flash # Enable writing to flash
@ -65,32 +65,35 @@ CONFIG_LVGL_THEME_DEFAULT_FONT_SMALL_MONTSERRAT_16=y
CONFIG_LVGL_THEME_DEFAULT_FONT_NORMAL_MONTSERRAT_26=y CONFIG_LVGL_THEME_DEFAULT_FONT_NORMAL_MONTSERRAT_26=y
# custom status screens # custom status screens
CONFIG_ZMK_DISPLAY_STATUS_SCREEN_CUSTOM=y #CONFIG_ZMK_DISPLAY_STATUS_SCREEN_CUSTOM=y
CONFIG_CUSTOM_WIDGET_BATTERY_STATUS=y CONFIG_ZMK_DISPLAY_STATUS_SCREEN_BUILT_IN=y
CONFIG_ZMK_WIDGET_BATTERY_STATUS=n #CONFIG_CUSTOM_WIDGET_BATTERY_STATUS=y
CONFIG_CUSTOM_WIDGET_OUTPUT_STATUS=y #CONFIG_ZMK_WIDGET_BATTERY_STATUS=y
CONFIG_ZMK_WIDGET_OUTPUT_STATUS=n #CONFIG_CUSTOM_WIDGET_OUTPUT_STATUS=y
#CONFIG_ZMK_WIDGET_OUTPUT_STATUS=y
#CONFIG_CUSTOM_WIDGET_LAYER_STATUS=y
#CONFIG_ZMK_WIDGET_LAYER_STATUS=y
# Turn on logging, and set ZMK logging to debug output # Turn on logging, and set ZMK logging to debug output
#CONFIG_LOG=y CONFIG_LOG=y
#CONFIG_ZMK_USB_LOGGING=y CONFIG_ZMK_USB_LOGGING=y
#CONFIG_ZMK_LOG_LEVEL_DBG=y CONFIG_ZMK_LOG_LEVEL_DBG=y
#CONFIG_LOG_BUFFER_SIZE=10000 CONFIG_LOG_BUFFER_SIZE=10000
#CONFIG_LOG_STRDUP_BUF_COUNT=60 CONFIG_LOG_STRDUP_BUF_COUNT=60
#CONFIG_I2C_LOG_LEVEL_DBG=y #CONFIG_I2C_LOG_LEVEL_DBG=y
#CONFIG_SPI_LOG_LEVEL_DBG=y #CONFIG_SPI_LOG_LEVEL_DBG=y
#CONFIG_DISPLAY_LOG_LEVEL_DBG=y CONFIG_DISPLAY_LOG_LEVEL_DBG=y
#CONFIG_LVGL_LOG_LEVEL_DBG=y #CONFIG_LVGL_LOG_LEVEL_DBG=y
#CONFIG_LVGL_USE_DEBUG=y #CONFIG_LVGL_USE_DEBUG=y
#CONFIG_SENSOR_LOG_LEVEL_DBG=y CONFIG_SENSOR_LOG_LEVEL_DBG=y
# Turn on USB CDC ACM device # Turn on USB CDC ACM device
CONFIG_USB=y CONFIG_ZMK_USB=y
CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_CDC_ACM=y CONFIG_USB_CDC_ACM=y
CONFIG_USB_CDC_ACM_RINGBUF_SIZE=1024 CONFIG_USB_CDC_ACM_RINGBUF_SIZE=1024
CONFIG_USB_CDC_ACM_DEVICE_NAME="CDC_ACM" #CONFIG_USB_CDC_ACM_DEVICE_NAME="CDC_ACM"
CONFIG_USB_CDC_ACM_DEVICE_COUNT=1 #CONFIG_USB_CDC_ACM_DEVICE_COUNT=1
# Enable serial console # Enable serial console
CONFIG_SERIAL=y CONFIG_SERIAL=y
@ -100,5 +103,5 @@ CONFIG_UART_LINE_CTRL=y
# Enable USB UART, and set the console device # Enable USB UART, and set the console device
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_USB_UART_CONSOLE=y #CONFIG_USB_UART_CONSOLE=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0" #CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"