Merge pull request #1366 from gwk1/Kia-Hyundai_contactor_closing_improvement

Kia/Hyundai 40/64: Respect inverter_allows_contactor_closing on startup
This commit is contained in:
Daniel Öster 2025-08-03 13:50:29 +03:00 committed by GitHub
commit 3d76c2a5d9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -446,7 +446,8 @@ void KiaHyundai64Battery::transmit_can(unsigned long currentMillis) {
if (currentMillis - previousMillis100 >= INTERVAL_100_MS) { if (currentMillis - previousMillis100 >= INTERVAL_100_MS) {
previousMillis100 = currentMillis; previousMillis100 = currentMillis;
if (contactor_closing_allowed == nullptr || *contactor_closing_allowed) { if ((contactor_closing_allowed == nullptr || *contactor_closing_allowed) &&
datalayer.system.status.inverter_allows_contactor_closing) {
transmit_can_frame(&KIA64_553); transmit_can_frame(&KIA64_553);
transmit_can_frame(&KIA64_57F); transmit_can_frame(&KIA64_57F);
transmit_can_frame(&KIA64_2A1); transmit_can_frame(&KIA64_2A1);
@ -457,7 +458,8 @@ void KiaHyundai64Battery::transmit_can(unsigned long currentMillis) {
if (currentMillis - previousMillis10 >= INTERVAL_10_MS) { if (currentMillis - previousMillis10 >= INTERVAL_10_MS) {
previousMillis10 = currentMillis; previousMillis10 = currentMillis;
if (contactor_closing_allowed == nullptr || *contactor_closing_allowed) { if ((contactor_closing_allowed == nullptr || *contactor_closing_allowed) &&
datalayer.system.status.inverter_allows_contactor_closing) {
switch (counter_200) { switch (counter_200) {
case 0: case 0: