Commit graph

326 commits

Author SHA1 Message Date
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
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
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
Daniel Öster
5dc413462b
Update Software.ino to signal dev 2024-09-15 23:23:53 +03:00
Daniel Öster
42a51f44ec
Update Software.ino 2024-09-15 23:08:45 +03:00
Daniel Öster
5b43fed340 Add more mappings 2024-09-09 22:59:02 +03:00
Daniel Öster
21b94b3552
Update Software.ino to signal dev work 2024-09-04 22:13:48 +03:00
Daniel Öster
2bc8aabc9c
Update Software.ino for release 2024-09-04 22:09:08 +03:00
Daniel Öster
587159c5f2
Update software version tag to signal dev 2024-08-31 17:05:03 +03:00
Daniel Öster
2c98596f86
Update Software version tag 2024-08-31 16:49:44 +03:00
Daniel Öster
57c97b3f07
Merge pull request #423 from paulusbrand/extra_compile_settings
User settings for MDNS, WIFI AP, Home Assistant autodiscovery
2024-08-30 13:37:29 +03:00
Paul Brand
2ddbb9d0d4 Properly restore receive_can function 2024-08-27 14:39:20 +02:00
StarkJohan
87d271b0ba Update Software.ino
The CAN_TX_PIN and CAN_RX_PIN configuration in the HAL is not currently used due to them being hard coded in Software.ino.
This PR fixes this issue.
2024-08-25 21:08:02 +02:00
Paul Brand
00e44ccf9a Makes MDNS optional by user setting
Makes WIFI AP optional by user setting
Tweaks ifdefs for double battery and charger settings
Updates platformio platform packages
2024-08-24 23:14:01 +02:00
Daniel Öster
b84ee20c69
Merge pull request #410 from dalathegreat/feature/byd-sma
New protocol: BYD-SMA
2024-08-21 22:06:46 +03:00
Daniel Öster
0c9ce6bcb0 Fix contactor bug 2024-08-20 20:58:16 +03:00
Daniel Öster
91349e356b Move ifdef 2024-08-20 20:41:08 +03:00
Daniel Öster
e586d4cfb1 Add contactor ENABLE input reading for SMA 2024-08-20 12:19:29 +03:00
Daniel Öster
c52f0230b5
Update version number to signal dev work 2024-08-15 13:23:06 +03:00
Daniel Öster
e74bf026cb
Update version number for release 2024-08-15 12:37:49 +03:00
Daniel Öster
d16144ae0d Add Stark CANFD native support 2024-08-12 14:14:27 +03:00
Daniel Öster
b2a16897c4 Refactor MCP2515 2024-08-09 22:29:27 +03:00