helgeerbe / OpenDTU-OnBattery

Software for ESP32 to talk to Hoymiles Inverters and Victrons MPPT battery chargers (Ve.Direct)
GNU General Public License v2.0
297 stars 62 forks source link

Neuer Batterietyp SBS Unipower #1066

Closed Snoopy-HSS closed 1 month ago

Snoopy-HSS commented 3 months ago

Änderung aus dem Refactoring für BatteryCAN übernommen

Changes to be committed: modified: include/BatteryStats.h new file: include/SBSCanReceiver.h modified: src/Battery.cpp modified: src/BatteryStats.cpp new file: src/SBSCanReceiver.cpp modified: webapp/src/locales/de.json modified: webapp/src/locales/en.json modified: webapp/src/locales/fr.json modified: webapp/src/views/BatteryAdminView.vue

AndreasBoehm commented 1 month ago

To quote github

This branch has conflicts that must be resolved

Please update (rebase , merge development into it) your branch/PR to fix the conflicts before we can take another look at it.

schlimmchen commented 1 month ago

Please update (rebase, merge development into it)

(Optionally on a new local branch) Squash the commits, den fetch helgeerbe/development and rebase onto helgeerbe/development. Merging development and updating this PR will make it harder for us.

github-actions[bot] commented 2 days ago

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new discussion or issue for related concerns.