aaribaud/ESPSomfy-RTS
0
0
Fork 0
mirror of https://github.com/rstrouse/ESPSomfy-RTS.git synced 2026-10-31 22:02:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

refactor: share the favorite store, tilt repeats and request timing log

Browse source 
- setMyPosition stored a new favorite the same way in each of its three
  tilt branches; storeMyPosition() now does it.  The plain-lift branch
  now emits its state even when the radio refuses the favorite, which is
  harmless since sendSetMy() has already put the old one back.
- tiltRepeats() replaces the repeated tiltmotor ? TILT_REPEATS : repeats.
- timeRequest's two timing log blocks share logRequestTime().

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
cjkas 2026-10-13 15:10:34 +02:00
parent bea2f78cb6
commit 0b7c57a9ab
3 changed files with 31 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/Somfy.cpp
View file

@ -2411,15 +2411,7 @@ bool SomfyShade::setMyPosition(int8_t pos, int8_t tilt) {
this->settingMyPos = true;
}
}
else {
// Set it before sending so processFrame doesn't head for the old one. It
// is only committed once the motor was told about it.
const float oldTiltPos = this->myTiltPos;
this->p_myTiltPos(this->currentTiltPos);
sent = this->sendSetMy(0, this->myPos, oldTiltPos);
this->emitState();
return sent;
}
else return this->storeMyPosition(-1.0f, this->currentTiltPos);
this->commitMyPosition();
this->emitState();
}
@ -2444,17 +2436,7 @@ bool SomfyShade::setMyPosition(int8_t pos, int8_t tilt) {
this->settingMyPos = true;
}
}
else {
// Set it before sending so processFrame doesn't head for the old one.
// It is only committed once the motor was told about it.
const float oldPos = this->myPos;
const float oldTiltPos = this->myTiltPos;
this->p_myPos(this->currentPos);
this->p_myTiltPos(this->currentTiltPos);
sent = this->sendSetMy(0, oldPos, oldTiltPos);
this->emitState();
return sent;
}
else return this->storeMyPosition(this->currentPos, this->currentTiltPos);
this->commitMyPosition();
this->emitState();
}
@ -2478,19 +2460,21 @@ bool SomfyShade::setMyPosition(int8_t pos, int8_t tilt) {
this->settingMyPos = true;
}
}
else {
// Set it before sending so processFrame doesn't head for the old one. It
// is only committed once the motor was told about it.
const float oldPos = this->myPos;
const float oldTiltPos = this->myTiltPos;
this->p_myPos(this->currentPos);
this->p_myTiltPos(-1);
sent = this->sendSetMy(0, oldPos, oldTiltPos);
if(sent) this->emitState();
}
else sent = this->storeMyPosition(this->currentPos, -1.0f);
}
return sent;
}
bool SomfyShade::storeMyPosition(float pos, float tiltPos) {
// Set it before sending so processFrame doesn't head for the old one. It is
// only committed once the motor was told about it.
const float oldPos = this->myPos;
const float oldTiltPos = this->myTiltPos;
this->p_myPos(pos);
this->p_myTiltPos(tiltPos);
const bool sent = this->sendSetMy(0, oldPos, oldTiltPos);
this->emitState();
return sent;
}
bool SomfyShade::moveToMyPosition() {
if(!this->isIdle()) return true;
ESP_LOGI(TAG, "Moving to My Position");
@ -2639,14 +2623,14 @@ bool SomfyGroup::sendCommand(somfy_commands cmd, uint8_t repeat, uint8_t stepSiz
this->emitState();
return true;
}
uint8_t SomfyShade::tiltRepeats() const { return this->tiltType == tilt_types::tiltmotor ? TILT_REPEATS : this->repeats; }
bool SomfyShade::sendTiltCommand(somfy_commands cmd) {
const uint8_t repeat = this->tiltType == tilt_types::tiltmotor ? TILT_REPEATS : this->repeats;
float target;
if(cmd == somfy_commands::Up) target = 0.0f;
else if(cmd == somfy_commands::Down) target = 100.0f;
else if(cmd == somfy_commands::My) target = this->currentTiltPos;
else return true;
if(!SomfyRemote::sendCommand(cmd, repeat)) return false;
if(!SomfyRemote::sendCommand(cmd, this->tiltRepeats())) return false;
this->p_tiltTarget(target);
return true;
}
@ -2662,7 +2646,7 @@ bool SomfyShade::moveToTiltTarget(float target) {
if(cmd != somfy_commands::My) {
ESP_LOGI(TAG, "Moving Tilt to %.2f%% from %.2f%% using %s",
target, this->currentTiltPos, translateSomfyCommand(cmd).c_str());
if(!SomfyRemote::sendCommand(cmd, this->tiltType == tilt_types::tiltmotor ? TILT_REPEATS : this->repeats)) return false;
if(!SomfyRemote::sendCommand(cmd, this->tiltRepeats())) return false;
}
// If the blind is currently moving then the command to stop it
// will occur on its own when the tilt target is set.