aaribaud/ESPSomfy-RTS
0
0
Fork 0
mirror of https://github.com/rstrouse/ESPSomfy-RTS.git synced 2026-04-20 11:02:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup build warnings

Browse source
This commit is contained in:
cjkas 2026-03-24 22:15:17 +01:00
parent 84e713d1b2
commit 2e379e6c1e
3 changed files with 177 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

156
src/Somfy.cpp
View file

@ -3105,7 +3105,7 @@ bool SomfyShade::usesPin(uint8_t pin) {
int8_t SomfyShade::validateJSON(JsonObject &obj) {
int8_t ret = 0;
shade_types type = this->shadeType;
if(obj.containsKey("shadeType")) {
if(!obj["shadeType"].isNull()) {
if(obj["shadeType"].is<const char *>()) {
if(strncmp(obj["shadeType"].as<const char *>(), "roller", 7) == 0)
type = shade_types::roller;
@ -3134,14 +3134,14 @@ int8_t SomfyShade::validateJSON(JsonObject &obj) {
this->shadeType = static_cast<shade_types>(obj["shadeType"].as<uint8_t>());
}
}
if(obj.containsKey("proto")) {
if(!obj["proto"].isNull()) {
radio_proto proto = this->proto;
if(proto == radio_proto::GP_Relay || proto == radio_proto::GP_Remote) {
// Check to see if we are using the up and or down
// GPIOs anywhere else.
uint8_t upPin = obj.containsKey("gpioUp") ? obj["gpioUp"].as<uint8_t>() : this->gpioUp;
uint8_t downPin = obj.containsKey("gpioDown") ? obj["gpioDown"].as<uint8_t>() : this->gpioDown;
uint8_t myPin = obj.containsKey("gpioMy") ? obj["gpioMy"].as<uint8_t>() : this->gpioMy;
uint8_t upPin = !obj["gpioUp"].isNull() ? obj["gpioUp"].as<uint8_t>() : this->gpioUp;
uint8_t downPin = !obj["gpioDown"].isNull() ? obj["gpioDown"].as<uint8_t>() : this->gpioDown;
uint8_t myPin = !obj["gpioMy"].isNull() ? obj["gpioMy"].as<uint8_t>() : this->gpioMy;
if(type == shade_types::drycontact ||
((type == shade_types::garage1 || type == shade_types::lgate1 || type == shade_types::cgate1 || type == shade_types::rgate1)
&& proto == radio_proto::GP_Remote)) upPin = myPin = 255;
@ -3178,28 +3178,28 @@ int8_t SomfyShade::validateJSON(JsonObject &obj) {
int8_t SomfyShade::fromJSON(JsonObject &obj) {
int8_t err = this->validateJSON(obj);
if(err == 0) {
if(obj.containsKey("name")) strlcpy(this->name, obj["name"], sizeof(this->name));
if(obj.containsKey("roomId")) this->roomId = obj["roomId"];
if(obj.containsKey("upTime")) this->upTime = obj["upTime"];
if(obj.containsKey("downTime")) this->downTime = obj["downTime"];
if(obj.containsKey("remoteAddress")) this->setRemoteAddress(obj["remoteAddress"]);
if(obj.containsKey("tiltTime")) this->tiltTime = obj["tiltTime"];
if(obj.containsKey("stepSize")) this->stepSize = obj["stepSize"];
if(obj.containsKey("hasTilt")) this->tiltType = static_cast<bool>(obj["hasTilt"]) ? tilt_types::none : tilt_types::tiltmotor;
if(obj.containsKey("bitLength")) this->bitLength = obj["bitLength"];
if(obj.containsKey("proto")) this->proto = static_cast<radio_proto>(obj["proto"].as<uint8_t>());
if(obj.containsKey("sunSensor")) this->setSunSensor(obj["sunSensor"]);
if(obj.containsKey("simMy")) this->setSimMy(obj["simMy"]);
if(obj.containsKey("light")) this->setLight(obj["light"]);
if(obj.containsKey("gpioFlags")) this->gpioFlags = obj["gpioFlags"];
if(obj.containsKey("gpioLLTrigger")) {
if(!obj["name"].isNull()) strlcpy(this->name, obj["name"], sizeof(this->name));
if(!obj["roomId"].isNull()) this->roomId = obj["roomId"];
if(!obj["upTime"].isNull()) this->upTime = obj["upTime"];
if(!obj["downTime"].isNull()) this->downTime = obj["downTime"];
if(!obj["remoteAddress"].isNull()) this->setRemoteAddress(obj["remoteAddress"]);
if(!obj["tiltTime"].isNull()) this->tiltTime = obj["tiltTime"];
if(!obj["stepSize"].isNull()) this->stepSize = obj["stepSize"];
if(!obj["hasTilt"].isNull()) this->tiltType = static_cast<bool>(obj["hasTilt"]) ? tilt_types::none : tilt_types::tiltmotor;
if(!obj["bitLength"].isNull()) this->bitLength = obj["bitLength"];
if(!obj["proto"].isNull()) this->proto = static_cast<radio_proto>(obj["proto"].as<uint8_t>());
if(!obj["sunSensor"].isNull()) this->setSunSensor(obj["sunSensor"]);
if(!obj["simMy"].isNull()) this->setSimMy(obj["simMy"]);
if(!obj["light"].isNull()) this->setLight(obj["light"]);
if(!obj["gpioFlags"].isNull()) this->gpioFlags = obj["gpioFlags"];
if(!obj["gpioLLTrigger"].isNull()) {
if(obj["gpioLLTrigger"].as<bool>())
this->gpioFlags |= (uint8_t)gpio_flags_t::LowLevelTrigger;
else
this->gpioFlags &= ~(uint8_t)gpio_flags_t::LowLevelTrigger;
}
if(obj.containsKey("shadeType")) {
if(!obj["shadeType"].isNull()) {
if(obj["shadeType"].is<const char *>()) {
if(strncmp(obj["shadeType"].as<const char *>(), "roller", 7) == 0)
this->shadeType = shade_types::roller;
@ -3228,10 +3228,10 @@ int8_t SomfyShade::fromJSON(JsonObject &obj) {
this->shadeType = static_cast<shade_types>(obj["shadeType"].as<uint8_t>());
}
}
if(obj.containsKey("flipCommands")) this->flipCommands = obj["flipCommands"].as<bool>();
if(obj.containsKey("flipPosition")) this->flipPosition = obj["flipPosition"].as<bool>();
if(obj.containsKey("repeats")) this->repeats = obj["repeats"];
if(obj.containsKey("tiltType")) {
if(!obj["flipCommands"].isNull()) this->flipCommands = obj["flipCommands"].as<bool>();
if(!obj["flipPosition"].isNull()) this->flipPosition = obj["flipPosition"].as<bool>();
if(!obj["repeats"].isNull()) this->repeats = obj["repeats"];
if(!obj["tiltType"].isNull()) {
if(obj["tiltType"].is<const char *>()) {
if(strncmp(obj["tiltType"].as<const char *>(), "none", 4) == 0)
this->tiltType = tilt_types::none;
@ -3246,7 +3246,7 @@ int8_t SomfyShade::fromJSON(JsonObject &obj) {
this->tiltType = static_cast<tilt_types>(obj["tiltType"].as<uint8_t>());
}
}
if(obj.containsKey("linkedAddresses")) {
if(!obj["linkedAddresses"].isNull()) {
uint32_t linkedAddresses[SOMFY_MAX_LINKED_REMOTES];
memset(linkedAddresses, 0x00, sizeof(linkedAddresses));
JsonArray arr = obj["linkedAddresses"];
@ -3258,15 +3258,15 @@ int8_t SomfyShade::fromJSON(JsonObject &obj) {
this->linkedRemotes[j].setRemoteAddress(linkedAddresses[j]);
}
}
if(obj.containsKey("flags")) this->flags = obj["flags"];
if(!obj["flags"].isNull()) this->flags = obj["flags"];
if(this->proto == radio_proto::GP_Remote || this->proto == radio_proto::GP_Relay) {
if(obj.containsKey("gpioUp")) this->gpioUp = obj["gpioUp"];
if(obj.containsKey("gpioDown")) this->gpioDown = obj["gpioDown"];
if(!obj["gpioUp"].isNull()) this->gpioUp = obj["gpioUp"];
if(!obj["gpioDown"].isNull()) this->gpioDown = obj["gpioDown"];
pinMode(this->gpioUp, OUTPUT);
pinMode(this->gpioDown, OUTPUT);
}
if(this->proto == radio_proto::GP_Remote) {
if(obj.containsKey("gpioMy")) this->gpioMy = obj["gpioMy"];
if(!obj["gpioMy"].isNull()) this->gpioMy = obj["gpioMy"];
pinMode(this->gpioMy, OUTPUT);
}
}
@ -3327,8 +3327,8 @@ bool SomfyShade::toJSON(JsonObject &obj) {
}
*/
bool SomfyRoom::fromJSON(JsonObject &obj) {
if(obj.containsKey("name")) strlcpy(this->name, obj["name"], sizeof(this->name));
if(obj.containsKey("sortOrder")) this->sortOrder = obj["sortOrder"];
if(!obj["name"].isNull()) strlcpy(this->name, obj["name"], sizeof(this->name));
if(!obj["sortOrder"].isNull()) this->sortOrder = obj["sortOrder"];
return true;
}
/*
@ -3340,16 +3340,16 @@ bool SomfyRoom::toJSON(JsonObject &obj) {
}
*/
bool SomfyGroup::fromJSON(JsonObject &obj) {
if(obj.containsKey("name")) strlcpy(this->name, obj["name"], sizeof(this->name));
if(obj.containsKey("roomId")) this->roomId = obj["roomId"];
if(obj.containsKey("remoteAddress")) this->setRemoteAddress(obj["remoteAddress"]);
if(obj.containsKey("bitLength")) this->bitLength = obj["bitLength"];
if(obj.containsKey("proto")) this->proto = static_cast<radio_proto>(obj["proto"].as<uint8_t>());
if(obj.containsKey("flipCommands")) this->flipCommands = obj["flipCommands"].as<bool>();
if(!obj["name"].isNull()) strlcpy(this->name, obj["name"], sizeof(this->name));
if(!obj["roomId"].isNull()) this->roomId = obj["roomId"];
if(!obj["remoteAddress"].isNull()) this->setRemoteAddress(obj["remoteAddress"]);
if(!obj["bitLength"].isNull()) this->bitLength = obj["bitLength"];
if(!obj["proto"].isNull()) this->proto = static_cast<radio_proto>(obj["proto"].as<uint8_t>());
if(!obj["flipCommands"].isNull()) this->flipCommands = obj["flipCommands"].as<bool>();
//if(obj.containsKey("sunSensor")) this->hasSunSensor() = obj["sunSensor"]; This is calculated
if(obj.containsKey("repeats")) this->repeats = obj["repeats"];
if(obj.containsKey("linkedShades")) {
//if(!obj["sunSensor"].isNull()) this->hasSunSensor() = obj["sunSensor"]; This is calculated
if(!obj["repeats"].isNull()) this->repeats = obj["repeats"];
if(!obj["linkedShades"].isNull()) {
uint8_t linkedShades[SOMFY_MAX_GROUPED_SHADES];
memset(linkedShades, 0x00, sizeof(linkedShades));
JsonArray arr = obj["linkedShades"];
@ -4485,7 +4485,7 @@ bool Transceiver::toJSON(JsonObject& obj) {
}
*/
bool Transceiver::fromJSON(JsonObject& obj) {
if (obj.containsKey("config")) {
if (!obj["config"].isNull()) {
JsonObject objConfig = obj["config"];
this->config.fromJSON(objConfig);
}
@ -4514,43 +4514,43 @@ bool Transceiver::end() {
}
void transceiver_config_t::fromJSON(JsonObject& obj) {
//Serial.print("Deserialize Radio JSON ");
if(obj.containsKey("type")) this->type = obj["type"];
if(obj.containsKey("CSNPin")) this->CSNPin = obj["CSNPin"];
if(obj.containsKey("MISOPin")) this->MISOPin = obj["MISOPin"];
if(obj.containsKey("MOSIPin")) this->MOSIPin = obj["MOSIPin"];
if(obj.containsKey("RXPin")) this->RXPin = obj["RXPin"];
if(obj.containsKey("SCKPin")) this->SCKPin = obj["SCKPin"];
if(obj.containsKey("TXPin")) this->TXPin = obj["TXPin"];
if(obj.containsKey("rxBandwidth")) this->rxBandwidth = obj["rxBandwidth"]; // float
if(obj.containsKey("frequency")) this->frequency = obj["frequency"]; // float
if(obj.containsKey("deviation")) this->deviation = obj["deviation"]; // float
if(obj.containsKey("enabled")) this->enabled = obj["enabled"];
if(obj.containsKey("txPower")) this->txPower = obj["txPower"];
if(obj.containsKey("proto")) this->proto = static_cast<radio_proto>(obj["proto"].as<uint8_t>());
if(!obj["type"].isNull()) this->type = obj["type"];
if(!obj["CSNPin"].isNull()) this->CSNPin = obj["CSNPin"];
if(!obj["MISOPin"].isNull()) this->MISOPin = obj["MISOPin"];
if(!obj["MOSIPin"].isNull()) this->MOSIPin = obj["MOSIPin"];
if(!obj["RXPin"].isNull()) this->RXPin = obj["RXPin"];
if(!obj["SCKPin"].isNull()) this->SCKPin = obj["SCKPin"];
if(!obj["TXPin"].isNull()) this->TXPin = obj["TXPin"];
if(!obj["rxBandwidth"].isNull()) this->rxBandwidth = obj["rxBandwidth"]; // float
if(!obj["frequency"].isNull()) this->frequency = obj["frequency"]; // float
if(!obj["deviation"].isNull()) this->deviation = obj["deviation"]; // float
if(!obj["enabled"].isNull()) this->enabled = obj["enabled"];
if(!obj["txPower"].isNull()) this->txPower = obj["txPower"];
if(!obj["proto"].isNull()) this->proto = static_cast<radio_proto>(obj["proto"].as<uint8_t>());
/*
if (obj.containsKey("internalCCMode")) this->internalCCMode = obj["internalCCMode"];
if (obj.containsKey("modulationMode")) this->modulationMode = obj["modulationMode"];
if (obj.containsKey("channel")) this->channel = obj["channel"];
if (obj.containsKey("channelSpacing")) this->channelSpacing = obj["channelSpacing"]; // float
if (obj.containsKey("dataRate")) this->dataRate = obj["dataRate"]; // float
if (obj.containsKey("syncMode")) this->syncMode = obj["syncMode"];
if (obj.containsKey("syncWordHigh")) this->syncWordHigh = obj["syncWordHigh"];
if (obj.containsKey("syncWordLow")) this->syncWordLow = obj["syncWordLow"];
if (obj.containsKey("addrCheckMode")) this->addrCheckMode = obj["addrCheckMode"];
if (obj.containsKey("checkAddr")) this->checkAddr = obj["checkAddr"];
if (obj.containsKey("dataWhitening")) this->dataWhitening = obj["dataWhitening"];
if (obj.containsKey("pktFormat")) this->pktFormat = obj["pktFormat"];
if (obj.containsKey("pktLengthMode")) this->pktLengthMode = obj["pktLengthMode"];
if (obj.containsKey("pktLength")) this->pktLength = obj["pktLength"];
if (obj.containsKey("useCRC")) this->useCRC = obj["useCRC"];
if (obj.containsKey("autoFlushCRC")) this->autoFlushCRC = obj["autoFlushCRC"];
if (obj.containsKey("disableDCFilter")) this->disableDCFilter = obj["disableCRCFilter"];
if (obj.containsKey("enableManchester")) this->enableManchester = obj["enableManchester"];
if (obj.containsKey("enableFEC")) this->enableFEC = obj["enableFEC"];
if (obj.containsKey("minPreambleBytes")) this->minPreambleBytes = obj["minPreambleBytes"];
if (obj.containsKey("pqtThreshold")) this->pqtThreshold = obj["pqtThreshold"];
if (obj.containsKey("appendStatus")) this->appendStatus = obj["appendStatus"];
if (obj.containsKey("printBuffer")) this->printBuffer = obj["printBuffer"];
if (!obj["internalCCMode"].isNull()) this->internalCCMode = obj["internalCCMode"];
if (!obj["modulationMode"].isNull()) this->modulationMode = obj["modulationMode"];
if (!obj["channel"].isNull()) this->channel = obj["channel"];
if (!obj["channelSpacing"].isNull()) this->channelSpacing = obj["channelSpacing"]; // float
if (!obj["dataRate"].isNull()) this->dataRate = obj["dataRate"]; // float
if (!obj["syncMode"].isNull()) this->syncMode = obj["syncMode"];
if (!obj["syncWordHigh"].isNull()) this->syncWordHigh = obj["syncWordHigh"];
if (!obj["syncWordLow"].isNull()) this->syncWordLow = obj["syncWordLow"];
if (!obj["addrCheckMode"].isNull()) this->addrCheckMode = obj["addrCheckMode"];
if (!obj["checkAddr"].isNull()) this->checkAddr = obj["checkAddr"];
if (!obj["dataWhitening"].isNull()) this->dataWhitening = obj["dataWhitening"];
if (!obj["pktFormat"].isNull()) this->pktFormat = obj["pktFormat"];
if (!obj["pktLengthMode"].isNull()) this->pktLengthMode = obj["pktLengthMode"];
if (!obj["pktLength"].isNull()) this->pktLength = obj["pktLength"];
if (!obj["useCRC"].isNull()) this->useCRC = obj["useCRC"];
if (!obj["autoFlushCRC"].isNull()) this->autoFlushCRC = obj["autoFlushCRC"];
if (!obj["disableDCFilter"].isNull()) this->disableDCFilter = obj["disableCRCFilter"];
if (!obj["enableManchester"].isNull()) this->enableManchester = obj["enableManchester"];
if (!obj["enableFEC"].isNull()) this->enableFEC = obj["enableFEC"];
if (!obj["minPreambleBytes"].isNull()) this->minPreambleBytes = obj["minPreambleBytes"];
if (!obj["pqtThreshold"].isNull()) this->pqtThreshold = obj["pqtThreshold"];
if (!obj["appendStatus"].isNull()) this->appendStatus = obj["appendStatus"];
if (!obj["printBuffer"].isNull()) this->printBuffer = obj["printBuffer"];
*/
ESP_LOGD(TAG, "SCK:%u MISO:%u MOSI:%u CSN:%u RX:%u TX:%u", this->SCKPin, this->MISOPin, this->MOSIPin, this->CSNPin, this->RXPin, this->TXPin);
}