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

Added 80bit step functions to groups #280

Browse source
This commit is contained in:
Robert Strouse 2024-05-08 16:44:19 -07:00
parent e3e843387f
commit 6077052e9b
5 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Network.cpp
View file

@ -544,6 +544,7 @@ bool Network::openSoftAP() {
WiFi.disconnect(true); WiFi.disconnect(true);
WiFi.hostname("ESPSomfy RTS"); WiFi.hostname("ESPSomfy RTS");
WiFi.mode(WIFI_AP_STA); WiFi.mode(WIFI_AP_STA);
this->_connecting = false;
delay(100); delay(100);
WiFi.softAP("ESPSomfy RTS", ""); WiFi.softAP("ESPSomfy RTS", "");
Serial.println("Initializing AP for credentials modification"); Serial.println("Initializing AP for credentials modification");

7
Somfy.cpp
View file

@ -2924,11 +2924,11 @@ void SomfyShade::sendCommand(somfy_commands cmd, uint8_t repeat, uint8_t stepSiz
} }
} }
void SomfyGroup::sendCommand(somfy_commands cmd) { this->sendCommand(cmd, this->repeats); } void SomfyGroup::sendCommand(somfy_commands cmd) { this->sendCommand(cmd, this->repeats); }
void SomfyGroup::sendCommand(somfy_commands cmd, uint8_t repeat) { void SomfyGroup::sendCommand(somfy_commands cmd, uint8_t repeat, uint8_t stepSize) {
// This sendCommand function will always be called externally. sendCommand at the remote level // This sendCommand function will always be called externally. sendCommand at the remote level
// is expected to be called internally when the motor needs commanded. // is expected to be called internally when the motor needs commanded.
if(this->bitLength == 0) this->bitLength = somfy.transceiver.config.type; if(this->bitLength == 0) this->bitLength = somfy.transceiver.config.type;
SomfyRemote::sendCommand(cmd, repeat); SomfyRemote::sendCommand(cmd, repeat, stepSize);
switch(cmd) { switch(cmd) {
case somfy_commands::My: case somfy_commands::My:
@ -3273,6 +3273,8 @@ void SomfyShade::toJSONRef(JsonResponse &json) {
json.addElem("remoteAddress", (uint32_t)this->m_remoteAddress); json.addElem("remoteAddress", (uint32_t)this->m_remoteAddress);
json.addElem("paired", this->paired); json.addElem("paired", this->paired);
json.addElem("shadeType", static_cast<uint8_t>(this->shadeType)); json.addElem("shadeType", static_cast<uint8_t>(this->shadeType));
json.addElem("flipCommands", this->flipCommands);
json.addElem("flipPosition", this->flipCommands);
json.addElem("bitLength", this->bitLength); json.addElem("bitLength", this->bitLength);
json.addElem("proto", static_cast<uint8_t>(this->proto)); json.addElem("proto", static_cast<uint8_t>(this->proto));
json.addElem("flags", this->flags); json.addElem("flags", this->flags);
@ -4368,6 +4370,7 @@ void RECEIVE_ATTR Transceiver::handleReceive() {
else if (somfy_rx.cpt_synchro_hw == 12) somfy_rx.bit_length = 80; else if (somfy_rx.cpt_synchro_hw == 12) somfy_rx.bit_length = 80;
else if (somfy_rx.cpt_synchro_hw > 17) somfy_rx.bit_length = 80; else if (somfy_rx.cpt_synchro_hw > 17) somfy_rx.bit_length = 80;
else somfy_rx.bit_length = 56; else somfy_rx.bit_length = 56;
//somfy_rx.bit_length = 80;
somfy_rx.status = receiving_data; somfy_rx.status = receiving_data;
} }
else { else {

2
Somfy.h
View file

@ -402,7 +402,7 @@ class SomfyGroup : public SomfyRemote {
void emitState(const char *evt = "groupState"); void emitState(const char *evt = "groupState");
void emitState(uint8_t num, const char *evt = "groupState"); void emitState(uint8_t num, const char *evt = "groupState");
void sendCommand(somfy_commands cmd); void sendCommand(somfy_commands cmd);
void sendCommand(somfy_commands cmd, uint8_t repeat); void sendCommand(somfy_commands cmd, uint8_t repeat, uint8_t stepSize = 0);
int8_t p_direction(int8_t dir); int8_t p_direction(int8_t dir);
bool publish(const char *topic, uint8_t val, bool retain = false); bool publish(const char *topic, uint8_t val, bool retain = false);
bool publish(const char *topic, int8_t val, bool retain = false); bool publish(const char *topic, int8_t val, bool retain = false);

BIN
SomfyController.ino.esp32.bin
View file

Binary file not shown.

18
Web.cpp
View file

@ -407,6 +407,7 @@ void Web::handleRepeatCommand(WebServer& server) {
if (method == HTTP_OPTIONS) { server.send(200, "OK"); return; } if (method == HTTP_OPTIONS) { server.send(200, "OK"); return; }
uint8_t shadeId = 255; uint8_t shadeId = 255;
uint8_t groupId = 255; uint8_t groupId = 255;
uint8_t stepSize = 0;
int8_t repeat = -1; int8_t repeat = -1;
somfy_commands command = somfy_commands::My; somfy_commands command = somfy_commands::My;
if (method == HTTP_GET || method == HTTP_PUT || method == HTTP_POST) { if (method == HTTP_GET || method == HTTP_PUT || method == HTTP_POST) {
@ -414,6 +415,7 @@ void Web::handleRepeatCommand(WebServer& server) {
else if(server.hasArg("groupId")) groupId = atoi(server.arg("groupId").c_str()); else if(server.hasArg("groupId")) groupId = atoi(server.arg("groupId").c_str());
if(server.hasArg("command")) command = translateSomfyCommand(server.arg("command")); if(server.hasArg("command")) command = translateSomfyCommand(server.arg("command"));
if(server.hasArg("repeat")) repeat = atoi(server.arg("repeat").c_str()); if(server.hasArg("repeat")) repeat = atoi(server.arg("repeat").c_str());
if(server.hasArg("stepSize")) stepSize = atoi(server.arg("stepSize").c_str());
if(shadeId == 255 && groupId == 255 && server.hasArg("plain")) { if(shadeId == 255 && groupId == 255 && server.hasArg("plain")) {
DynamicJsonDocument doc(512); DynamicJsonDocument doc(512);
DeserializationError err = deserializeJson(doc, server.arg("plain")); DeserializationError err = deserializeJson(doc, server.arg("plain"));
@ -425,6 +427,7 @@ void Web::handleRepeatCommand(WebServer& server) {
JsonObject obj = doc.as<JsonObject>(); JsonObject obj = doc.as<JsonObject>();
if (obj.containsKey("shadeId")) shadeId = obj["shadeId"]; if (obj.containsKey("shadeId")) shadeId = obj["shadeId"];
if(obj.containsKey("groupId")) groupId = obj["groupId"]; if(obj.containsKey("groupId")) groupId = obj["groupId"];
if(obj.containsKey("stepSize")) stepSize = obj["stepSize"];
if (obj.containsKey("command")) { if (obj.containsKey("command")) {
String scmd = obj["command"]; String scmd = obj["command"];
command = translateSomfyCommand(scmd); command = translateSomfyCommand(scmd);
@ -443,7 +446,7 @@ void Web::handleRepeatCommand(WebServer& server) {
if(shade->shadeType == shade_types::garage1 && command == somfy_commands::Prog) command = somfy_commands::Toggle; if(shade->shadeType == shade_types::garage1 && command == somfy_commands::Prog) command = somfy_commands::Toggle;
if(!shade->isLastCommand(command)) { if(!shade->isLastCommand(command)) {
// We are going to send this as a new command. // We are going to send this as a new command.
shade->sendCommand(command, repeat >= 0 ? repeat : shade->repeats); shade->sendCommand(command, repeat >= 0 ? repeat : shade->repeats, stepSize);
} }
else { else {
shade->repeatFrame(repeat >= 0 ? repeat : shade->repeats); shade->repeatFrame(repeat >= 0 ? repeat : shade->repeats);
@ -463,7 +466,7 @@ void Web::handleRepeatCommand(WebServer& server) {
} }
if(!group->isLastCommand(command)) { if(!group->isLastCommand(command)) {
// We are going to send this as a new command. // We are going to send this as a new command.
group->sendCommand(command, repeat >= 0 ? repeat : group->repeats); group->sendCommand(command, repeat >= 0 ? repeat : group->repeats, stepSize);
} }
else else
group->repeatFrame(repeat >= 0 ? repeat : group->repeats); group->repeatFrame(repeat >= 0 ? repeat : group->repeats);
@ -488,6 +491,7 @@ void Web::handleGroupCommand(WebServer &server) {
if(server.method() == HTTP_OPTIONS) { server.send(200, "OK"); return; } if(server.method() == HTTP_OPTIONS) { server.send(200, "OK"); return; }
HTTPMethod method = server.method(); HTTPMethod method = server.method();
uint8_t groupId = 255; uint8_t groupId = 255;
uint8_t stepSize = 0;
int8_t repeat = -1; int8_t repeat = -1;
somfy_commands command = somfy_commands::My; somfy_commands command = somfy_commands::My;
if (method == HTTP_GET || method == HTTP_PUT || method == HTTP_POST) { if (method == HTTP_GET || method == HTTP_PUT || method == HTTP_POST) {
@ -495,6 +499,7 @@ void Web::handleGroupCommand(WebServer &server) {
groupId = atoi(server.arg("groupId").c_str()); groupId = atoi(server.arg("groupId").c_str());
if (server.hasArg("command")) command = translateSomfyCommand(server.arg("command")); if (server.hasArg("command")) command = translateSomfyCommand(server.arg("command"));
if(server.hasArg("repeat")) repeat = atoi(server.arg("repeat").c_str()); if(server.hasArg("repeat")) repeat = atoi(server.arg("repeat").c_str());
if(server.hasArg("stepSize")) stepSize = atoi(server.arg("stepSize").c_str());
} }
else if (server.hasArg("plain")) { else if (server.hasArg("plain")) {
Serial.println("Sending Group Command"); Serial.println("Sending Group Command");
@ -507,12 +512,16 @@ void Web::handleGroupCommand(WebServer &server) {
else { else {
JsonObject obj = doc.as<JsonObject>(); JsonObject obj = doc.as<JsonObject>();
if (obj.containsKey("groupId")) groupId = obj["groupId"]; if (obj.containsKey("groupId")) groupId = obj["groupId"];
else server.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"No group id was supplied.\"}")); else {
server.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"No group id was supplied.\"}"));
return;
}
if (obj.containsKey("command")) { if (obj.containsKey("command")) {
String scmd = obj["command"]; String scmd = obj["command"];
command = translateSomfyCommand(scmd); command = translateSomfyCommand(scmd);
} }
if(obj.containsKey("repeat")) repeat = obj["repeat"].as<uint8_t>(); if(obj.containsKey("repeat")) repeat = obj["repeat"].as<uint8_t>();
if(obj.containsKey("stepSize")) stepSize = obj["stepSize"].as<uint8_t>();
} }
} }
else server.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"No group object supplied.\"}")); else server.send(500, _encoding_json, F("{\"status\":\"ERROR\",\"desc\":\"No group object supplied.\"}"));
@ -521,8 +530,7 @@ void Web::handleGroupCommand(WebServer &server) {
Serial.print("Received:"); Serial.print("Received:");
Serial.println(server.arg("plain")); Serial.println(server.arg("plain"));
// Send the command to the group. // Send the command to the group.
if(repeat > 0) group->sendCommand(command, repeat); group->sendCommand(command, repeat >= 0 ? repeat : group->repeats, stepSize);
else group->sendCommand(command);
JsonResponse resp; JsonResponse resp;
resp.beginResponse(&server, g_content, sizeof(g_content)); resp.beginResponse(&server, g_content, sizeof(g_content));
resp.beginObject(); resp.beginObject();