jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 13:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch other pins in the same group

Browse Source
This commit is contained in:
fvanroie 2021-05-03 02:23:54 +02:00
parent c1a8d04da8
commit 5417f8d24a
4 changed files with 80 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hasp/hasp_dispatch.cpp
View File

@ -105,6 +105,16 @@ void dispatch_json_error(uint8_t tag, DeserializationError& jsonError)
LOG_ERROR(tag, F(D_JSON_FAILED " %s"), jsonError.c_str()); LOG_ERROR(tag, F(D_JSON_FAILED " %s"), jsonError.c_str());
} }
void dispatch_output_pin_value(uint8_t pin, uint16_t val)
{
char payload[32];
char topic[12];
snprintf_P(topic, sizeof(topic), PSTR("output%d"), pin);
snprintf_P(payload, sizeof(payload), PSTR("%d"), val);
dispatch_state_subtopic(topic, payload);
}
// p[x].b[y].attr=value // p[x].b[y].attr=value
static inline bool dispatch_parse_button_attribute(const char* topic_p, const char* payload) static inline bool dispatch_parse_button_attribute(const char* topic_p, const char* payload)
{ {
@ -169,9 +179,15 @@ static void dispatch_gpio(const char* topic, const char* payload)
val = atoi(payload); val = atoi(payload);
if(val == 0) val = Parser::is_true(payload); if(val == 0) val = Parser::is_true(payload);
gpio_set_value(pin, val); gpio_set_pin_value(pin, val);
} else { } else {
gpio_get_value(pin); uint16_t val;
if(gpio_get_value(pin, val)) {
dispatch_output_pin_value(pin, val);
} else {
LOG_WARNING(TAG_GPIO, F(D_BULLET "Pin %d is not configured"), pin);
}
} }
} else { } else {
LOG_WARNING(TAG_MSGR, F("Invalid pin %s"), topic); LOG_WARNING(TAG_MSGR, F("Invalid pin %s"), topic);
@ -185,7 +201,7 @@ void dispatch_command(const char* topic, const char* payload)
{ {
/* ================================= Standard payload commands ======================================= */ /* ================================= Standard payload commands ======================================= */
if(dispatch_parse_button_attribute(topic, payload)) return; // matched pxby.attr if(dispatch_parse_button_attribute(topic, payload)) return; // matched pxby.attr, first for speed
// check and execute commands from commands array // check and execute commands from commands array
for(int i = 0; i < nCommands; i++) { for(int i = 0; i < nCommands; i++) {

3
src/hasp/hasp_dispatch.h
View File

@ -62,8 +62,7 @@ void dispatch_calibrate(const char*, const char*);
void dispatch_wakeup(const char*, const char*); void dispatch_wakeup(const char*, const char*);
void dispatch_gpio_input_event(uint8_t pin, uint8_t group, uint8_t eventid); void dispatch_gpio_input_event(uint8_t pin, uint8_t group, uint8_t eventid);
void dispatch_output_pin_value(uint8_t pin, uint16_t val);
void dispatch_object_value_changed(lv_obj_t* obj, int16_t state);
void dispatch_normalized_group_value(uint8_t groupid, lv_obj_t* obj, int16_t val, int16_t min, int16_t max); void dispatch_normalized_group_value(uint8_t groupid, lv_obj_t* obj, int16_t val, int16_t min, int16_t max);

95
src/sys/gpio/hasp_gpio.cpp
View File

@ -328,36 +328,29 @@ void gpioLoop(void)
/* ********************************* State Setters *************************************** */ /* ********************************* State Setters *************************************** */
bool gpio_get_value(hasp_gpio_config_t gpio) bool gpio_get_value(uint8_t pin, uint16_t& val)
{
char payload[32];
char topic[12];
snprintf_P(topic, sizeof(topic), PSTR("output%d"), gpio.pin);
snprintf_P(payload, sizeof(payload), PSTR("%d"), gpio.val);
dispatch_state_subtopic(topic, payload);
return true;
}
bool gpio_get_value(uint8_t pin)
{ {
for(uint8_t i = 0; i < HASP_NUM_GPIO_CONFIG; i++) { for(uint8_t i = 0; i < HASP_NUM_GPIO_CONFIG; i++) {
if(gpioConfig[i].pin == pin && gpioConfigInUse(i)) return gpio_get_value(gpioConfig[i]); if(gpioConfig[i].pin == pin && gpioConfigInUse(i)) {
val = gpioConfig[i].val;
return true;
}
} }
LOG_WARNING(TAG_GPIO, F(D_BULLET "Pin %d is not configured"), pin);
return false; return false;
} }
bool gpio_set_value(hasp_gpio_config_t& gpio, int16_t val) static bool gpio_set_output_value(hasp_gpio_config_t* gpio, int32_t newval)
{ {
bool inverted = false; bool inverted = false;
uint16_t val = 0; // negative values will be zeroed
if(newval > 0) val = newval; // positive values are accepted
switch(gpio.type) { switch(gpio->type) {
case HASP_GPIO_RELAY_INVERTED: case HASP_GPIO_RELAY_INVERTED:
inverted = true; inverted = true;
case HASP_GPIO_RELAY: case HASP_GPIO_RELAY:
gpio.val = val > 0 ? HIGH : LOW; gpio->val = val > 0 ? HIGH : LOW;
digitalWrite(gpio.pin, inverted ? !gpio.val : gpio.val); digitalWrite(gpio->pin, inverted ? !gpio->val : gpio->val);
break; break;
case HASP_GPIO_LED_INVERTED: case HASP_GPIO_LED_INVERTED:
@ -369,34 +362,34 @@ bool gpio_set_value(hasp_gpio_config_t& gpio, int16_t val)
case HASP_GPIO_LED_R: case HASP_GPIO_LED_R:
case HASP_GPIO_LED_G: case HASP_GPIO_LED_G:
case HASP_GPIO_LED_B: case HASP_GPIO_LED_B:
gpio.val = val >= 255 ? 255 : val > 0 ? val : 0; gpio->val = val >= 255 ? 255 : val > 0 ? val : 0;
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
ledcWrite(gpio.group, gpio.val); // ledChannel and value ledcWrite(gpio->group, (gpio->val << 4) | (gpio->val >> 4)); // ledChannel and value
#else #else
analogWrite(gpio.pin, gpio.val); // 1023 analogWrite(gpio->pin, (gpio->val) << 2 | (gpio->val >> 6)); // 1023
#endif #endif
break; break;
case HASP_GPIO_PWM_INVERTED: case HASP_GPIO_PWM_INVERTED:
inverted = true; inverted = true;
case HASP_GPIO_PWM: case HASP_GPIO_PWM:
gpio.val = val >= 4095 ? 4095 : val > 0 ? val : 0; gpio->val = val >= 4095 ? 4095 : val > 0 ? val : 0;
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
ledcWrite(gpio.group, inverted ? 4095 - gpio.val : gpio.val); // ledChannel and value ledcWrite(gpio->group, inverted ? 4095 - gpio->val : gpio->val); // ledChannel and value
#else #else
analogWrite(gpio.pin, (inverted ? 4095 - gpio.val : gpio.val) >> 2); // 1023 analogWrite(gpio->pin, (inverted ? 4095 - gpio->val : gpio->val) >> 2); // 1023
#endif #endif
break; break;
case HASP_GPIO_SERIAL_DIMMER: { case HASP_GPIO_SERIAL_DIMMER: {
gpio.val = val >= 255 ? 255 : val > 0 ? val : 0; gpio->val = val >= 255 ? 255 : val > 0 ? val : 0;
char command[5] = "\xEF\x02\x00\xED"; char command[5] = "\xEF\x02\x00\xED";
/* if(gpio.val == 0) { /* if(gpio.val == 0) {
// command[2] = 0x20; // command[2] = 0x20;
Serial2.print("\xEF\x02\x20\xED"); Serial2.print("\xEF\x02\x20\xED");
} else */ } else */
{ {
command[2] = (uint8_t)map(gpio.val, 0, 255, 0, 100); command[2] = (uint8_t)map(gpio->val, 0, 255, 0, 100);
command[3] ^= command[2]; command[3] ^= command[2];
} }
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
@ -410,21 +403,49 @@ bool gpio_set_value(hasp_gpio_config_t& gpio, int16_t val)
default: default:
return false; return false;
} }
gpio_get_value(gpio);
LOG_VERBOSE(TAG_GPIO, F("Group %d - Pin %d = %d"), gpio.group, gpio.pin, gpio.val);
return true; return true;
} }
bool gpio_set_value(uint8_t pin, int16_t val) static inline void gpio_set_group_value(uint8_t group, int32_t val)
{
// Set all pins first, minimizes delays
for(uint8_t k = 0; k < HASP_NUM_GPIO_CONFIG; k++) {
hasp_gpio_config_t* gpio = &gpioConfig[k];
if(gpio->group == group && gpioConfigInUse(k)) gpio_set_output_value(gpio, val);
}
// Dispatch all values
for(uint8_t k = 0; k < HASP_NUM_GPIO_CONFIG; k++) {
if(gpioConfig[k].group == group && gpioConfigInUse(k))
dispatch_output_pin_value(gpioConfig[k].pin, gpioConfig[k].val);
}
}
bool gpio_set_pin_value(uint8_t pin, int32_t val)
{ {
for(uint8_t i = 0; i < HASP_NUM_GPIO_CONFIG; i++) { for(uint8_t i = 0; i < HASP_NUM_GPIO_CONFIG; i++) {
if(gpioConfig[i].pin == pin && gpioConfigInUse(i)) return gpio_set_value(gpioConfig[i], val); hasp_gpio_config_t* gpio = &gpioConfig[i];
if(gpio->pin == pin && gpioConfigInUse(i)) {
if(gpio->group) {
// Set all pins in the group
gpio_set_group_value(gpio->group, val);
} else {
// Set the single pin value
gpio_set_output_value(gpio, val);
dispatch_output_pin_value(gpio->pin, gpio->val);
}
LOG_VERBOSE(TAG_GPIO, F("Group %d - Pin %d = %d"), gpio->group, gpio->pin, gpio->val);
return true;
}
} }
LOG_WARNING(TAG_GPIO, F(D_BULLET "Pin %d is not configured"), pin); LOG_WARNING(TAG_GPIO, F(D_BULLET "Pin %d is not configured"), pin);
return false; return false;
} }
void gpio_set_normalized_value(hasp_gpio_config_t gpio, int16_t val, int16_t min, int16_t max) void gpio_set_normalized_value(hasp_gpio_config_t* gpio, int16_t val, int16_t min, int16_t max)
{ {
if(min == max) { if(min == max) {
LOG_ERROR(TAG_GPIO, F("Invalid value range")); LOG_ERROR(TAG_GPIO, F("Invalid value range"));
@ -432,7 +453,7 @@ void gpio_set_normalized_value(hasp_gpio_config_t gpio, int16_t val, int16_t min
} }
int16_t newval; int16_t newval;
switch(gpio.type) { switch(gpio->type) {
case HASP_GPIO_RELAY: case HASP_GPIO_RELAY:
case HASP_GPIO_RELAY_INVERTED: case HASP_GPIO_RELAY_INVERTED:
newval = val > min ? HIGH : LOW; newval = val > min ? HIGH : LOW;
@ -458,7 +479,7 @@ void gpio_set_normalized_value(hasp_gpio_config_t gpio, int16_t val, int16_t min
return; return;
} }
gpio_set_value(gpio, newval); gpio_set_output_value(gpio, newval);
} }
void gpio_set_normalized_group_value(uint8_t groupid, int16_t val, int16_t min, int16_t max) void gpio_set_normalized_group_value(uint8_t groupid, int16_t val, int16_t min, int16_t max)
@ -471,7 +492,7 @@ void gpio_set_normalized_group_value(uint8_t groupid, int16_t val, int16_t min,
// bool state = Parser::get_event_state(eventid); // bool state = Parser::get_event_state(eventid);
for(uint8_t i = 0; i < HASP_NUM_GPIO_CONFIG; i++) { for(uint8_t i = 0; i < HASP_NUM_GPIO_CONFIG; i++) {
if(gpioConfig[i].group == groupid) { if(gpioConfig[i].group == groupid) {
gpio_set_normalized_value(gpioConfig[i], val, min, max); gpio_set_normalized_value(&gpioConfig[i], val, min, max);
} }
} }
} }
@ -485,15 +506,15 @@ void gpio_set_moodlight(uint8_t r, uint8_t g, uint8_t b)
switch(gpioConfig[i].type) { switch(gpioConfig[i].type) {
case HASP_GPIO_LED_R: case HASP_GPIO_LED_R:
case HASP_GPIO_LED_R_INVERTED: case HASP_GPIO_LED_R_INVERTED:
gpio_set_normalized_value(gpioConfig[i], r, 0, 0xFF); gpio_set_normalized_value(&gpioConfig[i], r, 0, 0xFF);
break; break;
case HASP_GPIO_LED_G: case HASP_GPIO_LED_G:
case HASP_GPIO_LED_G_INVERTED: case HASP_GPIO_LED_G_INVERTED:
gpio_set_normalized_value(gpioConfig[i], g, 0, 0xFF); gpio_set_normalized_value(&gpioConfig[i], g, 0, 0xFF);
break; break;
case HASP_GPIO_LED_B: case HASP_GPIO_LED_B:
case HASP_GPIO_LED_B_INVERTED: case HASP_GPIO_LED_B_INVERTED:
gpio_set_normalized_value(gpioConfig[i], b, 0, 0xFF); gpio_set_normalized_value(&gpioConfig[i], b, 0, 0xFF);
break; break;
} }
} }

4
src/sys/gpio/hasp_gpio.h
View File

@ -27,8 +27,8 @@ void gpioEvery5Seconds(void);
// void gpio_set_group_onoff(uint8_t groupid, bool ison); // void gpio_set_group_onoff(uint8_t groupid, bool ison);
void gpio_set_normalized_group_value(uint8_t groupid, int16_t val, int16_t min, int16_t max); void gpio_set_normalized_group_value(uint8_t groupid, int16_t val, int16_t min, int16_t max);
// void gpio_set_gpio_state(uint8_t pin, uint16_t state); // void gpio_set_gpio_state(uint8_t pin, uint16_t state);
bool gpio_get_value(uint8_t pin); bool gpio_get_value(uint8_t pin, uint16_t& val);
bool gpio_set_value(uint8_t pin, int16_t val); bool gpio_set_pin_value(uint8_t pin, int32_t val);
void gpio_set_moodlight(uint8_t r, uint8_t g, uint8_t b); void gpio_set_moodlight(uint8_t r, uint8_t g, uint8_t b);
void gpio_discovery(JsonArray& relay, JsonArray& led); void gpio_discovery(JsonArray& relay, JsonArray& led);