Commit graph

548 commits

Author SHA1 Message Date
mathl79
97b6706c3a increase default Serial_Link baud rate to 115200 and make it configurable in the USER_SETTINGS.h 2024-11-01 10:57:00 +01:00
Daniel Öster
a662c7bdcd Speed up value updating 2024-10-30 22:30:51 +02:00
Kukumagi
5dff800b63 Enable selecting CAN_FD crystal frequency in user settings 2024-10-30 11:43:40 +02:00
amarofarinha
966a759448 Calculate scaled remaining capacity using estimated total capacity from SOC 2024-10-25 15:39:32 +01:00
amarofarinha
ced16495a0 Add scaled remaining capacity calculation 2024-10-23 01:28:00 +01:00
Daniel Öster
38b5528f71
Update Software.ino 2024-10-14 16:31:30 +03:00
Daniel Öster
667edb8fc4
Update Software.ino 2024-10-14 16:07:09 +03:00
amarofarinha
43952800b5 Keep CAN communications active during Equipment Stop 2024-10-14 11:39:47 +01:00
Daniel Öster
5d53ac1a70 Merge branch 'main' into feature/kostal-rs485 2024-10-12 14:38:29 +03:00
Daniel Öster
adcf145109
Merge branch 'main' into feature/foxess-inverter 2024-10-07 21:59:40 +03:00
amarofarinha
3c944ef081
Merge pull request #516 from amarofarinha/Debounce-Button
Add Debounced Equipment Stop Button Functionality
2024-10-06 18:29:50 +01:00
amarofarinha
7380a3fbcf Merge branch 'Debounce-Button' of https://github.com/amarofarinha/Battery-Emulator into Debounce-Button 2024-10-06 10:17:14 +01:00
amarofarinha
1c2da7f70d Add Debounced Equipment Stop Button Functionality 2024-10-06 10:13:41 +01:00
Daniel Öster
f40e047b81 Make crystal value easily configurable 2024-10-05 21:50:43 +03:00
Daniel Öster
435bef5ed1 Make the protocol more like FozzieUK spec 2024-10-05 21:18:02 +03:00
Daniel Öster
29b67435ea
Update Software.ino 2024-10-05 20:33:09 +03:00
Daniel Öster
9b562fad0e
Update Software.ino 2024-10-05 20:27:57 +03:00
Daniel Öster
d94e235ad6 Fix broken RX for CANFD native 2024-10-04 21:02:36 +03:00
amarofarinha
84110365e9
Merge pull request #506 from amarofarinha/emergency-stop
Add Support for External Button and Web-Based Equipment Stop Functionality
2024-10-03 14:08:34 +01:00
amarofarinha
f7f1427aef long press increased to 15s 2024-10-03 13:36:20 +01:00
amarofarinha
8fed9f237a change terms 2024-10-03 10:26:03 +01:00
amarofarinha
adf8185d33 Replaced all instances of "emergency" with "equipment" in the code for improved clarity and alignment with the feature's purpose. 2024-10-03 09:43:41 +01:00
amarofarinha
173acab23a NC logic for button. 2 button behaviors. some suggestions implemented 2024-10-02 16:20:10 +01:00
amarofarinha
8344bf5179 #ifdef missing 2024-10-02 03:10:51 +01:00
amarofarinha
c1a262421b Implement Support for External Equipment / Emergency Button on Battery Emulator 2024-10-02 02:50:32 +01:00
amarofarinha
81cd6780a3 Initial Implementation of Core Emergency Stop Feature on Battery Emulator 2024-10-01 19:12:22 +01:00
Daniel Öster
1d786463a8 Merge branch 'main' into feature/foxess-inverter 2024-10-01 11:01:02 +03:00
Daniel Öster
3f4ffb8055
Update version number to signal dev 2024-10-01 11:00:14 +03:00
Daniel Öster
af9886ad33
Update Software.ino for release 2024-10-01 10:46:57 +03:00
Daniel Öster
966a6c5517 Add error message incase MCP2515 fails to start 2024-09-30 16:02:38 +03:00
StarkJohan
58f560a909 Merge branch 'main' of https://github.com/StarkJohan/Battery-Emulator into main 2024-09-29 07:33:53 +02:00
StarkJohan
207a405b77 Improved DEBUG_CANFD_DATA output ... MORE!
This PR adds outgoing canfd messages to the DEBUG_CANFD_DATA serial output as well as direction info to make debug life easier. Updated the solution according to suggestions from PR 495/496

Example output:

