yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-05 19:42:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove more USER_SETTINGS

Browse source
This commit is contained in:
Daniel Öster 2025-09-01 23:41:18 +03:00
parent 7328f7b99b
commit aba193ca85
5 changed files with 25 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Software/src/battery/DALY-BMS.cpp
View file

@ -27,8 +27,9 @@ void DalyBms::update_values() {
datalayer.battery.status.current_dA = current_dA; //value is *10 (150 = 15.0)
datalayer.battery.status.remaining_capacity_Wh = (remaining_capacity_mAh * (uint32_t)voltage_dV) / 10000;
datalayer.battery.status.max_charge_power_W = (BATTERY_MAX_CHARGE_AMP * voltage_dV) / 100;
datalayer.battery.status.max_discharge_power_W = (BATTERY_MAX_DISCHARGE_AMP * voltage_dV) / 100;
datalayer.battery.status.max_charge_power_W = (datalayer.battery.settings.max_user_set_charge_dA * voltage_dV) / 100;
datalayer.battery.status.max_discharge_power_W =
(datalayer.battery.settings.max_user_set_discharge_dA * voltage_dV) / 100;
// limit power when SoC is low or high
uint32_t adaptive_power_limit = 999999;

18
Software/src/datalayer/datalayer.h
View file

@ -128,18 +128,22 @@ struct DATALAYER_BATTERY_SETTINGS_TYPE {
* will "see" 100% Example 8000 = 80.0%*/
uint16_t max_percentage = 8000;
/** The user specified maximum allowed charge rate, in deciAmpere. 300 = 30.0 A */
uint16_t max_user_set_charge_dA = BATTERY_MAX_CHARGE_AMP;
/** The user specified maximum allowed discharge rate, in deciAmpere. 300 = 30.0 A */
uint16_t max_user_set_discharge_dA = BATTERY_MAX_DISCHARGE_AMP;
/** The user specified maximum allowed charge rate, in deciAmpere. 300 = 30.0 A
* Updates later on via Settings
*/
uint16_t max_user_set_charge_dA = 300;
/** The user specified maximum allowed discharge rate, in deciAmpere. 300 = 30.0 A
* Updates later on via Settings
*/
uint16_t max_user_set_discharge_dA = 300;
/** User specified discharge/charge voltages in use. Set to true to use user specified values */
/** Some inverters like to see a specific target voltage for charge/discharge. Use these values to override automatic voltage limits*/
bool user_set_voltage_limits_active = BATTERY_USE_VOLTAGE_LIMITS;
bool user_set_voltage_limits_active = false;
/** The user specified maximum allowed charge voltage, in deciVolt. 4000 = 400.0 V */
uint16_t max_user_set_charge_voltage_dV = BATTERY_MAX_CHARGE_VOLTAGE;
uint16_t max_user_set_charge_voltage_dV = 4500;
/** The user specified maximum allowed discharge voltage, in deciVolt. 3000 = 300.0 V */
uint16_t max_user_set_discharge_voltage_dV = BATTERY_MAX_DISCHARGE_VOLTAGE;
uint16_t max_user_set_discharge_voltage_dV = 3000;
/** The user specified BMS reset period. Keeps track on how many milliseconds should we keep power off during daily BMS reset */
uint16_t user_set_bms_reset_duration_ms = 30000;

4
Software/src/devboard/safety/safety.h
View file

@ -3,7 +3,9 @@
#include <string>
#define MAX_CAN_FAILURES 50
#define BATTERY_MAX_TEMPERATURE_DEVIATION 150 // 150 = 15.0 °C
#define BATTERY_MAXTEMPERATURE 500
#define BATTERY_MINTEMPERATURE -250
#define MAX_CHARGE_DISCHARGE_LIMIT_FAILURES 5
//battery pause status begin