Moved "broadcast_changes_to_all_BMS" to a NEW switch.

txubelaxu · txubelaxu · commit 932397da24fb · 2024-08-12T09:25:52.000+02:00
See esp32-S3-example-jkpb-rs485_0master_2slaves.yaml or esp32-S3-example-jkpb-rs485_0master_7slaves.yaml. Those examples has been adapted with this change.
diff --git a/components/jk_rs485_sniffer/__init__.py b/components/jk_rs485_sniffer/__init__.py
@@ -11,7 +11,6 @@
 CONF_RX_TIMEOUT = "rx_timeout"
 CONF_PROTOCOL_VERSION = "protocol_version"
 CONF_TALK_PIN = "talk_pin"
-CONF_BROADCAST_TO_ALL_BMS = "broadcast_to_all_bms"
 
 jk_rs485_sniffer_ns = cg.esphome_ns.namespace("jk_rs485_sniffer")
 
@@ -41,7 +40,6 @@
             cv.Optional(
                 CONF_RX_TIMEOUT, default="50ms"
             ): cv.positive_time_period_milliseconds,            
-            cv.Required(CONF_BROADCAST_TO_ALL_BMS): cv.boolean,
         }
     )
     .extend(cv.COMPONENT_SCHEMA)
@@ -70,7 +68,7 @@ async def to_code(config):
     else:
        cg.add(var.set_talk_pin_needed(False))
 
