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

Issue stop command prior to issuing tilt positions.

Browse source
This commit is contained in:
Robert Strouse 2023-04-26 08:42:44 -07:00
parent 8ca1957d38
commit 2c036f664c
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Somfy.cpp
View file

@ -574,12 +574,11 @@ void SomfyShade::checkMovement() {
// If we need to stop the shade do this before we indicate that we are // If we need to stop the shade do this before we indicate that we are
// not moving otherwise the my function will kick in. // not moving otherwise the my function will kick in.
if(this->settingPos) { if(this->settingPos) {
SomfyRemote::sendCommand(somfy_commands::My);
if(!isAtTarget()) { if(!isAtTarget()) {
// We now need to move the tilt to the position we requested. // We now need to move the tilt to the position we requested.
this->moveToTiltTarget(this->tiltTarget); this->moveToTiltTarget(this->tiltTarget);
} }
else
SomfyRemote::sendCommand(somfy_commands::My);
} }
this->direction = 0; this->direction = 0;
this->tiltStart = millis(); this->tiltStart = millis();
@ -617,12 +616,11 @@ void SomfyShade::checkMovement() {
// If we need to stop the shade do this before we indicate that we are // If we need to stop the shade do this before we indicate that we are
// not moving otherwise the my function will kick in. // not moving otherwise the my function will kick in.
if(this->settingPos) { if(this->settingPos) {
SomfyRemote::sendCommand(somfy_commands::My);
if(!isAtTarget()) { if(!isAtTarget()) {
// We now need to move the tilt to the position we requested. // We now need to move the tilt to the position we requested.
this->moveToTiltTarget(this->tiltTarget); this->moveToTiltTarget(this->tiltTarget);
} }
else
SomfyRemote::sendCommand(somfy_commands::My);
} }
this->direction = 0; this->direction = 0;
this->tiltStart = millis(); this->tiltStart = millis();
@ -1023,9 +1021,9 @@ void SomfyShade::processFrame(somfy_frame_t &frame, bool internal) {
break; break;
case somfy_commands::MyUp: case somfy_commands::MyUp:
case somfy_commands::StepUp: case somfy_commands::StepUp:
this->lastFrame.processed = true;
if(this->lastFrame.repeats != 0) return; if(this->lastFrame.repeats != 0) return;
dir = 0; dir = 0;
this->lastFrame.processed = true;
// With the step commands and integrated shades // With the step commands and integrated shades
// the motor must tilt in the direction first then move // the motor must tilt in the direction first then move
// so we have to calculate the target with this in mind. // so we have to calculate the target with this in mind.
@ -1038,9 +1036,9 @@ void SomfyShade::processFrame(somfy_frame_t &frame, bool internal) {
break; break;
case somfy_commands::MyDown: case somfy_commands::MyDown:
case somfy_commands::StepDown: case somfy_commands::StepDown:
this->lastFrame.processed = true;
if(this->lastFrame.repeats != 0) return; if(this->lastFrame.repeats != 0) return;
dir = 1; dir = 1;
this->lastFrame.processed = true;
// With the step commands and integrated shades // With the step commands and integrated shades
// the motor must tilt in the direction first then move // the motor must tilt in the direction first then move
// so we have to calculate the target with this in mind. // so we have to calculate the target with this in mind.
@ -1207,7 +1205,7 @@ void SomfyShade::moveToTiltTarget(float target) {
cmd = somfy_commands::Up; cmd = somfy_commands::Up;
else if(target > this->currentTiltPos) else if(target > this->currentTiltPos)
cmd = somfy_commands::Down; cmd = somfy_commands::Down;
if(target > 0.0f && target < 100.0f) { if(target >= 0.0f && target <= 100.0f) {
if(cmd != somfy_commands::My) { if(cmd != somfy_commands::My) {
Serial.print("Moving Tilt to "); Serial.print("Moving Tilt to ");
Serial.print(target); Serial.print(target);

BIN
SomfyController.ino.esp32.bin
View file

Binary file not shown.