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 from main and fix a conflict

Browse source
This commit is contained in:
Jaakko Haakana 2025-07-23 12:57:04 +03:00
commit ea512b3348
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Software/src/devboard/webserver/webserver.cpp
View file

@ -533,7 +533,7 @@ void init_webserver() {
auto update_string = [](const char* route, std::function<void(String)> setter,
std::function<bool(String)> validator = nullptr) {
def_route_with_auth(route, server, HTTP_GET, [&](AsyncWebServerRequest* request) {
def_route_with_auth(route, server, HTTP_GET, [=](AsyncWebServerRequest* request) {
if (request->hasParam("value")) {
String value = request->getParam("value")->value();

2
Software/src/inverter/SOLAX-CAN.cpp
View file

@ -135,7 +135,7 @@ void SolaxInverter::map_can_frame_to_variable(CAN_frame rx_frame) {
#endif
datalayer.system.status.inverter_allows_contactor_closing = false;
SOLAX_1875.data.u8[4] = (0x00); // Inform Inverter: Contactor 0=off, 1=on.
for (uint8_t i = 0; i <= number_of_batteries; i++) {
for (uint8_t i = 0; i < number_of_batteries; i++) {
transmit_can_frame(&SOLAX_187E);
transmit_can_frame(&SOLAX_187A);
transmit_can_frame(&SOLAX_1872);