From d97f150439e81919b2f3be70f6ec0f0e48045523 Mon Sep 17 00:00:00 2001 From: Robert Strouse Date: Wed, 15 Nov 2023 09:43:43 -0800 Subject: [PATCH] Fix issue #192. Movement continues to my position when finished. --- ConfigSettings.h | 2 +- Somfy.cpp | 10 +++++----- SomfyController.ino.esp32.bin | Bin 1272624 -> 1272624 bytes SomfyController.littlefs.bin | Bin 1441792 -> 1441792 bytes data/appversion | 2 +- data/index.html | 8 ++++---- data/index.js | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ConfigSettings.h b/ConfigSettings.h index 5913c22..64e909d 100644 --- a/ConfigSettings.h +++ b/ConfigSettings.h @@ -3,7 +3,7 @@ #ifndef configsettings_h #define configsettings_h -#define FW_VERSION "v2.2.1" +#define FW_VERSION "v2.2.2b" enum DeviceStatus { DS_OK = 0, DS_ERROR = 1, diff --git a/Somfy.cpp b/Somfy.cpp index 1ecba4a..87eca83 100644 --- a/Somfy.cpp +++ b/Somfy.cpp @@ -937,7 +937,7 @@ void SomfyShade::checkMovement() { bool tilt_first = this->tiltType == tilt_types::integrated && ((this->direction == -1 && this->currentTiltPos != 0.0f) || (this->direction == 1 && this->currentTiltPos != 100.0f)); this->p_tiltDirection(this->currentTiltPos == this->tiltTarget ? 0 : this->currentTiltPos > this->tiltTarget ? -1 : 1); - if(tilt_first) { this->p_tiltDirection(this->direction); } + if(tilt_first) this->p_tiltDirection(this->direction); else if(this->direction != 0) this->p_tiltDirection(0); uint8_t currPos = floor(this->currentPos); uint8_t currTiltPos = floor(this->currentTiltPos); @@ -1128,11 +1128,11 @@ void SomfyShade::checkMovement() { if(this->settingTiltPos) { if(this->tiltType == tilt_types::integrated) { // If this is an integrated tilt mechanism the we will simply let it finish. If it is not then we will stop it. - if(this->tiltTarget != 100.0 || this->currentPos != 100.0) SomfyRemote::sendCommand(somfy_commands::My, this->repeats); + if(this->tiltTarget != 100.0f || this->currentTiltPos != 100.0f) SomfyRemote::sendCommand(somfy_commands::My, this->repeats); } else { - // This is a tilt motor so let it complete if it is going to 0. - if(this->tiltTarget != 100.0) SomfyRemote::sendCommand(somfy_commands::My, this->repeats); + // This is a tilt motor so let it complete if it is going to 100. + if(this->tiltTarget != 100.0f) SomfyRemote::sendCommand(somfy_commands::My, this->repeats); } } this->p_tiltDirection(0); @@ -1177,7 +1177,7 @@ void SomfyShade::checkMovement() { if(this->settingTiltPos) { if(this->tiltType == tilt_types::integrated) { // If this is an integrated tilt mechanism the we will simply let it finish. If it is not then we will stop it. - if(this->tiltTarget != 0.0 || this->currentPos != 0.0) SomfyRemote::sendCommand(somfy_commands::My, this->repeats); + if(this->tiltTarget != 0.0 || this->currentTiltPos != 0.0) SomfyRemote::sendCommand(somfy_commands::My, this->repeats); } else { // This is a tilt motor so let it complete if it is going to 0. diff --git a/SomfyController.ino.esp32.bin b/SomfyController.ino.esp32.bin index 943d545e660ce2a96b6e4a78830a6309770bd284..8662c144ee51bed2b473bcced156e66345ba507d 100644 GIT binary patch delta 190 zcmdmR&3D5!-w7KO!XAFR`CIm{hRC_2A?}NEKe!&87G!O%+4sTs$MIm#p39RJ`2sd8 zFxIj$86`E(XK$a+&IrUzK+FupEZgU^v+_wZ>TO@A#2U@WsMpS=!V1J}K+F!r96-zo z#9Tnk4a7V^%)6aSg)b?Qc^@oHALFFJQ9* zV=Wt#Aw%vNt-T9r`^IQ3Vm>-A*fLL&Qeyh-er;0}wM?dDRw9dQ5x4yz7 ZYu<8CbH>oEeJy(>?>}>lwqjV@3ji-qLR0_% diff --git a/SomfyController.littlefs.bin b/SomfyController.littlefs.bin index a9875f5435da90416c41c577ba70d9ccb959a375..e3019589474a12b5e58d73496afd7240c2424f30 100644 GIT binary patch delta 1998 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 - - - + + + - +
diff --git a/data/index.js b/data/index.js index a745c92..186d0b7 100644 --- a/data/index.js +++ b/data/index.js @@ -1252,7 +1252,7 @@ var security = new Security(); class General { initialized = false; - appVersion = 'v2.2.1'; + appVersion = 'v2.2.2b'; reloadApp = false; init() { if (this.initialized) return;