-    cg.add(var.set_broadcast_to_all_bms(config[CONF_BROADCAST_TO_ALL_BMS]))    
+
 
 def jk_rs485_sniffer_device_schema():
     schema = {
diff --git a/components/jk_rs485_sniffer/jk_rs485_sniffer.cpp b/components/jk_rs485_sniffer/jk_rs485_sniffer.cpp
@@ -69,6 +69,24 @@ uint16_t chksum(const uint8_t data[], const uint16_t len) {
 }
 
 
+void JkRS485Sniffer::set_broadcast_changes_to_all_bms(bool state) {
+    this->broadcast_changes_to_all_bms_ = state;
+    if (state) {
+      ESP_LOGD(TAG, "Broadcast to All BMSs ACTIVATED");
+      // Aquí puedes añadir el código que se ejecuta cuando se activa
+    } else {
+      ESP_LOGD(TAG, "Broadcast to All BMSs DEACTIVATED");
+      // Aquí puedes añadir el código que se ejecuta cuando se desactiva
+    }
+}
+
+
+
+bool JkRS485Sniffer::get_broadcast_changes_to_all_bms() const {
+    return this->broadcast_changes_to_all_bms_;
+}
+
+
 void JkRS485Sniffer::handle_bms2sniffer_event(std::uint8_t slave_address, std::string event, std::uint8_t frame_type){
   // Maneja el evento aquí. Por ejemplo, puedes imprimir el evento:
   ESP_LOGD(TAG,"Received Event from BMS.. [address:0x%02X] @ %d -->  %s", slave_address, frame_type, event.c_str());
@@ -110,7 +128,7 @@ void JkRS485Sniffer::handle_bms2sniffer_switch_or_number_uint32_event(std::uint8
     send_command_switch_or_number_to_slave_uint32(slave_address,third_element_of_frame,register_address,value);
   }
 
-  if (this->broadcast_to_all_bms_==true){
+  if (this->broadcast_changes_to_all_bms_==true){
     for (uint8_t j = 1; j < 16; ++j) {
         if (rs485_network_node[j].available && slave_address!=j) {
             delayMicroseconds(50000);
@@ -137,7 +155,7 @@ void JkRS485Sniffer::handle_bms2sniffer_switch_or_number_int32_event(std::uint8_
     send_command_switch_or_number_to_slave_int32(slave_address,third_element_of_frame,register_address,value);
   }
 
-  if (this->broadcast_to_all_bms_==true){
+  if (this->broadcast_changes_to_all_bms_==true){
     for (uint8_t j = 1; j < 16; ++j) {
         if (rs485_network_node[j].available && slave_address!=j) {
             delayMicroseconds(50000);
@@ -159,7 +177,7 @@ void JkRS485Sniffer::handle_bms2sniffer_switch_or_number_uint16_event(std::uint8
     rs485_network_node[slave_address].last_device_info_request_received_OK=0;
   }
 
-  if (this->broadcast_to_all_bms_==true){
+  if (this->broadcast_changes_to_all_bms_==true){
     for (uint8_t j = 1; j < 16; ++j) {
         if (rs485_network_node[j].available && slave_address!=j) {
             delayMicroseconds(50000);
diff --git a/components/jk_rs485_sniffer/jk_rs485_sniffer.h b/components/jk_rs485_sniffer/jk_rs485_sniffer.h
@@ -27,6 +27,9 @@ class JkRS485Sniffer : public uart::UARTDevice, public output::TalkPin, public C
   JkRS485Sniffer() = default;
 
 
+  void set_broadcast_changes_to_all_bms(bool state);
+  bool get_broadcast_changes_to_all_bms() const;
+
   void set_talk_pin(GPIOPin *pin) { talk_pin_ = pin; }
   void set_talk_pin_needed(bool talk_pin_needed) { talk_pin_needed_= talk_pin_needed;}
 
@@ -51,7 +54,6 @@ class JkRS485Sniffer : public uart::UARTDevice, public output::TalkPin, public C
         rs485_network_node[cont].counter_cell_info_received=0;
         rs485_network_node[cont].counter_device_settings_received=0;
         rs485_network_node[cont].counter_device_info_received=0;  
-        
     }    
     last_master_activity=0;
     last_message_received_acting_as_master=0;
@@ -81,8 +83,6 @@ class JkRS485Sniffer : public uart::UARTDevice, public output::TalkPin, public C
 
   void set_rx_timeout(uint16_t rx_timeout) { rx_timeout_ = rx_timeout; }
 
-  void set_broadcast_to_all_bms (bool broadcast_to_all_bms) { broadcast_to_all_bms_ = broadcast_to_all_bms; }
-
   void handle_bms2sniffer_event(std::uint8_t slave_address, std::string event, std::uint8_t frame_type);
 
   void handle_bms2sniffer_switch_or_number_uint32_event(std::uint8_t slave_address, std::uint8_t third_element_of_frame, std::uint16_t register_address, std::uint32_t value);
@@ -114,7 +114,7 @@ class JkRS485Sniffer : public uart::UARTDevice, public output::TalkPin, public C
 
   std::vector<uint8_t> rx_buffer_;
   uint16_t rx_timeout_{50};
-  bool broadcast_to_all_bms_;
+  bool broadcast_changes_to_all_bms_;
   uint32_t last_jk_rs485_network_activity_{0};
   uint32_t last_jk_rs485_pooling_trial_{0};
   std::vector<JkRS485SnifferDevice *> devices_;  
diff --git a/esp32-S3-example-jkpb-rs485_0master_2slaves.yaml b/esp32-S3-example-jkpb-rs485_0master_2slaves.yaml
@@ -107,14 +107,13 @@ uart:
     rx_buffer_size: 500
     tx_pin: ${tx_pin_uart_0}
     rx_pin: ${rx_pin_uart_0}
-    
+
 jk_rs485_sniffer:
   - id: sniffer0
     protocol_version: "JK02_32S"
     rx_timeout: 500ms
     uart_id: uart_0
     talk_pin: ${talk_pin_rs485}
-    broadcast_to_all_bms: true
 
 jk_rs485_bms:
   - id: bms0
@@ -691,8 +690,20 @@ sensor:
     cell_overvoltage_protection_release_time:    
       name: "${bms1_name} cell overvoltage protection release time"
 
-
 switch:
+  - platform: template
+    name: "Broadcast changes to all BMSs"
+    id: broadcast_active
+    icon: "mdi:cast"
+    restore_mode: RESTORE_DEFAULT_ON
+    optimistic: true
+    turn_on_action:
+      - lambda: |-
+          id(sniffer0).set_broadcast_changes_to_all_bms(true);  
+    turn_off_action:
+      - lambda: |-
+          id(sniffer0).set_broadcast_changes_to_all_bms(false);          
+
   - platform: jk_rs485_bms
     jk_rs485_bms_id: bms0
     precharging:
@@ -759,6 +770,7 @@ switch:
       name: "${bms1_name} port selection"
     special_charger:
       name: "${bms1_name} special charger" 
+      
 
 text_sensor:
   # +--------------------------------------+
diff --git a/esp32-S3-example-jkpb-rs485_0master_7slaves.yaml b/esp32-S3-example-jkpb-rs485_0master_7slaves.yaml
@@ -119,7 +119,6 @@ jk_rs485_sniffer:
     rx_timeout: 500ms
     uart_id: uart_0
     talk_pin: ${talk_pin_rs485}
-    broadcast_to_all_bms: true
 
 jk_rs485_bms:
   - id: bms0
@@ -2075,6 +2074,19 @@ sensor:
 
 
 switch:
+  - platform: template
+    name: "Broadcast changes to all BMSs"
+    id: broadcast_active
+    icon: "mdi:cast"
+    restore_mode: RESTORE_DEFAULT_ON
+    optimistic: true
+    turn_on_action:
+      - lambda: |-
+          id(sniffer0).set_broadcast_to_all_bms(true);  
+    turn_off_action:
+      - lambda: |-
+          id(sniffer0).set_broadcast_to_all_bms(false);   
+
   - platform: jk_rs485_bms
     jk_rs485_bms_id: bms0
     precharging:
