aaribaud/ESPSomfy-RTS
0
0
Fork 0
mirror of https://github.com/rstrouse/ESPSomfy-RTS.git synced 2026-03-30 08:52:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

5

Browse source
This commit is contained in:
cjkas 2026-03-19 08:13:55 +01:00
parent 07369e7e4c
commit daf2ef2937
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/Somfy.cpp
View file

@ -1447,9 +1447,9 @@ void SomfyRoom::unpublish() {
} }
void SomfyShade::publishState() { void SomfyShade::publishState() {
if(mqtt.connected()) { if(mqtt.connected()) {
this->publish("position", this->transformPosition(this->currentPos), true); this->publish("position", (uint8_t)50, true);
this->publish("direction", this->direction, true); this->publish("direction", (int8_t)0, true);
this->publish("target", this->transformPosition(this->target), true); this->publish("target", (uint8_t)50, true);
this->publish("lastRollingCode", this->lastRollingCode); this->publish("lastRollingCode", this->lastRollingCode);
this->publish("mypos", this->transformPosition(this->myPos), true); this->publish("mypos", this->transformPosition(this->myPos), true);
this->publish("myTiltPos", this->transformPosition(this->myTiltPos), true); this->publish("myTiltPos", this->transformPosition(this->myTiltPos), true);
@ -1796,7 +1796,7 @@ bool SomfyGroup::publish(const char *topic, bool val, bool retain) {
float SomfyShade::p_currentPos(float pos) { float SomfyShade::p_currentPos(float pos) {
float old = this->currentPos; float old = this->currentPos;
this->currentPos = pos; this->currentPos = pos;
if(floor(old) != floor(pos)) this->publish("position", this->transformPosition(static_cast<uint8_t>(floor(this->currentPos)))); if(floor(old) != floor(pos)) this->publish("position", (uint8_t)50);
return old; return old;
} }
float SomfyShade::p_currentTiltPos(float pos) { float SomfyShade::p_currentTiltPos(float pos) {
@ -2894,6 +2894,17 @@ void SomfyShade::sendCommand(somfy_commands cmd, uint8_t repeat, uint8_t stepSiz
// 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;
// If same direction command sent while already moving, stop the state tracking.
// The real motor stops on its own when it receives the same direction again.
if((cmd == somfy_commands::Up && this->direction == -1) ||
(cmd == somfy_commands::Down && this->direction == 1)) {
Serial.println("Same command as dir");
SomfyRemote::sendCommand(cmd, repeat);
this->p_target(this->currentPos);
this->p_tiltTarget(this->currentTiltPos);
this->setMovement(0);
return;
}
if(cmd == somfy_commands::Up) { if(cmd == somfy_commands::Up) {
if(this->tiltType == tilt_types::euromode) { if(this->tiltType == tilt_types::euromode) {
// In euromode we need to long press for 2 seconds on the // In euromode we need to long press for 2 seconds on the

4
src/Somfy.h
View file

@ -31,9 +31,9 @@ enum class radio_proto : byte { // Ordinal byte 0-255
enum class somfy_commands : byte { enum class somfy_commands : byte {
Unknown0 = 0x0, Unknown0 = 0x0,
My = 0x2,//DOWN My = 0x2,//DOWN
Up = 0x3, Up = 0x1,
MyUp = 0x4, //up MyUp = 0x4, //up
Down = 0x1, Down = 0x3,
MyDown = 0x5, MyDown = 0x5,
UpDown = 0x6, UpDown = 0x6,
MyUpDown = 0x7, MyUpDown = 0x7,