From 6cbf9d72d5e7fe5bf739fab59efe6a70b5957fee Mon Sep 17 00:00:00 2001 From: Sleeper85 Date: Tue, 25 Nov 2025 00:08:49 +0100 Subject: [PATCH] YamBMS 1.6.0 - Max requested current in A --- .../YamBMS_HA_Dashboard_DEMO.yaml | 10 +++---- .../YamBMS_HA_Dashboard_JK_RS485_3xBMS.yaml | 10 +++---- .../YamBMS_HA_Dashboard_JK_RS485_7xBMS.yaml | 10 +++---- ...MS_HA_Dashboard_JK_UART-GPS_BLE_3xBMS.yaml | 10 +++---- .../YamBMS_HA_Dashboard_without_BMS.yaml | 10 +++---- packages/yambms/yambms_combine.yaml | 12 ++++----- packages/yambms/yambms_core.yaml | 26 +++++++++---------- 7 files changed, 44 insertions(+), 44 deletions(-) diff --git a/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_DEMO.yaml b/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_DEMO.yaml index 82de63c..b826580 100644 --- a/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_DEMO.yaml +++ b/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_DEMO.yaml @@ -325,13 +325,13 @@ views: title: YamBMS - ReBulk - type: entities entities: - - entity: number.yambms_demo_yambms_1_max_charge_current_percent - name: Max charge current (%) - - entity: number.yambms_demo_yambms_1_max_discharge_current_percent - name: Max discharge current (%) + - entity: number.yambms_demo_yambms_1_max_requested_charge_current + name: Max charge current + - entity: number.yambms_demo_yambms_1_max_requested_discharge_current + name: Max discharge current - entity: switch.yambms_demo_yambms_1_temperature_based_current_limitation name: Temperature-based current limitation - title: YamBMS - Max current + title: YamBMS - Max requested current - type: entities entities: - entity: switch.yambms_demo_yambms_1_request_force_charge diff --git a/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_JK_RS485_3xBMS.yaml b/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_JK_RS485_3xBMS.yaml index 3aefd32..20f1146 100644 --- a/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_JK_RS485_3xBMS.yaml +++ b/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_JK_RS485_3xBMS.yaml @@ -299,13 +299,13 @@ views: title: YamBMS - ReBulk - type: entities entities: - - entity: number.yambms_yambms_1_max_charge_current_percent - name: Max charge current (%) - - entity: number.yambms_yambms_1_max_discharge_current_percent - name: Max discharge current (%) + - entity: number.yambms_yambms_1_max_requested_charge_current + name: Max charge current + - entity: number.yambms_yambms_1_max_requested_discharge_current + name: Max discharge current - entity: switch.yambms_yambms_1_temperature_based_current_limitation name: Temperature-based current limitation - title: YamBMS - Max current + title: YamBMS - Max requested current - type: entities entities: - entity: switch.yambms_yambms_1_request_force_charge diff --git a/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_JK_RS485_7xBMS.yaml b/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_JK_RS485_7xBMS.yaml index 043eab1..10da560 100644 --- a/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_JK_RS485_7xBMS.yaml +++ b/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_JK_RS485_7xBMS.yaml @@ -299,13 +299,13 @@ views: title: YamBMS - ReBulk - type: entities entities: - - entity: number.yambms_yambms_1_max_charge_current_percent - name: Max charge current (%) - - entity: number.yambms_yambms_1_max_discharge_current_percent - name: Max discharge current (%) + - entity: number.yambms_yambms_1_max_requested_charge_current + name: Max charge current + - entity: number.yambms_yambms_1_max_requested_discharge_current + name: Max discharge current - entity: switch.yambms_yambms_1_temperature_based_current_limitation name: Temperature-based current limitation - title: YamBMS - Max current + title: YamBMS - Max requested current - type: entities entities: - entity: switch.yambms_yambms_1_request_force_charge diff --git a/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_JK_UART-GPS_BLE_3xBMS.yaml b/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_JK_UART-GPS_BLE_3xBMS.yaml index 3d841ab..b915e98 100644 --- a/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_JK_UART-GPS_BLE_3xBMS.yaml +++ b/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_JK_UART-GPS_BLE_3xBMS.yaml @@ -299,13 +299,13 @@ views: title: YamBMS - ReBulk - type: entities entities: - - entity: number.yambms_yambms_1_max_charge_current_percent - name: Max charge current (%) - - entity: number.yambms_yambms_1_max_discharge_current_percent - name: Max discharge current (%) + - entity: number.yambms_yambms_1_max_requested_charge_current + name: Max charge current + - entity: number.yambms_yambms_1_max_requested_discharge_current + name: Max discharge current - entity: switch.yambms_yambms_1_temperature_based_current_limitation name: Temperature-based current limitation - title: YamBMS - Max current + title: YamBMS - Max requested current - type: entities entities: - entity: switch.yambms_yambms_1_request_force_charge diff --git a/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_without_BMS.yaml b/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_without_BMS.yaml index e19e7b9..9e11ba1 100644 --- a/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_without_BMS.yaml +++ b/HomeAssistant_Dashboards/YamBMS_HA_Dashboard_without_BMS.yaml @@ -299,13 +299,13 @@ views: title: YamBMS - ReBulk - type: entities entities: - - entity: number.yambms_yambms_1_max_charge_current_percent - name: Max charge current (%) - - entity: number.yambms_yambms_1_max_discharge_current_percent - name: Max discharge current (%) + - entity: number.yambms_yambms_1_max_requested_charge_current + name: Max charge current + - entity: number.yambms_yambms_1_max_requested_discharge_current + name: Max discharge current - entity: switch.yambms_yambms_1_temperature_based_current_limitation name: Temperature-based current limitation - title: YamBMS - Max current + title: YamBMS - Max requested current - type: entities entities: - entity: switch.yambms_yambms_1_request_force_charge diff --git a/packages/yambms/yambms_combine.yaml b/packages/yambms/yambms_combine.yaml index 9eedca6..6d1860c 100644 --- a/packages/yambms/yambms_combine.yaml +++ b/packages/yambms/yambms_combine.yaml @@ -273,15 +273,15 @@ interval: // TOTAL max_charge_current float max_charge_current; - float yambms_max_charge_current = ${yambms_max_requested_charge_current}; + float yambms_max_charge_current = id(${yambms_id}_max_requested_charge_current).state; float bms_max_charge_current = id(${yambms_id}_var_total_max_charge_current) * 0.9; float rate_max_charge_current; float charge_rate; if (bms_max_charge_current > yambms_max_charge_current) - max_charge_current = yambms_max_charge_current * (id(${yambms_id}_max_charge_current_pct).state / 100); + max_charge_current = yambms_max_charge_current; else - max_charge_current = bms_max_charge_current * (id(${yambms_id}_max_charge_current_pct).state / 100); + max_charge_current = bms_max_charge_current; if (id(${yambms_id}_switch_temperature_based_current_limitation).state) { @@ -318,15 +318,15 @@ interval: // TOTAL max_discharge_current float max_discharge_current; - float yambms_max_discharge_current = ${yambms_max_requested_discharge_current}; + float yambms_max_discharge_current = id(${yambms_id}_max_requested_discharge_current).state; float bms_max_discharge_current = id(${yambms_id}_var_total_max_discharge_current) * 0.9; float rate_max_discharge_current; float discharge_rate; if (bms_max_discharge_current > yambms_max_discharge_current) - max_discharge_current = yambms_max_discharge_current * (id(${yambms_id}_max_discharge_current_pct).state / 100); + max_discharge_current = yambms_max_discharge_current; else - max_discharge_current = bms_max_discharge_current * (id(${yambms_id}_max_discharge_current_pct).state / 100); + max_discharge_current = bms_max_discharge_current; if (id(${yambms_id}_switch_temperature_based_current_limitation).state) { diff --git a/packages/yambms/yambms_core.yaml b/packages/yambms/yambms_core.yaml index 909091d..cb93191 100644 --- a/packages/yambms/yambms_core.yaml +++ b/packages/yambms/yambms_core.yaml @@ -1,4 +1,4 @@ -# Updated : 2025.11.23 +# Updated : 2025.11.24 # Version : 1.6.0 # GitHub : https://github.com/Sleeper85/esphome-yambms @@ -249,28 +249,28 @@ number: entity_category: config # internal: true - platform: template - name: "${name} ${yambms_name} Max charge current percent" - id: "${yambms_id}_max_charge_current_pct" - step: 1 + name: "${name} ${yambms_name} Max requested charge current" + id: "${yambms_id}_max_requested_charge_current" + step: 5 min_value: 0 - max_value: 100 + max_value: ${yambms_max_requested_charge_current} restore_value: true mode: "${yambms_input_number_mode}" - initial_value: 100 - unit_of_measurement: '%' + initial_value: ${yambms_max_requested_charge_current} + unit_of_measurement: A icon: mdi:current-dc optimistic: true entity_category: config - platform: template - name: "${name} ${yambms_name} Max discharge current percent" - id: "${yambms_id}_max_discharge_current_pct" - step: 1 + name: "${name} ${yambms_name} Max requested discharge current" + id: "${yambms_id}_max_requested_discharge_current" + step: 5 min_value: 0 - max_value: 100 + max_value: ${yambms_max_requested_discharge_current} restore_value: true mode: "${yambms_input_number_mode}" - initial_value: 100 - unit_of_measurement: '%' + initial_value: ${yambms_max_requested_discharge_current} + unit_of_measurement: A icon: mdi:current-dc optimistic: true entity_category: config