zmkfirmware
/
zmk
mirror of https://github.com/zmkfirmware/zmk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't store ext power settings when ext power is controlled by rgb

This commit is contained in:
Jaap Versteegh 2025-12-15 14:47:08 +01:00
parent 118359c83e
commit c7ab8715de
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/ext_power_generic.c
View File

@ -29,12 +29,12 @@ struct ext_power_generic_config {
struct ext_power_generic_data { struct ext_power_generic_data {
bool status; bool status;
#if IS_ENABLED(CONFIG_SETTINGS) #if IS_ENABLED(CONFIG_SETTINGS) && !IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER)
bool settings_init; bool settings_init;
#endif #endif
}; };
#if IS_ENABLED(CONFIG_SETTINGS) #if IS_ENABLED(CONFIG_SETTINGS) && !IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER)
static void ext_power_save_state_work(struct k_work *work) { static void ext_power_save_state_work(struct k_work *work) {
char setting_path[40]; char setting_path[40];
const struct device *ext_power = DEVICE_DT_GET(DT_DRV_INST(0)); const struct device *ext_power = DEVICE_DT_GET(DT_DRV_INST(0));
@ -48,7 +48,7 @@ static struct k_work_delayable ext_power_save_work;
#endif #endif
int ext_power_save_state(void) { int ext_power_save_state(void) {
#if IS_ENABLED(CONFIG_SETTINGS) #if IS_ENABLED(CONFIG_SETTINGS) && !IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER)
int ret = k_work_reschedule(&ext_power_save_work, K_MSEC(CONFIG_ZMK_SETTINGS_SAVE_DEBOUNCE)); int ret = k_work_reschedule(&ext_power_save_work, K_MSEC(CONFIG_ZMK_SETTINGS_SAVE_DEBOUNCE));
return MIN(ret, 0); return MIN(ret, 0);
#else #else
@ -91,7 +91,7 @@ static int ext_power_generic_get(const struct device *dev) {
return data->status; return data->status;
} }
#if IS_ENABLED(CONFIG_SETTINGS) #if IS_ENABLED(CONFIG_SETTINGS) && !IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER)
static int ext_power_settings_set_status(const struct device *dev, size_t len, static int ext_power_settings_set_status(const struct device *dev, size_t len,
settings_read_cb read_cb, void *cb_arg) { settings_read_cb read_cb, void *cb_arg) {
struct ext_power_generic_data *data = dev->data; struct ext_power_generic_data *data = dev->data;
@ -158,7 +158,7 @@ static int ext_power_generic_init(const struct device *dev) {
} }
} }
#if IS_ENABLED(CONFIG_SETTINGS) #if IS_ENABLED(CONFIG_SETTINGS) && !IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER)
k_work_init_delayable(&ext_power_save_work, ext_power_save_state_work); k_work_init_delayable(&ext_power_save_work, ext_power_save_state_work);
#endif #endif
@ -197,7 +197,7 @@ static const struct ext_power_generic_config config = {
static struct ext_power_generic_data data = { static struct ext_power_generic_data data = {
.status = false, .status = false,
#if IS_ENABLED(CONFIG_SETTINGS) #if IS_ENABLED(CONFIG_SETTINGS) && !IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER)
.settings_init = false, .settings_init = false,
#endif #endif
}; };