jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-26 20:56:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Corrected HASP_USE_GPIO

Browse Source
This commit is contained in:
fvanroie 2021-02-23 20:41:28 +01:00
parent 1042076845
commit 6d2ac82452
3 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/hasp/hasp_dispatch.cpp
View File

@ -613,7 +613,7 @@ void dispatch_normalized_group_value(uint8_t groupid, uint16_t value, lv_obj_t*
{ {
if(groupid > 0) { if(groupid > 0) {
LOG_VERBOSE(TAG_MSGR, F("GROUP %d value %d"), groupid, value); LOG_VERBOSE(TAG_MSGR, F("GROUP %d value %d"), groupid, value);
#if USE_GPIO #if HASP_USE_GPIO > 0
gpio_set_normalized_group_value(groupid, value); gpio_set_normalized_group_value(groupid, value);
#endif #endif
// object_set_group_state(groupid, value, obj); // object_set_group_state(groupid, value, obj);
@ -652,15 +652,20 @@ void dispatch_parse_json(const char*, const char* payload)
uint8_t savedPage = haspGetPage(); uint8_t savedPage = haspGetPage();
hasp_new_object(json.as<JsonObject>(), savedPage); hasp_new_object(json.as<JsonObject>(), savedPage);
#ifdef ARDUINO
} else if(json.is<String>()) { // handle json as a single command
dispatch_text_line(json.as<String>().c_str());
#else
} else if(json.is<std::string>()) { // handle json as a single command
dispatch_text_line(json.as<std::string>().c_str());
#endif
} else if(json.is<const char*>()) { // handle json as a single command } else if(json.is<const char*>()) { // handle json as a single command
dispatch_text_line(json.as<const char*>()); dispatch_text_line(json.as<const char*>());
} else if(json.is<char*>()) { // handle json as a single command } else if(json.is<char*>()) { // handle json as a single command
dispatch_text_line(json.as<char*>()); dispatch_text_line(json.as<char*>());
// } else if(json.is<String>()) { // handle json as a single command
// dispatch_text_line(json.as<String>().c_str());
} else { } else {
LOG_WARNING(TAG_MSGR, F(D_DISPATCH_COMMAND_NOT_FOUND), payload); LOG_WARNING(TAG_MSGR, F(D_DISPATCH_COMMAND_NOT_FOUND), payload);
} }
@ -800,22 +805,32 @@ void dispatch_moodlight(const char* topic, const char* payload)
dispatch_json_error(TAG_MSGR, jsonError); dispatch_json_error(TAG_MSGR, jsonError);
} else { } else {
if(!json[F("state")].isNull()) moodlight.power = Utilities::is_true(json[F("state")].as<const char*>()); if(!json[F("state")].isNull())
moodlight.power = Utilities::is_true(json[F("state")].as<std::string>().c_str());
if(!json[F("r")].isNull()) moodlight.r = json[F("r")].as<uint8_t>(); if(!json[F("r")].isNull()) moodlight.r = json[F("r")].as<uint8_t>();
if(!json[F("g")].isNull()) moodlight.r = json[F("g")].as<uint8_t>(); if(!json[F("g")].isNull()) moodlight.r = json[F("g")].as<uint8_t>();
if(!json[F("b")].isNull()) moodlight.r = json[F("b")].as<uint8_t>(); if(!json[F("b")].isNull()) moodlight.r = json[F("b")].as<uint8_t>();
if(!json[F("color")].isNull()) { if(!json[F("color")].isNull()) {
lv_color32_t color; if(!json[F("color")]["r"].isNull()) {
if(Parser::haspPayloadToColor(json[F("color")].as<const char*>(), color)) { moodlight.r = json[F("color")]["r"].as<uint8_t>();
moodlight.r = color.ch.red;
moodlight.g = color.ch.green;
moodlight.b = color.ch.blue;
} }
if(!json[F("color")]["g"].isNull()) {
moodlight.g = json[F("color")]["g"].as<uint8_t>();
}
if(!json[F("color")]["b"].isNull()) {
moodlight.b = json[F("color")]["b"].as<uint8_t>();
}
// lv_color32_t color;
// if(Parser::haspPayloadToColor(json[F("color")].as<const char*>(), color)) {
// moodlight.r = color.ch.red;
// moodlight.g = color.ch.green;
// moodlight.b = color.ch.blue;
// }
} }
#ifdef USE_GPIO #if HASP_USE_GPIO > 0
if(moodlight.power) if(moodlight.power)
gpio_set_moodlight(moodlight.r, moodlight.g, moodlight.b); gpio_set_moodlight(moodlight.r, moodlight.g, moodlight.b);
else else
@ -828,8 +843,8 @@ void dispatch_moodlight(const char* topic, const char* payload)
char buffer[128]; char buffer[128];
snprintf_P( snprintf_P(
// buffer, sizeof(buffer), PSTR("{\"state\":\"%s\",\"color\":\"#%02x%02x%02x\",\"r\":%u,\"g\":%u,\"b\":%u}"), // buffer, sizeof(buffer), PSTR("{\"state\":\"%s\",\"color\":\"#%02x%02x%02x\",\"r\":%u,\"g\":%u,\"b\":%u}"),
buffer, sizeof(buffer), PSTR("{\"state\":\"%s\",\"color\":[%u,%u,%u]}"), moodlight.power ? "ON" : "OFF", buffer, sizeof(buffer), PSTR("{\"state\":\"%s\",\"color\":{\"r\":%u,\"g\":%u,\"b\":%u}}"),
moodlight.r, moodlight.g, moodlight.b); moodlight.power ? "ON" : "OFF", moodlight.r, moodlight.g, moodlight.b);
dispatch_state_msg(F("moodlight"), buffer); dispatch_state_msg(F("moodlight"), buffer);
} }

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

@ -460,7 +460,7 @@ bool gpioIsSystemPin(uint8_t gpio)
// Backlight GPIO // Backlight GPIO
// Network GPIOs // Network GPIOs
// Serial GPIOs // Serial GPIOs
// Tasmota Slave GPIOs // Tasmota Client GPIOs
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
if((gpio >= 6) && (gpio <= 11)) return true; // integrated SPI flash if((gpio >= 6) && (gpio <= 11)) return true; // integrated SPI flash

2
src/sys/svc/hasp_http.cpp
View File

@ -1344,7 +1344,7 @@ void webHandleHttpConfig()
#endif #endif
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
#if defined(HASP_USE_GPIO) && (HASP_USE_GPIO > 0) #if HASP_USE_GPIO > 0
void webHandleGpioConfig() void webHandleGpioConfig()
{ // http://plate01/config/gpio { // http://plate01/config/gpio
if(!httpIsAuthenticated(F("config/gpio"))) return; if(!httpIsAuthenticated(F("config/gpio"))) return;