Handle fallback for SOC when charge status update fails

Fixes #45

Author: mschmiedel

CHANGELOG.md

@@ -16,6 +16,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - **Breaking** The default refresh rate while the car is active has been changed to 30 seconds
   - **Breaking** The default refresh rate while the car is inactive has been changed to 24 hours
   - support configuring `refresh/mode`, `refresh/period/active`, `refresh/period/inActive` and `refresh/period/inActiveGrace` via MQTT
+  - Handle fallback for SOC when charge status update fails
+- API
+  - Handle fallback for SOC when charge status update fails
 
 ### Fixed
 - MQTT

saic-java-client/src/main/java/net/heberling/ismart/abrp/ABRP.java

@@ -4,6 +4,7 @@
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import net.heberling.ismart.asn1.v2_1.entity.OTA_RVMVehicleStatusResp25857;
 import net.heberling.ismart.asn1.v3_0.entity.OTA_ChrgMangDataResp;
@@ -32,15 +33,30 @@ public static String updateAbrp(
       HashMap<String, Object> map = new HashMap<>();
       // utc [s]: Current UTC timestamp (epoch) in seconds (note, not milliseconds!)
       map.put("utc", vehicleStatus.getGpsPosition().getTimestamp4Short().getSeconds());
-      // soc [SoC %]: State of Charge of the vehicle (what's displayed on the dashboard of
-      // the vehicle is preferred)
-      map.put("soc", chargeStatus.getBmsPackSOCDsp() / 10.d);
-      // power [kW]: Instantaneous power output/input to the vehicle. Power output is
-      // positive, power input is negative (charging)
-      double current = chargeStatus.getBmsPackCrnt() * 0.05d - 1000.0d;
-      double voltage = (double) chargeStatus.getBmsPackVol() * 0.25d;
-      double power = current * voltage / 1000d;
-      map.put("power", power);
+
+      if (Objects.nonNull(chargeStatus)) {
+        // soc [SoC %]: State of Charge of the vehicle (what's displayed on the dashboard of
+        // the vehicle is preferred)
+        map.put("soc", chargeStatus.getBmsPackSOCDsp() / 10.d);
+        // power [kW]: Instantaneous power output/input to the vehicle. Power output is
+        // positive, power input is negative (charging)
+
+        // TODO: batt_temp [°C]: Battery temperature
+
+        double voltage = (double) chargeStatus.getBmsPackVol() * 0.25d;
+        // voltage [V]: Battery pack voltage
+        map.put("voltage", voltage);
+
+        double current = chargeStatus.getBmsPackCrnt() * 0.05d - 1000.0d;
+        // current [A]: Battery pack current (similar to power: output is
+        // positive, input (charging) is negative.)
+        map.put("current", current);
+
+        double power = current * voltage / 1000d;
+        map.put("power", power);
+      } else {
+        map.put("soc", vehicleStatus.getBasicVehicleStatus().getExtendedData1());
+      }
       // speed [km/h]: Vehicle speed
       map.put("speed", vehicleStatus.getGpsPosition().getWayPoint().getSpeed() / 10.d);
       // lat [°]: Current vehicle latitude
@@ -80,12 +96,6 @@ public static String updateAbrp(
       if (vehicleStatus.getBasicVehicleStatus().getExteriorTemperature() != -128) {
         map.put("ext_temp", vehicleStatus.getBasicVehicleStatus().getExteriorTemperature());
       }
-      // TODO: batt_temp [°C]: Battery temperature
-      // voltage [V]: Battery pack voltage
-      map.put("voltage", voltage);
-      // current [A]: Battery pack current (similar to power: output is
-      // positive, input (charging) is negative.)
-      map.put("current", current);
       // odometer [km]: Current odometer reading in km.
       if (vehicleStatus.getBasicVehicleStatus().getMileage() > 0) {
         map.put("odometer", vehicleStatus.getBasicVehicleStatus().getMileage() / 10.d);

saic-java-mqtt-gateway/src/main/java/net/heberling/ismart/mqtt/VehicleHandler.java

@@ -7,11 +7,7 @@
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
+import java.util.*;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 import net.heberling.ismart.Client;
@@ -84,17 +80,17 @@ void handleVehicle() throws MqttException, IOException {
           OTA_ChrgMangDataResp chargeStatus = updateChargeStatus(uid, token, vinInfo.getVin());
           final String abrpApiKey = saicMqttGateway.getAbrpApiKey();
           final String abrpUserToken = saicMqttGateway.getAbrpUserToken(vinInfo.getVin());
-          if (abrpApiKey != null
-              && abrpUserToken != null
-              && vehicleStatus != null
-              && chargeStatus != null) {
+          if (abrpApiKey != null && abrpUserToken != null && vehicleStatus != null) {
             String abrpResponse =
                 ABRP.updateAbrp(abrpApiKey, abrpUserToken, vehicleStatus, chargeStatus);
             MqttMessage msg = new MqttMessage(abrpResponse.getBytes(StandardCharsets.UTF_8));
             msg.setQos(0);
             msg.setRetained(true);
             client.publish(vehicleState.getMqttVINPrefix() + "/" + INTERNAL_ABRP, msg);
           }
+          if (Objects.isNull(chargeStatus)) {
+            updateFallbackChargeStateData(vehicleStatus);
+          }
           vehicleState.markSuccessfulRefresh();
           LOGGER.info("Refreshing vehicle status succeeded...");
 
@@ -113,6 +109,21 @@ void handleVehicle() throws MqttException, IOException {
     }
   }
 
+  private void updateFallbackChargeStateData(OTA_RVMVehicleStatusResp25857 vehicleStatus)
+      throws MqttException {
+    LOGGER.warn("Extracting SOC from vehicle status as charge state update failed...");
+    MqttMessage msg =
+        new MqttMessage(
+            vehicleStatus
+                .getBasicVehicleStatus()
+                .getExtendedData1()
+                .toString()
+                .getBytes(StandardCharsets.UTF_8));
+    msg.setQos(0);
+    msg.setRetained(true);
+    client.publish(vehicleState.getMqttVINPrefix() + "/" + DRIVETRAIN_SOC, msg);
+  }
+
   private OTA_RVMVehicleStatusResp25857 updateVehicleStatus(String uid, String token, String vin)
       throws IOException, MqttException {
     MessageCoder<OTA_RVMVehicleStatusReq> otaRvmVehicleStatusReqMessageCoder =
@@ -223,11 +234,11 @@ private OTA_ChrgMangDataResp updateChargeStatus(String uid, String token, String
         if (chargingStatusResponseMessage.getBody().getResult() == 2) {
           // TODO: relogn
         }
-        throw new MqttGatewayException(
-            "Refreshing Charging State from SAIC API failed with message: "
-                + new String(
-                    chargingStatusResponseMessage.getBody().getErrorMessage(),
-                    StandardCharsets.UTF_8));
+        LOGGER.error(
+            "Refreshing Charging State from SAIC API failed with message: {}",
+            new String(
+                chargingStatusResponseMessage.getBody().getErrorMessage(), StandardCharsets.UTF_8));
+        return null;
       }
 
       SaicMqttGateway.fillReserved(chargingStatusMessage.getReserved());