forgot formatting again... :p

Author: Kevin Hübner

components/soyosource_virtual_meter/__init__.py

@@ -91,8 +91,12 @@ def validate_min_max(config):
             ): cv.int_range(min=1, max=5400),
             cv.Optional(CONF_ZERO_OUTPUT_ON_MIN_POWER_DEMAND, default=True): cv.boolean,
             cv.Optional(
-                CONF_MAX_POWER_SENSOR_LATENCY_MS, default=DEFAULT_MAX_POWER_SENSOR_LATENCY_MS
-            ): cv.int_range(min=DEFAULT_MIN_MAX_POWER_SENSOR_LATENCY_MS, max=DEFAULT_MAX_MAX_POWER_SENSOR_LATENCY_MS),
+                CONF_MAX_POWER_SENSOR_LATENCY_MS,
+                default=DEFAULT_MAX_POWER_SENSOR_LATENCY_MS,
+            ): cv.int_range(
+                min=DEFAULT_MIN_MAX_POWER_SENSOR_LATENCY_MS,
+                max=DEFAULT_MAX_MAX_POWER_SENSOR_LATENCY_MS,
+            ),
         }
     )
     .extend(soyosource_modbus.soyosource_modbus_device_schema(0x24))
@@ -124,7 +128,11 @@ async def to_code(config):
         )
     )
     cg.add(var.set_power_demand_calculation(config[CONF_POWER_DEMAND_CALCULATION]))
-    cg.add(var.set_power_demand_compensation_timeout_ms(config[CONF_MAX_POWER_SENSOR_LATENCY_MS]))
+    cg.add(
+        var.set_power_demand_compensation_timeout_ms(
+            config[CONF_MAX_POWER_SENSOR_LATENCY_MS]
+        )
+    )
 
     if CONF_OPERATION_STATUS_ID in config:
         operation_status_sensor = await cg.get_variable(

components/soyosource_virtual_meter/soyosource_virtual_meter.cpp

@@ -21,7 +21,7 @@ void SoyosourceVirtualMeter::setup() {
 
     this->last_power_demand_received_ = millis();
 
-    //if update intervall is set to never, trigger the update() method from here
+    // if update intervall is set to never, trigger the update() method from here
     if (this->get_update_interval() == -1) {
       this->update();
     }
@@ -112,7 +112,7 @@ int16_t SoyosourceVirtualMeter::calculate_power_demand_negative_measurements_(in
   //     -700           -690         10          500               -200           0
   int16_t importing_now = consumption - this->buffer_;
 
-  reset_power_demand_compensation(importing_now);
+  reset_power_demand_compensation_(importing_now);
 
   int16_t power_demand = importing_now + last_power_demand - this->power_demand_compensation_;
 
@@ -124,18 +124,20 @@ int16_t SoyosourceVirtualMeter::calculate_power_demand_negative_measurements_(in
     power_demand = (this->zero_output_on_min_power_demand_) ? 0 : this->min_power_demand_;
   }
 
-  ESP_LOGD(TAG, "'%s': updated power_demand_compensation_ from %d", this->get_modbus_name(), this->power_demand_compensation_);
-  //only reduction of compensation but keep old demand:
+  ESP_LOGD(TAG, "'%s': updated power_demand_compensation_ from %d", this->get_modbus_name(),
+           this->power_demand_compensation_);
+  // only reduction of compensation but keep old demand:
   if (this->power_demand_compensation_ != 0 && ((importing_now > 0 && power_demand < last_power_demand) ||
-                                         (importing_now < 0 && power_demand > last_power_demand))) {
+                                                (importing_now < 0 && power_demand > last_power_demand))) {
     this->power_demand_compensation_ += power_demand - last_power_demand;
     power_demand = last_power_demand;
     ESP_LOGD(TAG, "'%s': Oscillation prevention, keeping previous demand: %d; reducing compensation",
              this->get_modbus_name(), last_power_demand);
   } else {
     this->power_demand_compensation_ += power_demand - last_power_demand;
   }
-  ESP_LOGD(TAG, "'%s': updated power_demand_compensation_ to %d", this->get_modbus_name(), this->power_demand_compensation_);
+  ESP_LOGD(TAG, "'%s': updated power_demand_compensation_ to %d", this->get_modbus_name(),
+           this->power_demand_compensation_);
 
   return power_demand;
 }
@@ -222,13 +224,15 @@ void SoyosourceVirtualMeter::publish_state_(text_sensor::TextSensor *text_sensor
   text_sensor->publish_state(state);
 }
 
-void SoyosourceVirtualMeter::reset_power_demand_compensation(int16_t importing_now) {
-  //reset on zero crossing or timeout
-  if (importing_now == 0 || (this->power_demand_compensation_ > 0 && importing_now < 0)
-      || (this->power_demand_compensation_ < 0 && importing_now > 0)
-      || this->power_demand_compensation_timestamp_ + this->power_demand_compensation_timeout_ms_ < millis()) {
+void SoyosourceVirtualMeter::reset_power_demand_compensation_(int16_t importing_now) {
+  // reset on zero crossing or timeout
+  if (importing_now == 0 || (this->power_demand_compensation_ > 0 && importing_now < 0) ||
+      (this->power_demand_compensation_ < 0 && importing_now > 0) ||
+      this->power_demand_compensation_timestamp_ + this->power_demand_compensation_timeout_ms_ < millis()) {
     ESP_LOGD(TAG, "'%s': reset power_demand_compensation_ to 0 %s", this->get_modbus_name(),
-             this->power_demand_compensation_timestamp_ + this->power_demand_compensation_timeout_ms_ < millis() ? "after timout" : "after zero crossing");
+             this->power_demand_compensation_timestamp_ + this->power_demand_compensation_timeout_ms_ < millis()
+                 ? "after timout"
+                 : "after zero crossing");
     this->power_demand_compensation_timestamp_ = millis();
     this->power_demand_compensation_ = 0;
   }

components/soyosource_virtual_meter/soyosource_virtual_meter.h

@@ -47,7 +47,9 @@ class SoyosourceVirtualMeter : public PollingComponent, public soyosource_modbus
   void set_power_demand_divider_number(number::Number *power_demand_divider_number) {
     power_demand_divider_number_ = power_demand_divider_number;
   }
-  void set_power_demand_compensation_timeout_ms(uint16_t power_demand_compensation_timeout_ms) { this->power_demand_compensation_timeout_ms_ = power_demand_compensation_timeout_ms; }
+  void set_power_demand_compensation_timeout_ms(uint16_t power_demand_compensation_timeout_ms) {
+    this->power_demand_compensation_timeout_ms_ = power_demand_compensation_timeout_ms;
+  }
 
   void set_manual_mode_switch(switch_::Switch *manual_mode_switch) { manual_mode_switch_ = manual_mode_switch; }
   void set_emergency_power_off_switch(switch_::Switch *emergency_power_off_switch) {
@@ -107,7 +109,7 @@ class SoyosourceVirtualMeter : public PollingComponent, public soyosource_modbus
   int16_t calculate_power_demand_negative_measurements_(int16_t consumption, uint16_t last_power_demand);
   int16_t calculate_power_demand_restart_on_crossing_zero_(int16_t consumption, uint16_t last_power_demand);
   int16_t calculate_power_demand_oem_(int16_t consumption);
-  void reset_power_demand_compensation(int16_t importing_now);
+  void reset_power_demand_compensation_(int16_t importing_now);
 };
 
 }  // namespace soyosource_virtual_meter