add set_debounce_delay() to allow multiple subsequent call of control…

…() method in short delays issue #21

components/cn105/Globals.h

@@ -154,6 +154,7 @@ struct wantedHeatpumpSettings : heatpumpSettings {
     bool hasChanged;
     bool hasBeenSent;
     uint8_t nb_deffered_requests;
+    long lastChange;
     wantedHeatpumpSettings& operator=(const wantedHeatpumpSettings& other) {
         if (this != &other) { // protection contre l'auto-affectation
             heatpumpSettings::operator=(other); // Appel à l'opérateur d'affectation de la classe de base

components/cn105/climate.py

@@ -32,6 +32,7 @@
 CN105Climate = cg.global_ns.class_("CN105Climate", climate.Climate, cg.Component)
 
 CONF_REMOTE_TEMP_TIMEOUT = "remote_temperature_timeout"
+CONF_DEBOUNCE_DELAY = "debounce_delay"
 
 VaneOrientationSelect = cg.global_ns.class_(
     "VaneOrientationSelect", select.Select, cg.Component
@@ -84,7 +85,10 @@ def valid_uart(uart):
         cv.Optional(CONF_VERTICAL_SWING_SELECT): SELECT_SCHEMA,
         cv.Optional(CONF_COMPRESSOR_FREQUENCY_SENSOR): SENSOR_SCHEMA,
         cv.Optional(CONF_ISEE_SENSOR): ISEE_SENSOR_SCHEMA,
-        cv.Optional(CONF_REMOTE_TEMP_TIMEOUT, default="never"): cv.update_interval,
+        cv.Optional(CONF_REMOTE_TEMP_TIMEOUT, default="never"): cv.All(
+            cv.update_interval
+        ),
+        cv.Optional(CONF_DEBOUNCE_DELAY, default="750ms"): cv.All(cv.update_interval),
         # Optionally override the supported ClimateTraits.
         cv.Optional(CONF_SUPPORTS, default={}): cv.Schema(
             {
@@ -127,8 +131,9 @@ def to_code(config):
     for mode in supports[CONF_SWING_MODE]:
         cg.add(traits.add_supported_swing_mode(climate.CLIMATE_SWING_MODES[mode]))
 
-    if CONF_REMOTE_TEMP_TIMEOUT in config:
-        var.set_remote_temp_timeout(config[CONF_REMOTE_TEMP_TIMEOUT])
+    cg.add(var.set_remote_temp_timeout(config[CONF_REMOTE_TEMP_TIMEOUT]))
+
+    cg.add(var.set_debounce_delay(config[CONF_DEBOUNCE_DELAY]))
 
     if CONF_HORIZONTAL_SWING_SELECT in config:
         conf = config[CONF_HORIZONTAL_SWING_SELECT]

components/cn105/climateControls.cpp

@@ -6,8 +6,9 @@ using namespace esphome;
 
 void CN105Climate::checkPendingWantedSettings() {
 
+    long now = CUSTOM_MILLIS;
 
-    if (this->firstRun) {
+    if ((this->firstRun) || (this->wantedSettings.hasBeenSent) || (now - this->wantedSettings.lastChange < this->debounce_delay_)) {
         return;
     }
     if (this->currentSettings != this->wantedSettings) {
@@ -16,7 +17,7 @@ void CN105Climate::checkPendingWantedSettings() {
             if (!this->wantedSettings.hasBeenSent) {
                 ESP_LOGD(TAG, "checkPendingWantedSettings - wanted settings have changed, sending them to the heatpump...");
                 this->sendWantedSettings();
-                this->set_timeout("checkWantedSettings", 1000, [this]() { this->wantedSettings.hasBeenSent = false; });
+                //this->set_timeout("checkWantedSettings", 1000, [this]() { this->wantedSettings.hasBeenSent = false; });
             }
         } else {
             ESP_LOGI(TAG, "checkPendingWantedSettings - detected a change from IR Remote Control");
@@ -80,6 +81,7 @@ void CN105Climate::control(const esphome::climate::ClimateCall& call) {
         ESP_LOGD(LOG_ACTION_EVT_TAG, "clim.control() -> User changed something...");
         this->wantedSettings.hasChanged = true;
         this->wantedSettings.hasBeenSent = false;
+        this->wantedSettings.lastChange = CUSTOM_MILLIS;
         this->debugSettings("control (wantedSettings)", this->wantedSettings);
 
         // we don't call sendWantedSettings() anymore because it will be called by the loop() method

components/cn105/cn105.cpp

@@ -95,6 +95,11 @@ void CN105Climate::set_remote_temp_timeout(uint32_t timeout) {
     }
 }
 
+void CN105Climate::set_debounce_delay(uint32_t delay) {
+    this->debounce_delay_ = delay;
+    ESP_LOGI(LOG_ACTION_EVT_TAG, "set_debounce_delay is set to %d", delay);
+}
+
 int CN105Climate::get_compressor_frequency() {
     return currentStatus.compressorFrequency;
 }

components/cn105/cn105.h

@@ -84,6 +84,8 @@ class CN105Climate : public climate::Climate, public Component, public uart::UAR
 
     void set_remote_temp_timeout(uint32_t timeout);
 
+    void set_debounce_delay(uint32_t delay);
+
     // this is the ping or heartbeat of the setRemotetemperature for timeout management
     void setExternalTemperatureCheckout();
 
@@ -207,6 +209,7 @@ class CN105Climate : public climate::Climate, public Component, public uart::UAR
     unsigned long lastResponseMs;
 
     uint32_t remote_temp_timeout_;
+    uint32_t debounce_delay_;
 
     int baud_ = 0;
     int tx_pin_ = -1;

components/cn105/componentEntries.cpp

@@ -17,6 +17,11 @@ void CN105Climate::setup() {
     this->swing_mode = climate::CLIMATE_SWING_OFF;
     this->initBytePointer();
     this->lastResponseMs = CUSTOM_MILLIS;
+
+    ESP_LOGI(TAG, "tx_pin: %d rx_pin: %d", this->tx_pin_, this->rx_pin_);
+    ESP_LOGI(TAG, "remote_temp_timeout is set to %d", this->remote_temp_timeout_);
+    ESP_LOGI(TAG, "debounce_delay is set to %d", this->debounce_delay_);
+
     this->setupUART();
     this->sendFirstConnectionPacket();
 }

components/cn105/extraComponents.cpp

@@ -27,6 +27,7 @@ void CN105Climate::set_vertical_vane_select(
         this->setVaneSetting(setting);
         this->wantedSettings.hasChanged = true;
         this->wantedSettings.hasBeenSent = false;
+        this->wantedSettings.lastChange = CUSTOM_MILLIS;
         });
 
 }
@@ -46,6 +47,7 @@ void CN105Climate::set_horizontal_vane_select(
         this->setWideVaneSetting(setting);
         this->wantedSettings.hasChanged = true;
         this->wantedSettings.hasBeenSent = false;
+        this->wantedSettings.lastChange = CUSTOM_MILLIS;
         });
 
 }

components/cn105/hp_readings.cpp

@@ -276,9 +276,9 @@ void CN105Climate::updateSuccess() {
     //this->last_received_packet_sensor->publish_state("0x61: update success");
     // as the update was successful, we can set currentSettings to wantedSettings        
     // even if the next settings request will do the same.
-    if (this->wantedSettings.hasChanged) {
+    if (this->wantedSettings.hasBeenSent) {
         ESP_LOGI(TAG, "And it was a wantedSetting ACK!");
-        this->wantedSettings.hasChanged = false;
+        //this->wantedSettings.hasChanged = false;
         this->wantedSettings.hasBeenSent = false;
         this->wantedSettings.nb_deffered_requests = 0;       // reset the counter which is tested each update_request_interval in buildAndSendRequestsInfoPackets()
         //this->settingsChanged(this->wantedSettings, "WantedSettingsUpdateSuccess");
@@ -370,8 +370,8 @@ void CN105Climate::wantedSettingsUpdateSuccess(heatpumpSettings settings) {
 
     // as wantedSettings has been received with ACK by the heatpump
     // we can update the surrentSettings
-    this->currentSettings = this->wantedSettings;
-    this->debugSettings("current", currentSettings);
+    //this->currentSettings = this->wantedSettings;
+    this->debugSettings("curStgs", currentSettings);
 }
 
 void CN105Climate::extTempUpdateSuccess() {
@@ -388,10 +388,12 @@ void CN105Climate::heatpumpUpdate(heatpumpSettings settings) {
 
     if (this->firstRun) {
         ESP_LOGD(TAG, "first run detected, setting wantedSettings to receivedSettings");
+
         this->wantedSettings = settings;
         this->wantedSettings.hasChanged = false;
         this->wantedSettings.hasBeenSent = false;
         this->wantedSettings.nb_deffered_requests = 0;       // reset the counter which is tested each update_request_interval in buildAndSendRequestsInfoPackets()
+        this->wantedSettings.lastChange = 0;                 // never knew a change
 
         this->firstRun = false;
         this->debugSettings("received", settings);
@@ -410,9 +412,9 @@ void CN105Climate::heatpumpUpdate(heatpumpSettings settings) {
 
             // no difference wt wantedSettings and received ones
             // by security tag wantedSettings hasChanged to false
-            wantedSettings.hasChanged = false;
+            /*this->wantedSettings.hasChanged = false;
             this->wantedSettings.hasBeenSent = false;
-            this->wantedSettings.nb_deffered_requests = 0;
+            this->wantedSettings.nb_deffered_requests = 0;*/
         } else {
             this->debugSettings("current", this->currentSettings);
             this->debugSettings("wanted", this->wantedSettings);

components/cn105/hp_writings.cpp

@@ -161,9 +161,10 @@ void CN105Climate::createPacket(uint8_t* packet, heatpumpSettings settings) {
 void CN105Climate::sendWantedSettings() {
 
     if (this->isHeatpumpConnectionActive() && this->isConnected_) {
-        if (CUSTOM_MILLIS - this->lastSend > 500) {        // we don't want to send too many packets
+        if (CUSTOM_MILLIS - this->lastSend > 100) {        // we don't want to send too many packets
 
             this->wantedSettings.hasBeenSent = true;
+            this->wantedSettings.hasChanged = false;
             this->lastSend = CUSTOM_MILLIS;
             ESP_LOGI(TAG, "sending wantedSettings..");
 

esp32-test.yaml

@@ -45,7 +45,7 @@ logger:
     READ : WARN
     Header: INFO
     Decoder : INFO
-    CONTROL_WANTED_SETTINGS: INFO
+    CONTROL_WANTED_SETTINGS: INFO    
 
 
 # Enable Home Assistant API
@@ -166,8 +166,6 @@ sensor:
         - lambda: |-
             id(esp32_clim).set_remote_temperature(x);
 
-          
-
 uart:
   id: HP_UART
   baud_rate: 2400
@@ -186,9 +184,9 @@ climate:
       name: Orientation de la Vane Horizontale
     isee_sensor:
       name: ISEE Sensor
-    remote_temperature_timeout: 30min
-    update_interval: 10s         # shouldn't be less than 1 second
-
+    remote_temperature_timeout: 5min
+    update_interval: 1s         # shouldn't be less than 1 second
+    debounce_delay : 500ms       # delay to prevent bouncing 
 
 
 # Configuration pour l'objet 'switch' (bouton)