diff --git a/packages/bms/bms_charging_cycles_base.yaml b/packages/bms/bms_charging_cycles_base.yaml new file mode 100644 index 0000000..94d9a42 --- /dev/null +++ b/packages/bms/bms_charging_cycles_base.yaml @@ -0,0 +1,28 @@ +# Charging cycles adjustment +number: + - platform: template + name: "${name} ${bms_name} charging cycles base" + id: bms${bms_id}_charging_cycles_base + step: 1 + min_value: 0 + max_value: 65535 + restore_value: true + mode: "${yambms_input_number_mode}" + initial_value: 0 + icon: mdi:counter + optimistic: true + entity_category: config + +sensor: + - platform: template + name: "${name} ${bms_name} charging cycles" + id: bms${bms_id}_charging_cycles + update_interval: ${bms_update_interval} + accuracy_decimals: 0 + icon: mdi:counter + filters: + - or: + - throttle: 10s + - delta: 1 + lambda: |- + return id(bms${bms_id}_charging_cycles_raw).state + id(bms${bms_id}_charging_cycles_base).state; diff --git a/packages/bms/bms_combine_JK_BLE_V14_full.yaml b/packages/bms/bms_combine_JK_BLE_V14_full.yaml index af5c490..b17a961 100644 --- a/packages/bms/bms_combine_JK_BLE_V14_full.yaml +++ b/packages/bms/bms_combine_JK_BLE_V14_full.yaml @@ -26,6 +26,7 @@ packages: bms_combine: !include bms_combine.yaml bms_temperature_sensor: !include bms_temperature_sensor_2.yaml bms_errors_bitmask: !include bms_errors_bitmask_JK_BLE.yaml + bms_cycles_base: !include bms_charging_cycles_base.yaml bms_battery_soh: !include bms_battery_soh.yaml ota: @@ -286,7 +287,8 @@ sensor: id: bms${bms_id}_battery_capacity name: "${name} ${bms_name} total battery capacity setting" charging_cycles: - id: bms${bms_id}_charging_cycles + id: bms${bms_id}_charging_cycles_raw + internal: true name: "${name} ${bms_name} charging cycles" total_charging_cycle_capacity: name: "${name} ${bms_name} total charging cycle capacity" diff --git a/packages/bms/bms_combine_JK_BLE_full.yaml b/packages/bms/bms_combine_JK_BLE_full.yaml index 7b0b46e..aed504f 100644 --- a/packages/bms/bms_combine_JK_BLE_full.yaml +++ b/packages/bms/bms_combine_JK_BLE_full.yaml @@ -26,6 +26,7 @@ packages: bms_combine: !include bms_combine.yaml bms_temperature_sensor: !include bms_temperature_sensor_2.yaml bms_errors_bitmask: !include bms_errors_bitmask_JK_BLE.yaml + bms_cycles_base: !include bms_charging_cycles_base.yaml bms_battery_soh: !include bms_battery_soh.yaml ota: @@ -281,7 +282,8 @@ sensor: id: bms${bms_id}_battery_capacity name: "${name} ${bms_name} total battery capacity setting" charging_cycles: - id: bms${bms_id}_charging_cycles + id: bms${bms_id}_charging_cycles_raw + internal: true name: "${name} ${bms_name} charging cycles" total_charging_cycle_capacity: name: "${name} ${bms_name} total charging cycle capacity" diff --git a/packages/bms/bms_combine_JK_BLE_minimal.yaml b/packages/bms/bms_combine_JK_BLE_minimal.yaml index a5c1614..76087ed 100644 --- a/packages/bms/bms_combine_JK_BLE_minimal.yaml +++ b/packages/bms/bms_combine_JK_BLE_minimal.yaml @@ -26,6 +26,7 @@ packages: bms_combine: !include bms_combine.yaml bms_temperature_sensor: !include bms_temperature_sensor_2.yaml bms_errors_bitmask: !include bms_errors_bitmask_JK_BLE.yaml + bms_cycles_base: !include bms_charging_cycles_base.yaml bms_battery_soh: !include bms_battery_soh.yaml ota: @@ -161,7 +162,8 @@ sensor: id: bms${bms_id}_battery_capacity name: "${name} ${bms_name} total battery capacity setting" charging_cycles: - id: bms${bms_id}_charging_cycles + id: bms${bms_id}_charging_cycles_raw + internal: true name: "${name} ${bms_name} charging cycles" total_charging_cycle_capacity: name: "${name} ${bms_name} total charging cycle capacity" diff --git a/packages/bms/bms_combine_JK_RS485_DISPLAY_full.yaml b/packages/bms/bms_combine_JK_RS485_DISPLAY_full.yaml index 42378ad..3891d09 100644 --- a/packages/bms/bms_combine_JK_RS485_DISPLAY_full.yaml +++ b/packages/bms/bms_combine_JK_RS485_DISPLAY_full.yaml @@ -24,6 +24,7 @@ substitutions: packages: bms_base: !include bms_base.yaml bms_combine: !include bms_combine.yaml + bms_cycles_base: !include bms_charging_cycles_base.yaml bms_temperature_sensor: !include bms_temperature_sensor_2.yaml bms_battery_soh: !include bms_battery_soh.yaml @@ -327,7 +328,8 @@ sensor: # FAKE charging_cycles - platform: template - id: bms${bms_id}_charging_cycles + id: bms${bms_id}_charging_cycles_raw + internal: true name: "${name} ${bms_name} charging cycles" update_interval: ${bms_update_interval} accuracy_decimals: 0 diff --git a/packages/bms/bms_combine_JK_RS485_Modbus_bms_minimal.yaml b/packages/bms/bms_combine_JK_RS485_Modbus_bms_minimal.yaml index 3d47acb..ec166fe 100644 --- a/packages/bms/bms_combine_JK_RS485_Modbus_bms_minimal.yaml +++ b/packages/bms/bms_combine_JK_RS485_Modbus_bms_minimal.yaml @@ -22,6 +22,7 @@ packages: bms_combine: !include bms_combine.yaml bms_temperature_sensor: !include bms_temperature_sensor_5.yaml bms_errors_bitmask: !include bms_errors_bitmask_JK_RS485_Modbus.yaml + bms_cycles_base: !include bms_charging_cycles_base.yaml # +--------------------------------------+ # | Component settings | @@ -162,7 +163,8 @@ sensor: id: bms${bms_id}_capacity_remaining_ah name: "${name} ${bms_name} battery capacity remaining" charging_cycles: - id: bms${bms_id}_charging_cycles + id: bms${bms_id}_charging_cycles_raw + internal: true name: "${name} ${bms_name} charging cycles" battery_capacity_total_charging_cycle: name: "${name} ${bms_name} battery capacity total charging cycle" diff --git a/packages/bms/bms_combine_JK_UART_4G-GPS_minimal.yaml b/packages/bms/bms_combine_JK_UART_4G-GPS_minimal.yaml index 40f4b73..9149e2d 100644 --- a/packages/bms/bms_combine_JK_UART_4G-GPS_minimal.yaml +++ b/packages/bms/bms_combine_JK_UART_4G-GPS_minimal.yaml @@ -26,6 +26,7 @@ packages: bms_combine: !include bms_combine.yaml bms_temperature_sensor: !include bms_temperature_sensor_2.yaml bms_errors_bitmask: !include bms_errors_bitmask_JK_UART_4G-GPS.yaml + bms_cycles_base: !include bms_charging_cycles_base.yaml bms_battery_soh: !include bms_battery_soh.yaml # +--------------------------------------+ @@ -136,7 +137,8 @@ sensor: name: "${name} ${bms_name} temperature sensors" entity_category: diagnostic charging_cycles: - id: bms${bms_id}_charging_cycles + id: bms${bms_id}_charging_cycles_raw + internal: true name: "${name} ${bms_name} charging cycles" total_charging_cycle_capacity: name: "${name} ${bms_name} total charging cycle capacity" diff --git a/packages/bms/bms_combine_SEPLOS_V1_V2_RS485_bms_full.yaml b/packages/bms/bms_combine_SEPLOS_V1_V2_RS485_bms_full.yaml index a8afb9c..fee63bc 100644 --- a/packages/bms/bms_combine_SEPLOS_V1_V2_RS485_bms_full.yaml +++ b/packages/bms/bms_combine_SEPLOS_V1_V2_RS485_bms_full.yaml @@ -24,6 +24,7 @@ substitutions: packages: bms_base: !include bms_base.yaml bms_combine: !include bms_combine.yaml + bms_cycles_base: !include bms_charging_cycles_base.yaml bms_temperature_sensor: !include bms_temperature_sensor_4.yaml # +--------------------------------------+ @@ -140,7 +141,8 @@ sensor: id: bms${bms_id}_state_of_charge name: "${name} ${bms_name} state of charge" charging_cycles: - id: bms${bms_id}_charging_cycles + id: bms${bms_id}_charging_cycles_raw + internal: true name: "${name} ${bms_name} charging cycles" state_of_health: id: bms${bms_id}_battery_soh diff --git a/packages/bms/bms_combine_modbus_client.yaml b/packages/bms/bms_combine_modbus_client.yaml index 7ca9492..618388c 100644 --- a/packages/bms/bms_combine_modbus_client.yaml +++ b/packages/bms/bms_combine_modbus_client.yaml @@ -23,6 +23,7 @@ substitutions: packages: bms_combine: !include bms_combine.yaml + bms_cycles_base: !include bms_charging_cycles_base.yaml # +--------------------------------------+ # | Component settings | @@ -179,7 +180,8 @@ sensor: # charging_cycles - platform: modbus_controller modbus_controller_id: modbus_controller${bms_id} - id: bms${bms_id}_charging_cycles + id: bms${bms_id}_charging_cycles_raw + internal: true name: "${name} ${bms_name} charging cycles" register_type: read address: 14 diff --git a/packages/bms/bms_sensors_DEYE_CAN_module_full.yaml b/packages/bms/bms_sensors_DEYE_CAN_module_full.yaml index 8a793fb..df8eb3f 100644 --- a/packages/bms/bms_sensors_DEYE_CAN_module_full.yaml +++ b/packages/bms/bms_sensors_DEYE_CAN_module_full.yaml @@ -16,6 +16,8 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +packages: + bms_cycles_base: !include bms_charging_cycles_base.yaml # +-----------------------------------------------+ @@ -88,7 +90,7 @@ canbus: if(x[1] == 2) id(bms${bms_id}_fault_level).publish_state("serious fault"); id(bms${bms_id}_fault).publish_state(x[1] & 3); float cycles = ((x[3] << 8) | x[2]); - id(bms${bms_id}_charging_cycles).publish_state(cycles); + id(bms${bms_id}_charging_cycles_raw).publish_state(cycles); // Set cell balancing states based on x[4] and x[5] //for (int i = 1; i <= 8; i++) { // std::to_string(high_position).c_str() @@ -361,7 +363,8 @@ sensor: # Charging cycles - platform: template name: "${name} ${bms_name} cycles" - id: "bms${bms_id}_charging_cycles" + id: "bms${bms_id}_charging_cycles_raw" + internal: true state_class: 'measurement' accuracy_decimals: 0 filters: diff --git a/packages/bms/bms_sensors_DEYE_CAN_module_minimal.yaml b/packages/bms/bms_sensors_DEYE_CAN_module_minimal.yaml index 1218637..b0f8ed5 100644 --- a/packages/bms/bms_sensors_DEYE_CAN_module_minimal.yaml +++ b/packages/bms/bms_sensors_DEYE_CAN_module_minimal.yaml @@ -16,6 +16,8 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +packages: + bms_cycles_base: !include bms_charging_cycles_base.yaml # +-----------------------------------------------+ @@ -78,7 +80,7 @@ canbus: if(x[1] == 2) id(bms${bms_id}_fault_level).publish_state("serious fault"); id(bms${bms_id}_fault).publish_state(x[1] & 3); float cycles = ((x[3] << 8) | x[2]); - id(bms${bms_id}_charging_cycles).publish_state(cycles); + id(bms${bms_id}_charging_cycles_raw).publish_state(cycles); id(bms${bms_id}_equalizing).publish_state(x[4] | x[5]); - can_id: 0x55${deye_module_id} @@ -236,7 +238,8 @@ sensor: # Charging cycles - platform: template name: "${name} ${bms_name} cycles" - id: "bms${bms_id}_charging_cycles" + id: "bms${bms_id}_charging_cycles_raw" + internal: true state_class: 'measurement' accuracy_decimals: 0 filters: diff --git a/packages/bms/bms_sensors_FAKE.yaml b/packages/bms/bms_sensors_FAKE.yaml index 6cc444a..971e0d1 100644 --- a/packages/bms/bms_sensors_FAKE.yaml +++ b/packages/bms/bms_sensors_FAKE.yaml @@ -19,6 +19,7 @@ packages: bms_temperature_sensor: !include bms_temperature_sensor_4.yaml + bms_cycles_base: !include bms_charging_cycles_base.yaml sensor: # battery_capacity @@ -301,7 +302,8 @@ sensor: # charging_cycles - platform: template - id: bms${bms_id}_charging_cycles + id: bms${bms_id}_charging_cycles_raw + internal: true name: "${name} ${bms_name} charging cycles" update_interval: ${bms_update_interval} accuracy_decimals: 0 diff --git a/packages/bms/bms_sensors_JBD_BLE_full.yaml b/packages/bms/bms_sensors_JBD_BLE_full.yaml index ba85019..63e6b71 100644 --- a/packages/bms/bms_sensors_JBD_BLE_full.yaml +++ b/packages/bms/bms_sensors_JBD_BLE_full.yaml @@ -21,6 +21,7 @@ packages: bms_base: !include bms_base.yaml bms_temperature_sensor: !include bms_temperature_sensor_6.yaml bms_errors_bitmask: !include bms_errors_bitmask_JBD.yaml + bms_cycles_base: !include bms_charging_cycles_base.yaml bms_battery_soh: !include bms_battery_soh.yaml ota: @@ -116,7 +117,8 @@ sensor: id: bms${bms_id}_battery_capacity name: "${name} ${bms_name} nominal capacity" charging_cycles: - id: bms${bms_id}_charging_cycles + id: bms${bms_id}_charging_cycles_raw + internal: true name: "${name} ${bms_name} charging cycles" capacity_remaining: id: bms${bms_id}_capacity_remaining_ah diff --git a/packages/bms/bms_sensors_JBD_UART_full.yaml b/packages/bms/bms_sensors_JBD_UART_full.yaml index 5c2c2dc..2dd722c 100644 --- a/packages/bms/bms_sensors_JBD_UART_full.yaml +++ b/packages/bms/bms_sensors_JBD_UART_full.yaml @@ -21,6 +21,7 @@ packages: bms_base: !include bms_base.yaml bms_temperature_sensor: !include bms_temperature_sensor_6.yaml bms_errors_bitmask: !include bms_errors_bitmask_JBD.yaml + bms_cycles_base: !include bms_charging_cycles_base.yaml bms_battery_soh: !include bms_battery_soh.yaml # +--------------------------------------+ @@ -101,7 +102,8 @@ sensor: id: bms${bms_id}_battery_capacity name: "${name} ${bms_name} nominal capacity" charging_cycles: - id: bms${bms_id}_charging_cycles + id: bms${bms_id}_charging_cycles_raw + internal: true name: "${name} ${bms_name} charging cycles" capacity_remaining: id: bms${bms_id}_capacity_remaining_ah diff --git a/packages/bms/bms_sensors_JK_BLE_standard.yaml b/packages/bms/bms_sensors_JK_BLE_standard.yaml index 429c1f4..b6af682 100644 --- a/packages/bms/bms_sensors_JK_BLE_standard.yaml +++ b/packages/bms/bms_sensors_JK_BLE_standard.yaml @@ -21,6 +21,7 @@ packages: bms_base: !include bms_base.yaml bms_temperature_sensor: !include bms_temperature_sensor_2.yaml bms_errors_bitmask: !include bms_errors_bitmask_JK_BLE.yaml + bms_cycles_base: !include bms_charging_cycles_base.yaml bms_battery_soh: !include bms_battery_soh.yaml ota: @@ -156,7 +157,8 @@ sensor: id: bms${bms_id}_battery_capacity name: "${name} ${bms_name} total battery capacity setting" charging_cycles: - id: bms${bms_id}_charging_cycles + id: bms${bms_id}_charging_cycles_raw + internal: true name: "${name} ${bms_name} charging cycles" total_charging_cycle_capacity: name: "${name} ${bms_name} total charging cycle capacity" diff --git a/packages/bms/bms_sensors_JK_RS485_Modbus_JK-B_standard.yaml b/packages/bms/bms_sensors_JK_RS485_Modbus_JK-B_standard.yaml index faee43a..1394a9b 100644 --- a/packages/bms/bms_sensors_JK_RS485_Modbus_JK-B_standard.yaml +++ b/packages/bms/bms_sensors_JK_RS485_Modbus_JK-B_standard.yaml @@ -21,6 +21,7 @@ packages: bms_base: !include bms_base.yaml bms_temperature_sensor: !include bms_temperature_sensor_2.yaml bms_errors_bitmask: !include bms_errors_bitmask_JK_RS485_Modbus.yaml + bms_cycles_base: !include bms_charging_cycles_base.yaml # +--------------------------------------+ # | Component settings | @@ -139,7 +140,8 @@ sensor: id: bms${bms_id}_capacity_remaining_ah name: "${name} ${bms_name} battery capacity remaining" charging_cycles: - id: bms${bms_id}_charging_cycles + id: bms${bms_id}_charging_cycles_raw + internal: true name: "${name} ${bms_name} charging cycles" battery_capacity_total_charging_cycle: name: "${name} ${bms_name} battery capacity total charging cycle" diff --git a/packages/bms/bms_sensors_JK_RS485_Modbus_bms_full.yaml b/packages/bms/bms_sensors_JK_RS485_Modbus_bms_full.yaml index f878aeb..450b0d4 100644 --- a/packages/bms/bms_sensors_JK_RS485_Modbus_bms_full.yaml +++ b/packages/bms/bms_sensors_JK_RS485_Modbus_bms_full.yaml @@ -21,6 +21,7 @@ packages: bms_base: !include bms_base.yaml bms_temperature_sensor: !include bms_temperature_sensor_5.yaml bms_errors_bitmask: !include bms_errors_bitmask_JK_RS485_Modbus.yaml + bms_cycles_base: !include bms_charging_cycles_base.yaml # +--------------------------------------+ # | Component settings | @@ -318,7 +319,8 @@ sensor: name: "${name} ${bms_name} battery capacity remaining" charging_cycles: - id: bms${bms_id}_charging_cycles + id: bms${bms_id}_charging_cycles_raw + internal: true name: "${name} ${bms_name} charging cycles" battery_capacity_total_charging_cycle: name: "${name} ${bms_name} battery capacity total charging cycle" diff --git a/packages/bms/bms_sensors_JK_RS485_Modbus_bms_standard.yaml b/packages/bms/bms_sensors_JK_RS485_Modbus_bms_standard.yaml index fff67d4..256b9f9 100644 --- a/packages/bms/bms_sensors_JK_RS485_Modbus_bms_standard.yaml +++ b/packages/bms/bms_sensors_JK_RS485_Modbus_bms_standard.yaml @@ -21,6 +21,7 @@ packages: bms_base: !include bms_base.yaml bms_temperature_sensor: !include bms_temperature_sensor_5.yaml bms_errors_bitmask: !include bms_errors_bitmask_JK_RS485_Modbus.yaml + bms_cycles_base: !include bms_charging_cycles_base.yaml # +--------------------------------------+ # | Component settings | @@ -161,7 +162,8 @@ sensor: id: bms${bms_id}_capacity_remaining_ah name: "${name} ${bms_name} battery capacity remaining" charging_cycles: - id: bms${bms_id}_charging_cycles + id: bms${bms_id}_charging_cycles_raw + internal: true name: "${name} ${bms_name} charging cycles" battery_capacity_total_charging_cycle: name: "${name} ${bms_name} battery capacity total charging cycle" diff --git a/packages/bms/bms_sensors_JK_UART_4G-GPS_full.yaml b/packages/bms/bms_sensors_JK_UART_4G-GPS_full.yaml index f8296fa..c7ae46a 100644 --- a/packages/bms/bms_sensors_JK_UART_4G-GPS_full.yaml +++ b/packages/bms/bms_sensors_JK_UART_4G-GPS_full.yaml @@ -21,6 +21,7 @@ packages: bms_base: !include bms_base.yaml bms_temperature_sensor: !include bms_temperature_sensor_2.yaml bms_errors_bitmask: !include bms_errors_bitmask_JK_UART_4G-GPS.yaml + bms_cycles_base: !include bms_charging_cycles_base.yaml bms_battery_soh: !include bms_battery_soh.yaml # +--------------------------------------+ @@ -214,7 +215,8 @@ sensor: name: "${name} ${bms_name} temperature sensors" entity_category: diagnostic charging_cycles: - id: bms${bms_id}_charging_cycles + id: bms${bms_id}_charging_cycles_raw + internal: true name: "${name} ${bms_name} charging cycles" total_charging_cycle_capacity: name: "${name} ${bms_name} total charging cycle capacity"