yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-03 17:59:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #981 from dalathegreat/bugfix/solis-soc-paused

Browse source 
Bugfix: Separate Deye offgrid BYD CAN fixes to avoid Solis misbehaving
This commit is contained in:
Daniel Öster 2025-03-25 15:41:26 +02:00 • committed by GitHub
commit 0097775e97
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Software/USER_SETTINGS.h
View file

@ -45,9 +45,10 @@
//#define TEST_FAKE_BATTERY //#define TEST_FAKE_BATTERY
//#define DOUBLE_BATTERY //Enable this line if you use two identical batteries at the same time (requires CAN_ADDON setup) //#define DOUBLE_BATTERY //Enable this line if you use two identical batteries at the same time (requires CAN_ADDON setup)
/* Select inverter communication protocol. See Wiki for which to use with your inverter: https://github.com/dalathegreat/BYD-Battery-Emulator-For-Gen24/wiki */ /* Select inverter communication protocol. See Wiki for which to use with your inverter: https://github.com/dalathegreat/Battery-Emulator/wiki */
//#define AFORE_CAN //Enable this line to emulate an "Afore battery" over CAN bus //#define AFORE_CAN //Enable this line to emulate an "Afore battery" over CAN bus
//#define BYD_CAN //Enable this line to emulate a "BYD Battery-Box Premium HVS" over CAN Bus //#define BYD_CAN //Enable this line to emulate a "BYD Battery-Box Premium HVS" over CAN Bus
//#define BYD_CAN_DEYE //Enable this line to emulate a "BYD Battery-Box Premium HVS" over CAN Bus, with Deye specific fixes
//#define BYD_KOSTAL_RS485 //Enable this line to emulate a "BYD 11kWh HVM battery" over Kostal RS485 //#define BYD_KOSTAL_RS485 //Enable this line to emulate a "BYD 11kWh HVM battery" over Kostal RS485
//#define BYD_MODBUS //Enable this line to emulate a "BYD 11kWh HVM battery" over Modbus RTU //#define BYD_MODBUS //Enable this line to emulate a "BYD 11kWh HVM battery" over Modbus RTU
//#define FERROAMP_CAN //Enable this line to emulate a "Pylon 4x96V Force H2" over CAN Bus //#define FERROAMP_CAN //Enable this line to emulate a "Pylon 4x96V Force H2" over CAN Bus

3
Software/src/inverter/BYD-CAN.cpp
View file

@ -126,6 +126,8 @@ void update_values_can_inverter() { //This function maps all the values fetched
//SOC (100.00%) //SOC (100.00%)
BYD_150.data.u8[0] = (datalayer.battery.status.reported_soc >> 8); BYD_150.data.u8[0] = (datalayer.battery.status.reported_soc >> 8);
BYD_150.data.u8[1] = (datalayer.battery.status.reported_soc & 0x00FF); BYD_150.data.u8[1] = (datalayer.battery.status.reported_soc & 0x00FF);
#ifdef BYD_CAN_DEYE
// Fix for avoiding offgrid Deye inverters to underdischarge batteries
if (datalayer.battery.status.max_charge_current_dA == 0) { if (datalayer.battery.status.max_charge_current_dA == 0) {
//Force to 100.00% incase battery no longer wants to charge //Force to 100.00% incase battery no longer wants to charge
BYD_150.data.u8[0] = (10000 >> 8); BYD_150.data.u8[0] = (10000 >> 8);
@ -136,6 +138,7 @@ void update_values_can_inverter() { //This function maps all the values fetched
BYD_150.data.u8[0] = 0; BYD_150.data.u8[0] = 0;
BYD_150.data.u8[1] = 0; BYD_150.data.u8[1] = 0;
} }
#endif //BYD_CAN_DEYE
//StateOfHealth (100.00%) //StateOfHealth (100.00%)
BYD_150.data.u8[2] = (datalayer.battery.status.soh_pptt >> 8); BYD_150.data.u8[2] = (datalayer.battery.status.soh_pptt >> 8);
BYD_150.data.u8[3] = (datalayer.battery.status.soh_pptt & 0x00FF); BYD_150.data.u8[3] = (datalayer.battery.status.soh_pptt & 0x00FF);

4
Software/src/inverter/INVERTERS.h
View file

@ -7,6 +7,10 @@
#include "AFORE-CAN.h" #include "AFORE-CAN.h"
#endif #endif
#ifdef BYD_CAN_DEYE
#define BYD_CAN
#endif
#ifdef BYD_CAN #ifdef BYD_CAN
#include "BYD-CAN.h" #include "BYD-CAN.h"
#endif #endif