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

feat(power): Support multiple ext_power GPIOS

This commit is contained in:
ReFil 2024-09-25 20:30:45 +01:00 committed by GitHub
parent 33e3b02ddb
commit 58dcf5c285
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/ext_power_generic.c
View File

@ -22,7 +22,8 @@
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
struct ext_power_generic_config { struct ext_power_generic_config {
const struct gpio_dt_spec control; const struct gpio_dt_spec *control;
const size_t control_gpios_count;
const uint16_t init_delay_ms; const uint16_t init_delay_ms;
}; };
@ -59,9 +60,12 @@ static int ext_power_generic_enable(const struct device *dev) {
struct ext_power_generic_data *data = dev->data; struct ext_power_generic_data *data = dev->data;
const struct ext_power_generic_config *config = dev->config; const struct ext_power_generic_config *config = dev->config;
if (gpio_pin_set_dt(&config->control, 1)) { for (int i = 0; i < config->control_gpios_count; i++) {
LOG_WRN("Failed to set ext-power control pin"); const struct gpio_dt_spec *gpio = &config->control[i];
return -EIO; if (gpio_pin_set_dt(gpio, 1)) {
LOG_WRN("Failed to set ext-power control pin %d", i);
return -EIO;
}
} }
data->status = true; data->status = true;
return ext_power_save_state(); return ext_power_save_state();
@ -71,10 +75,12 @@ static int ext_power_generic_disable(const struct device *dev) {
struct ext_power_generic_data *data = dev->data; struct ext_power_generic_data *data = dev->data;
const struct ext_power_generic_config *config = dev->config; const struct ext_power_generic_config *config = dev->config;
if (gpio_pin_set_dt(&config->control, 0)) { for (int i = 0; i < config->control_gpios_count; i++) {
LOG_WRN("Failed to set ext-power control pin"); const struct gpio_dt_spec *gpio = &config->control[i];
LOG_WRN("Failed to clear ext-power control pin"); if (gpio_pin_set_dt(gpio, 0)) {
return -EIO; LOG_WRN("Failed to clear ext-power control pin %d", i);
return -EIO;
}
} }
data->status = false; data->status = false;
return ext_power_save_state(); return ext_power_save_state();
@ -144,9 +150,12 @@ SETTINGS_STATIC_HANDLER_DEFINE(ext_power, "ext_power/state", NULL, ext_power_set
static int ext_power_generic_init(const struct device *dev) { static int ext_power_generic_init(const struct device *dev) {
const struct ext_power_generic_config *config = dev->config; const struct ext_power_generic_config *config = dev->config;
if (gpio_pin_configure_dt(&config->control, GPIO_OUTPUT_INACTIVE)) { for (int i = 0; i < config->control_gpios_count; i++) {
LOG_ERR("Failed to configure ext-power control pin"); const struct gpio_dt_spec *gpio = &config->control[i];
return -EIO; if (gpio_pin_configure_dt(gpio, GPIO_OUTPUT_INACTIVE)) {
LOG_ERR("Failed to configure ext-power control pin %d", i);
return -EIO;
}
} }
#if IS_ENABLED(CONFIG_SETTINGS) #if IS_ENABLED(CONFIG_SETTINGS)
@ -178,8 +187,12 @@ static int ext_power_generic_pm_action(const struct device *dev, enum pm_device_
} }
#endif /* CONFIG_PM_DEVICE */ #endif /* CONFIG_PM_DEVICE */
static const struct gpio_dt_spec ext_power_control_gpios[DT_INST_PROP_LEN(0, control_gpios)] = {
DT_INST_FOREACH_PROP_ELEM_SEP(0, control_gpios, GPIO_DT_SPEC_GET_BY_IDX, (, ))};
static const struct ext_power_generic_config config = { static const struct ext_power_generic_config config = {
.control = GPIO_DT_SPEC_INST_GET(0, control_gpios), .control = ext_power_control_gpios,
.control_gpios_count = DT_INST_PROP_LEN(0, control_gpios),
.init_delay_ms = DT_INST_PROP_OR(0, init_delay_ms, 0)}; .init_delay_ms = DT_INST_PROP_OR(0, init_delay_ms, 0)};
static struct ext_power_generic_data data = { static struct ext_power_generic_data data = {