aaribaud/ESPSomfy-RTS
0
0
Fork 0
mirror of https://github.com/rstrouse/ESPSomfy-RTS.git synced 2025-12-13 02:52:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduce MQTT publish load.

Browse source
This commit is contained in:
Robert Strouse 2023-10-31 11:09:58 -07:00
parent 4e3d8597f5
commit 7c983c9b2e
5 changed files with 87 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

62
GitOTA.cpp
View file

@ -198,16 +198,19 @@ void GitUpdater::loop() {
} }
void GitUpdater::checkForUpdate() { void GitUpdater::checkForUpdate() {
if(this->status != 0) return; // If we are already checking. if(this->status != 0) return; // If we are already checking.
Serial.println("Check github for updates...");
this->status = GIT_STATUS_CHECK; this->status = GIT_STATUS_CHECK;
GitRepo repo; if(this->checkInternet() == 0) {
this->lastCheck = millis(); GitRepo repo;
this->updateAvailable = false; this->lastCheck = millis();
this->error = repo.getReleases(2); this->updateAvailable = false;
if(this->error == 0) { // Get 2 releases so we can filter our pre-releases this->error = repo.getReleases(2);
this->setCurrentRelease(repo); if(this->error == 0) { // Get 2 releases so we can filter our pre-releases
} this->setCurrentRelease(repo);
else { }
this->emitUpdateCheck(); else {
this->emitUpdateCheck();
}
} }
this->status = GIT_STATUS_READY; this->status = GIT_STATUS_READY;
} }
@ -238,14 +241,39 @@ void GitUpdater::toJSON(JsonObject &obj) {
this->latest.toJSON(latest); this->latest.toJSON(latest);
} }
void GitUpdater::emitUpdateCheck(uint8_t num) { void GitUpdater::emitUpdateCheck(uint8_t num) {
ClientSocketEvent evt("fwStatus"); ClientSocketEvent evt("fwStatus");
DynamicJsonDocument doc(512); DynamicJsonDocument doc(512);
JsonObject obj = doc.to<JsonObject>(); JsonObject obj = doc.to<JsonObject>();
this->toJSON(obj); this->toJSON(obj);
if(num == 255) if(num == 255)
sockEmit.sendToClients("fwStatus", doc); sockEmit.sendToClients("fwStatus", doc);
else else
sockEmit.sendToClient(num, "fwStatus", doc); sockEmit.sendToClient(num, "fwStatus", doc);
}
int GitUpdater::checkInternet() {
int err = 500;
uint32_t t = millis();
WiFiClientSecure *client = new WiFiClientSecure;
if(client) {
client->setInsecure();
HTTPClient https;
if(https.begin(*client, "https://github.com/rstrouse/ESPSomfy-RTS")) {
https.setFollowRedirects(HTTPC_FORCE_FOLLOW_REDIRECTS);
https.setTimeout(5000);
int httpCode = https.sendRequest("HEAD");
if (httpCode == HTTP_CODE_OK || httpCode == HTTP_CODE_MOVED_PERMANENTLY || httpCode == HTTP_CODE_FOUND) {
err = 0;
Serial.printf("Check Internet Success: %dms\n", millis() - t);
}
else {
err = httpCode;
Serial.printf("Check Internet Error: %d: %dms\n", err, millis() - t);
}
https.end();
}
delete client;
}
return err;
} }
void GitUpdater::emitDownloadProgress(size_t total, size_t loaded, const char *evt) { this->emitDownloadProgress(255, total, loaded, evt); } void GitUpdater::emitDownloadProgress(size_t total, size_t loaded, const char *evt) { this->emitDownloadProgress(255, total, loaded, evt); }
void GitUpdater::emitDownloadProgress(uint8_t num, size_t total, size_t loaded, const char *evt) { void GitUpdater::emitDownloadProgress(uint8_t num, size_t total, size_t loaded, const char *evt) {

3
GitOTA.h
View file

@ -35,7 +35,7 @@ class GitRepo {
class GitUpdater { class GitUpdater {
public: public:
uint8_t status = 0; uint8_t status = 0;
unsigned long lastCheck = 0; uint32_t lastCheck = 0;
bool updateAvailable = false; bool updateAvailable = false;
appver_t latest; appver_t latest;
bool cancelled = false; bool cancelled = false;
@ -51,6 +51,7 @@ class GitUpdater {
void setCurrentRelease(GitRepo &repo); void setCurrentRelease(GitRepo &repo);
void loop(); void loop();
void toJSON(JsonObject &obj); void toJSON(JsonObject &obj);
int checkInternet();
void emitUpdateCheck(uint8_t num=255); void emitUpdateCheck(uint8_t num=255);
void emitDownloadProgress(size_t total, size_t loaded, const char *evt = "updateProgress"); void emitDownloadProgress(size_t total, size_t loaded, const char *evt = "updateProgress");
void emitDownloadProgress(uint8_t num, size_t total, size_t loaded, const char *evt = "updateProgress"); void emitDownloadProgress(uint8_t num, size_t total, size_t loaded, const char *evt = "updateProgress");

109
Somfy.cpp
View file

@ -809,6 +809,8 @@ void SomfyShade::setGPIOs() {
int8_t dir = this->direction; int8_t dir = this->direction;
if(dir == 0 && this->tiltType == tilt_types::integrated) if(dir == 0 && this->tiltType == tilt_types::integrated)
dir = this->tiltDirection; dir = this->tiltDirection;
else if(this->tiltType == tilt_types::tiltonly)
dir = this->tiltDirection;
if(this->shadeType == shade_types::drycontact) { if(this->shadeType == shade_types::drycontact) {
digitalWrite(this->gpioDown, this->currentPos == 100 ? HIGH : LOW); digitalWrite(this->gpioDown, this->currentPos == 100 ? HIGH : LOW);
this->gpioDir = this->currentPos == 100 ? 1 : -1; this->gpioDir = this->currentPos == 100 ? 1 : -1;
@ -1268,40 +1270,25 @@ void SomfyShade::load() {
} }
void SomfyShade::publishState() { void SomfyShade::publishState() {
if(mqtt.connected()) { if(mqtt.connected()) {
char topic[32]; this->publish("position", this->transformPosition(this->currentPos));
snprintf(topic, sizeof(topic), "shades/%u/position", this->shadeId); this->publish("direction", this->direction);
mqtt.publish(topic, this->transformPosition(this->currentPos)); this->publish("target", this->transformPosition(this->target));
snprintf(topic, sizeof(topic), "shades/%u/direction", this->shadeId); this->publish("lastRollingCode", this->lastRollingCode);
mqtt.publish(topic, this->direction); this->publish("mypos", this->transformPosition(this->myPos));
snprintf(topic, sizeof(topic), "shades/%u/target", this->shadeId); this->publish("myTiltPos", this->transformPosition(this->myTiltPos));
mqtt.publish(topic, this->transformPosition(this->target));
snprintf(topic, sizeof(topic), "shades/%u/lastRollingCode", this->shadeId);
mqtt.publish(topic, this->lastRollingCode);
snprintf(topic, sizeof(topic), "shades/%u/mypos", this->shadeId);
mqtt.publish(topic, this->transformPosition(this->myPos));
snprintf(topic, sizeof(topic), "shades/%u/myTiltPos", this->shadeId);
mqtt.publish(topic, this->transformPosition(this->myTiltPos));
if(this->tiltType != tilt_types::none) { if(this->tiltType != tilt_types::none) {
snprintf(topic, sizeof(topic), "shades/%u/tiltDirection", this->shadeId); this->publish("tiltDirection", this->tiltDirection);
mqtt.publish(topic, this->tiltDirection); this->publish("tiltPosition", this->transformPosition(this->currentTiltPos));
snprintf(topic, sizeof(topic), "shades/%u/tiltPosition", this->shadeId); this->publish("tiltTarget", this->transformPosition(this->tiltTarget));
mqtt.publish(topic, this->transformPosition(this->currentTiltPos));
snprintf(topic, sizeof(topic), "shades/%u/tiltTarget", this->shadeId);
mqtt.publish(topic, this->transformPosition(this->tiltTarget));
} }
const uint8_t sunFlag = !!(this->flags & static_cast<uint8_t>(somfy_flags_t::SunFlag)); const uint8_t sunFlag = !!(this->flags & static_cast<uint8_t>(somfy_flags_t::SunFlag));
const uint8_t isSunny = !!(this->flags & static_cast<uint8_t>(somfy_flags_t::Sunny)); const uint8_t isSunny = !!(this->flags & static_cast<uint8_t>(somfy_flags_t::Sunny));
const uint8_t isWindy = !!(this->flags & static_cast<uint8_t>(somfy_flags_t::Windy)); const uint8_t isWindy = !!(this->flags & static_cast<uint8_t>(somfy_flags_t::Windy));
snprintf(topic, sizeof(topic), "shades/%u/sunSensor", this->shadeId);
mqtt.publish(topic, this->hasSunSensor());
if(this->hasSunSensor()) { if(this->hasSunSensor()) {
snprintf(topic, sizeof(topic), "shades/%u/sunFlag", this->shadeId); this->publish("sunFlag", sunFlag);
mqtt.publish(topic, sunFlag); this->publish("sunny", isSunny);
snprintf(topic, sizeof(topic), "shades/%u/sunny", this->shadeId);
mqtt.publish(topic, isSunny);
snprintf(topic, sizeof(topic), "shades/%u/windy", this->shadeId);
} }
mqtt.publish(topic, isWindy); this->publish("windy", isWindy);
} }
} }
void SomfyShade::publishDisco() { void SomfyShade::publishDisco() {
@ -1426,65 +1413,43 @@ void SomfyShade::publishDisco() {
} }
void SomfyShade::publish() { void SomfyShade::publish() {
if(mqtt.connected()) { if(mqtt.connected()) {
char topic[32]; this->publish("shadeId", this->shadeId);
snprintf(topic, sizeof(topic), "shades/%u/shadeId", this->shadeId); this->publish("name", this->name);
mqtt.publish(topic, this->shadeId); this->publish("remoteAddress", this->getRemoteAddress());
snprintf(topic, sizeof(topic), "shades/%u/name", this->shadeId); this->publish("shadeType", static_cast<uint8_t>(this->shadeType));
mqtt.publish(topic, this->name); this->publish("tiltType", static_cast<uint8_t>(this->tiltType));
snprintf(topic, sizeof(topic), "shades/%u/remoteAddress", this->shadeId); this->publish("flags", this->flags);
mqtt.publish(topic, this->getRemoteAddress()); this->publish("flipCommands", this->flipCommands);
snprintf(topic, sizeof(topic), "shades/%u/shadeType", this->shadeId); this->publish("flipPosition", this->flipPosition);
mqtt.publish(topic, static_cast<uint8_t>(this->shadeType));
snprintf(topic, sizeof(topic), "shades/%u/tiltType", this->shadeId);
mqtt.publish(topic, static_cast<uint8_t>(this->tiltType));
//snprintf(topic, sizeof(topic), "shades/%u/flags", this->shadeId);
mqtt.publish(topic, this->flags);
snprintf(topic, sizeof(topic), "shades/%u/flipCommands", this->shadeId);
mqtt.publish(topic, this->flipCommands);
snprintf(topic, sizeof(topic), "shades/%u/flipPosition", this->shadeId);
mqtt.publish(topic, this->flipPosition);
this->publishState(); this->publishState();
mqtt.loop();
this->publishDisco(); this->publishDisco();
sockEmit.loop(); // Keep our socket alive.
} }
} }
void SomfyGroup::publishState() { void SomfyGroup::publishState() {
if(mqtt.connected()) { if(mqtt.connected()) {
char topic[32]; this->publish("direction", this->direction);
snprintf(topic, sizeof(topic), "groups/%u/direction", this->groupId); this->publish("lastRollingCode", this->lastRollingCode);
mqtt.publish(topic, this->direction);
snprintf(topic, sizeof(topic), "groups/%u/lastRollingCode", this->groupId);
mqtt.publish(topic, this->lastRollingCode);
const uint8_t sunFlag = !!(this->flags & static_cast<uint8_t>(somfy_flags_t::SunFlag)); const uint8_t sunFlag = !!(this->flags & static_cast<uint8_t>(somfy_flags_t::SunFlag));
const uint8_t isSunny = !!(this->flags & static_cast<uint8_t>(somfy_flags_t::Sunny)); const uint8_t isSunny = !!(this->flags & static_cast<uint8_t>(somfy_flags_t::Sunny));
const uint8_t isWindy = !!(this->flags & static_cast<uint8_t>(somfy_flags_t::Windy)); const uint8_t isWindy = !!(this->flags & static_cast<uint8_t>(somfy_flags_t::Windy));
snprintf(topic, sizeof(topic), "groups/%u/sunFlag", this->groupId); this->publish("sunFlag", sunFlag);
mqtt.publish(topic, sunFlag); this->publish("sunny", isSunny);
snprintf(topic, sizeof(topic), "groups/%u/sunny", this->groupId); this->publish("windy", isWindy);
mqtt.publish(topic, isSunny);
snprintf(topic, sizeof(topic), "groups/%u/windy", this->groupId);
mqtt.publish(topic, isWindy);
} }
} }
void SomfyGroup::publish() { void SomfyGroup::publish() {
if(mqtt.connected()) { if(mqtt.connected()) {
char topic[32]; this->publish("groupId", this->groupId);
snprintf(topic, sizeof(topic), "groups/%u/groupId", this->groupId); this->publish("name", this->name);
mqtt.publish(topic, this->groupId); this->publish("remoteAddress", this->getRemoteAddress());
snprintf(topic, sizeof(topic), "groups/%u/name", this->groupId); this->publish("groupType", static_cast<uint8_t>(this->groupType));
mqtt.publish(topic, this->name); this->publish("flags", this->flags);
snprintf(topic, sizeof(topic), "groups/%u/remoteAddress", this->groupId); this->publish("sunSensor", this->hasSunSensor());
mqtt.publish(topic, this->getRemoteAddress());
snprintf(topic, sizeof(topic), "groups/%u/groupType", this->groupId);
mqtt.publish(topic, static_cast<uint8_t>(this->groupType));
snprintf(topic, sizeof(topic), "groups/%u/flags", this->groupId);
mqtt.publish(topic, this->flags);
snprintf(topic, sizeof(topic), "groups/%u/sunSensor", this->groupId);
mqtt.publish(topic, this->hasSunSensor());
this->publishState(); this->publishState();
} }
} }
char mqttTopicBuffer[32]; char mqttTopicBuffer[55];
bool SomfyShade::publish(const char *topic, int8_t val, bool retain) { bool SomfyShade::publish(const char *topic, int8_t val, bool retain) {
if(mqtt.connected()) { if(mqtt.connected()) {
snprintf(mqttTopicBuffer, sizeof(mqttTopicBuffer), "shades/%u/%s", this->shadeId, topic); snprintf(mqttTopicBuffer, sizeof(mqttTopicBuffer), "shades/%u/%s", this->shadeId, topic);
@ -1566,9 +1531,6 @@ bool SomfyGroup::publish(const char *topic, bool val, bool retain) {
} }
return false; return false;
} }
// State Setters // State Setters
float SomfyShade::p_currentPos(float pos) { float SomfyShade::p_currentPos(float pos) {
float old = this->currentPos; float old = this->currentPos;
@ -1582,7 +1544,6 @@ float SomfyShade::p_currentTiltPos(float pos) {
if(floor(old) != floor(pos)) this->publish("tiltPosition", this->transformPosition(static_cast<uint8_t>(floor(this->currentTiltPos)))); if(floor(old) != floor(pos)) this->publish("tiltPosition", this->transformPosition(static_cast<uint8_t>(floor(this->currentTiltPos))));
return old; return old;
} }
uint16_t SomfyShade::p_lastRollingCode(uint16_t code) { uint16_t SomfyShade::p_lastRollingCode(uint16_t code) {
uint16_t old = SomfyRemote::p_lastRollingCode(code); uint16_t old = SomfyRemote::p_lastRollingCode(code);
if(old != code) this->publish("lastRollingCode", code); if(old != code) this->publish("lastRollingCode", code);

BIN
SomfyController.ino.esp32.bin
View file

Binary file not shown.

8
Web.cpp
View file

@ -202,6 +202,8 @@ void Web::handleLogin(WebServer &server) {
} }
void Web::handleStreamFile(WebServer &server, const char *filename, const char *encoding) { void Web::handleStreamFile(WebServer &server, const char *filename, const char *encoding) {
webServer.sendCORSHeaders(server); webServer.sendCORSHeaders(server);
if(server.method() == HTTP_OPTIONS) { server.send(200, "OK"); return; }
// Load the index html page from the data directory. // Load the index html page from the data directory.
Serial.print("Loading file "); Serial.print("Loading file ");
Serial.println(filename); Serial.println(filename);
@ -209,7 +211,7 @@ void Web::handleStreamFile(WebServer &server, const char *filename, const char *
if (!file) { if (!file) {
Serial.print("Error opening"); Serial.print("Error opening");
Serial.println(filename); Serial.println(filename);
server.send(500, _encoding_text, "shades.cfg"); server.send(500, _encoding_text, "Error opening file");
} }
server.streamFile(file, encoding); server.streamFile(file, encoding);
file.close(); file.close();
@ -1477,7 +1479,7 @@ void Web::begin() {
else { else {
shade->paired = paired; shade->paired = paired;
shade->save(); shade->save();
DynamicJsonDocument doc(512); DynamicJsonDocument doc(1024);
JsonObject obj = doc.to<JsonObject>(); JsonObject obj = doc.to<JsonObject>();
shade->toJSON(obj); shade->toJSON(obj);
serializeJson(doc, g_content); serializeJson(doc, g_content);
@ -1526,7 +1528,7 @@ void Web::begin() {
shade->sendCommand(somfy_commands::Prog, 1); shade->sendCommand(somfy_commands::Prog, 1);
shade->paired = false; shade->paired = false;
shade->save(); shade->save();
DynamicJsonDocument doc(512); DynamicJsonDocument doc(1024);
JsonObject obj = doc.to<JsonObject>(); JsonObject obj = doc.to<JsonObject>();
shade->toJSON(obj); shade->toJSON(obj);
serializeJson(doc, g_content); serializeJson(doc, g_content);