07:25:10.968 -> RX 111 66 F9 00 D5 00 00 00 00
07:25:11.125 -> TX 110 0F C8 0A 28 02 3A 02 EE
07:25:11.738 -> RX 91 0E A6 00 03 00 00 02 00
07:25:12.126 -> RX D1 02 08 00 00 00 00 02 00
07:25:12.544 -> RX 111 66 F9 00 D7 00 00 00 00
07:25:13.125 -> TX 110 0F C8 0A 28 02 3A 02 EE
07:25:13.319 -> RX 91 0E A6 00 03 00 00 02 00
07:25:13.740 -> RX D1 02 08 00 00 00 00 02 00
07:25:14.127 -> RX 111 66 F9 00 D8 00 00 00 00
07:25:14.936 -> RX 91 0E A6 00 03 00 00 02 00
07:25:15.097 -> TX 110 0F C8 0A 28 02 3A 02 EE
07:25:15.323 -> RX D1 02 08 00 00 00 00 02 00
07:25:15.743 -> RX 111 66 F9 00 DA 00 00 00 00
2024-09-29 07:32:31 +02:00
amarofarinha
09421057c4 code style 2024-09-28 21:21:14 +01:00
amarofarinha
0cd0b384c3 Fix: Disable Chained CAN Sending During OTA Updates to Prevent Incomplete Communication Control 2024-09-28 19:42:06 +01:00
Christopher Obbard
ca98c123ca Fix: PWM_CONTACTOR_CONTROL now actually engages contactors
When PWM_CONTACTOR_CONTROL was set the contactor coil pins
for positive & negative never actually went high. This was
due to a wrong argument passed to ledcWrite: the existing
code used the PWM channel; while ledcWrite actually expects
the PWM pin to be passed.

Fix this by rewriting all of the calls to ledcWrite to use
the PWM pin rather than the channel. While we are here, fix
some quality-of-life things like ordering of the calls,
using variables instead of hardcoding values and also
guarding PWM_CONTACTOR_CONTROL/GPIO usage in #ifdefs.

Fixes: #472
Signed-off-by: Christopher Obbard <obbardc@gmail.com>
2024-09-24 15:09:45 +01:00
Christopher Obbard
d1e61a16af Improvement: Check CONTACTOR_CONTROL is enabled when using PWM_CONTACTOR_CONTROL
We should make sure that CONTACTOR_CONTROL is enabled
when using PWM_CONTACTOR_CONTROL is enabled.

Signed-off-by: Christopher Obbard <obbardc@gmail.com>
2024-09-24 15:09:29 +01:00
Daniel Öster
c53ebf1366
Merge pull request #465 from dalathegreat/bugfix/contactor-closing-egmp
Feature: Contactor closing for eGMP
2024-09-23 16:18:47 +03:00
Daniel Öster
4b59ac9e75
Update version number to signal dev 2024-09-22 20:36:24 +03:00
Daniel Öster
b92b3ab3b0
Update Software.ino version number 2024-09-22 17:54:58 +03:00
amarofarinha
355d171192 bugfix - pause state update was in wrong place. 2024-09-21 17:55:15 +01:00
Christopher Obbard
12650d4e7c Feature: Show CONTACTOR_CONTROL status in the WebUI
When CONTACTOR_CONTROL is used, the battery-emulator controls
its own contactors. There is nowhere on the WebUI to show if
the contactors are engaged or not, only an error event is shown
if the contactors are disengaged.

Add an entry in the WebUI to show the CONTACTOR_CONTROL status.

Signed-off-by: Christopher Obbard <obbardc@gmail.com>
2024-09-20 16:50:18 +01:00
amarofarinha
eeba723715
fix compilation error 2024-09-19 23:45:34 +01:00
Daniel Öster
63ea136c27 Add new Event for CAN-FD overflow 2024-09-19 22:12:44 +03:00
Daniel Öster
6c7d7c5b78
Update Software.ino to signal dev 2024-09-19 14:39:25 +03:00
amarofarinha
4059e3c80e bugfixes & tunning 2024-09-18 18:33:57 +01:00
amarofarinha
ae475c3b24 Merge branch 'WIFI-rewrite-resilience' of https://github.com/amarofarinha/Battery-Emulator into WIFI-rewrite-resilience 2024-09-18 03:07:56 +01:00
amarofarinha
be9d993b44 Refactor Wi-Fi management / separated from webserver logic and add support for fixed IP configuration 2024-09-18 03:07:29 +01:00
Daniel Öster
9739d3ef08
Update Software.ino 2024-09-16 19:49:21 +03:00
Daniel Öster
86b999e643 Merge branch 'main' into feature/DIY-battery-RJXZS-bms 2024-09-16 14:58:51 +03:00
amarofarinha
c1e67dae98 Bug fix for PR#457 (disable send CAN when pause for update) 2024-09-16 09:28:43 +01:00