Charging Animation, Updated Battery and Car site for Smart EQ (SQ)

app/release/output-metadata.json

@@ -0,0 +1,37 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.openvehicles.OVMS",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 2024091401,
+      "versionName": "4.7.1",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/app-release.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/app-release.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 19
+}

app/src/main/java/com/openvehicles/OVMS/api/ApiService.kt

@@ -29,9 +29,9 @@ import com.openvehicles.OVMS.api.ApiObservable.deleteObserver
 import com.openvehicles.OVMS.api.ApiObservable.notifyLoggedIn
 import com.openvehicles.OVMS.api.ApiObservable.notifyUpdate
 import com.openvehicles.OVMS.entities.CarData
-import com.openvehicles.OVMS.utils.AppPrefs
 import com.openvehicles.OVMS.ui.MainActivity
 import com.openvehicles.OVMS.ui.utils.Database
+import com.openvehicles.OVMS.utils.AppPrefs
 import com.openvehicles.OVMS.utils.CarsStorage
 import com.openvehicles.OVMS.utils.Sys
 import java.io.Serializable
@@ -485,6 +485,29 @@ class ApiService : Service(), ApiTask.ApiTaskListener, ApiObserver {
     override fun onPushNotification(msgClass: Char, msgText: String?) {
         // This callback only receives MP push notifications for the currently selected vehicle.
         // See MyFirebaseMessagingService for system notification broadcasting.
+        if(appPrefs!!.getData("option_notification_enabled_" + carData!!.sel_vehicleid,"0") == "1"){
+            val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            createNotificationChannel()
+            // Define the notification channel (required for Android O and above)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                val channelName = getString(R.string.app_name)
+                val channelDescription = "OVMS"
+                val channel = NotificationChannel("your_channel_id", channelName, NotificationManager.IMPORTANCE_DEFAULT).apply {
+                    description = channelDescription
+                }
+                notificationManager.createNotificationChannel(channel)
+            }
+            // Create the notification
+            val notificationBuilder = NotificationCompat.Builder(this, "your_channel_id")
+                .setSmallIcon(R.drawable.ic_service)
+                .setContentTitle("OVMS")
+                .setContentText(msgText ?: msgText)
+                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+                .setAutoCancel(true)
+
+            // Show the notification
+                notificationManager.notify(1, notificationBuilder.build())
+        }
     }
 
     // ApiObserver interface:

app/src/main/java/com/openvehicles/OVMS/api/ApiTask.kt

@@ -537,6 +537,12 @@ class ApiTask(
                 msgData
             ) else Log.w(TAG, "W MSG Invalid")
 
+            'X' -> if (carData.processGen(msgData)) publishProgress(
+                MsgType.UPDATE,
+                msgCode,
+                msgData
+            ) else Log.w(TAG, "X MSG Invalid")
+
             'Y' -> if (carData.processNewTPMS(msgData)) publishProgress(
                 MsgType.UPDATE,
                 msgCode,

app/src/main/java/com/openvehicles/OVMS/entities/CarData.kt

@@ -9,7 +9,11 @@ import com.openvehicles.OVMS.utils.AppPrefs
 import java.io.Serializable
 import java.text.DecimalFormat
 import java.text.SimpleDateFormat
+import java.time.format.DateTimeFormatter
 import java.util.Date
+import java.time.Instant
+import java.time.ZoneId
+import kotlin.text.format
 
 class CarData : Serializable {
 
@@ -110,7 +114,9 @@ class CarData : Serializable {
     var car_type = ""
     var car_canwrite_raw = 0
     var car_canwrite = false
-    var car_gsmlock = ""
+    var car_gsm_provider = ""
+    var car_mdm_mode = ""
+
     @JvmField
     var car_gsm_signal = ""
     var car_gsm_dbm = 0
@@ -156,6 +162,7 @@ class CarData : Serializable {
     var car_speed_units = ""
     var car_chargelimit_rangelimit = ""
     var car_max_idealrange = ""
+    var car_charge_timestamp = ""
     var stale_chargetimer = DataStale.NoValue
     var stale_status = DataStale.NoValue
 
@@ -276,6 +283,9 @@ class CarData : Serializable {
     var car_charge_plugtype = 0
     var car_charge_power_kw_raw = 0.0
     var car_charge_power_kw = ""
+    var car_charge_kwh_grid = 0f
+    var car_charge_kwh_grid_total = 0f
+    var car_battery_capacity = 0f
     @JvmField
     var car_battery_voltage = 0.0
     var car_battery_current_raw = 0.0
@@ -351,6 +361,33 @@ class CarData : Serializable {
     @JvmField
     var car_energyrecd = 0f
 
+    // Car Gen Message "X"
+    // not implemented yet?
+    var car_gen_inprogress = false
+    var car_gen_pilot = false
+    var car_gen_voltage = 0
+    var car_gen_current = 0f
+    var car_gen_power = 0f
+    var car_gen_efficiency = 0f
+    var car_gen_type  = ""
+    var car_gen_state  = ""
+    var car_gen_substate  = ""
+    var car_gen_mode  = ""
+    var car_gen_climit = 0f
+    var car_gen_limit_range = 0f
+    var car_gen_limit_soc = 0
+    var car_gen_kwh = 0f
+    var car_gen_kwh_grid = 0f
+    var car_gen_kwh_grid_total = 0f
+    var car_gen_time = 0
+    var car_gen_timermode = 0
+    var car_gen_timerstart = 0
+    var car_gen_duration_empty = 0
+    var car_gen_duration_range = 0
+    var car_gen_duration_soc = 0
+    var car_gen_temp = 0f
+    var car_gen_timestamp = ""
+
     //
     // Renault Twizy specific
     //
@@ -693,6 +730,20 @@ class CarData : Serializable {
                 } else {
                     ""
                 }
+                car_charge_kwh_grid = dataParts[38].toFloat()
+                car_charge_kwh_grid_total = dataParts[39].toFloat()
+                car_battery_capacity = dataParts[40].toFloat()
+            }
+
+            if (dataParts.size >= 42) {
+                val dateFormat = appPrefs!!.getData("option_date_format", "0") == "1"
+                val charge_timestamp_raw = dataParts[41].toInt()
+                val timestamp_formater = if(dateFormat) {
+                    DateTimeFormatter.ofPattern("dd.MM.yy  HH:mm").withZone(ZoneId.systemDefault())
+                } else {
+                   DateTimeFormatter.ofPattern("MM/dd yy  hh:mm").withZone(ZoneId.systemDefault())
+                }
+                car_charge_timestamp = timestamp_formater.format(Instant.ofEpochSecond(charge_timestamp_raw.toLong()))
             }
         } catch (e: Exception) {
             Log.e(TAG, "processStatus: ERROR", e)
@@ -818,7 +869,7 @@ class CarData : Serializable {
                 car_type = dataParts[4]
             }
             if (dataParts.size >= 6) {
-                car_gsmlock = dataParts[5]
+                car_gsm_provider = dataParts[5]
             }
             if (dataParts.size >= 8) {
                 car_servicerange = if (dataParts[6] != "") {
@@ -834,6 +885,10 @@ class CarData : Serializable {
             }
             if (dataParts.size >= 9) {
                 car_hardware = dataParts[8]
+
+            }
+            if (dataParts.size >= 10) {
+                car_mdm_mode = dataParts[9].split(";")[0].toString()
             }
         } catch (e: Exception) {
             Log.e(TAG, "processFirmware: ERROR", e)
@@ -985,6 +1040,18 @@ class CarData : Serializable {
                 end = i + cnt
                 while (i < end) {
                     ival = dataParts[i].toInt()
+                    if (car_type == "SQ") {
+                        // orange alert
+                        if ((j == 0) && ((car_tpms_pressure_raw!![j] < 210) || (car_tpms_pressure_raw!![j] > 240))) ival =1
+                        if ((j == 1) && ((car_tpms_pressure_raw!![j] < 210) || (car_tpms_pressure_raw!![j] > 240))) ival =1
+                        if ((j == 2) && ((car_tpms_pressure_raw!![j] < 240) || (car_tpms_pressure_raw!![j] > 270))) ival =1
+                        if ((j == 3) && ((car_tpms_pressure_raw!![j] < 240) || (car_tpms_pressure_raw!![j] > 270))) ival =1
+                        // red alert
+                        if ((j == 0) && ((car_tpms_pressure_raw!![j] < 190) || (car_tpms_pressure_raw!![j] > 260))) ival =2
+                        if ((j == 1) && ((car_tpms_pressure_raw!![j] < 190) || (car_tpms_pressure_raw!![j] > 260))) ival =2
+                        if ((j == 2) && ((car_tpms_pressure_raw!![j] < 220) || (car_tpms_pressure_raw!![j] > 290))) ival =2
+                        if ((j == 3) && ((car_tpms_pressure_raw!![j] < 220) || (car_tpms_pressure_raw!![j] > 290))) ival =2
+                    }
                     if (ival > 2) ival = 2 else if (ival < 0) ival = 0
                     sval = if (ival == 0) "✔" else if (ival == 1) "⛛" else "⚠"
                     car_tpms_alert_raw!![j] = ival
@@ -1013,6 +1080,58 @@ class CarData : Serializable {
         return true
     }
 
+    /**
+     * Process GEN message ("X")
+     * not implemented yet?
+     */
+    fun processGen(msgdata: String): Boolean {
+        init()
+        Log.d(TAG, "processGen: $msgdata")
+        try {
+            val dataParts =
+                msgdata.split(",\\s*".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+            if (dataParts.size >= 9) {
+                car_gen_inprogress = dataParts[0].toBoolean()
+                car_gen_pilot = dataParts[1].toBoolean()
+                car_gen_voltage = dataParts[2].toInt()
+                car_gen_current = dataParts[3].toFloat()
+                car_gen_power = dataParts[4].toFloat()
+                car_gen_efficiency = dataParts[5].toFloat()
+                car_gen_type = dataParts[6]
+                car_gen_state = dataParts[7]
+                car_gen_substate = dataParts[8]
+                car_gen_mode = dataParts[9]
+                car_gen_climit = dataParts[10].toFloat()
+                car_gen_limit_range = dataParts[11].toFloat()
+                car_gen_limit_soc = dataParts[12].toInt()
+                car_gen_kwh = dataParts[13].toFloat()
+                car_gen_kwh_grid = dataParts[14].toFloat()
+                car_gen_kwh_grid_total = dataParts[15].toFloat()
+                car_gen_time = dataParts[16].toInt()
+                car_gen_timermode = dataParts[17].toInt()
+                car_gen_timerstart = dataParts[18].toInt()
+                car_gen_duration_empty = dataParts[19].toInt()
+                car_gen_duration_range = dataParts[20].toInt()
+                car_gen_duration_soc = dataParts[21].toInt()
+                car_gen_temp = dataParts[22].toFloat()
+                if (dataParts.size >= 23) {
+                val dateFormat = appPrefs!!.getData("option_date_format", "0") == "1"
+                val charge_timestamp_raw = dataParts[23].toInt()
+                val timestamp_formater = if(dateFormat) {
+                    DateTimeFormatter.ofPattern("dd.MM.yy  HH:mm").withZone(ZoneId.systemDefault())
+                } else {
+                   DateTimeFormatter.ofPattern("MM/dd yy  hh:mm").withZone(ZoneId.systemDefault())
+                }
+                    car_charge_timestamp = timestamp_formater.format(Instant.ofEpochSecond(charge_timestamp_raw.toLong()))
+                }
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "processGen: ERROR", e)
+            return false
+        }
+        recalc()
+        return true
+    }
     /**
      * Get data extract suitable for system broadcast.
      *
@@ -1080,7 +1199,10 @@ class CarData : Serializable {
             b.putInt("car_chargelimit_minsremaining_range", car_chargelimit_minsremaining_range)
             b.putInt("car_chargelimit_soclimit", car_chargelimit_soclimit)
             b.putInt("car_chargelimit_minsremaining_soc", car_chargelimit_minsremaining_soc)
-
+            b.putFloat("car_charge_kwh_grid", car_charge_kwh_grid)
+            b.putFloat("car_charge_kwh_grid_total", car_charge_kwh_grid_total)
+            b.putFloat("car_battery_capacity", car_battery_capacity)
+            b.putString("car_charge_timestamp", car_charge_timestamp)
 
             //
             // Location (msgCode 'L')
@@ -1157,10 +1279,11 @@ class CarData : Serializable {
             b.putString("car_vin", car_vin)
             b.putInt("car_gsm_dbm", car_gsm_dbm)
             b.putInt("car_gsm_bars", car_gsm_bars)
-            b.putString("car_gsm_lock", car_gsmlock)
+            b.putString("car_gsm_provider", car_gsm_provider)
             b.putInt("car_canwrite", car_canwrite_raw)
             b.putInt("car_servicedays", car_servicetime)
             b.putInt("car_servicedist", car_servicerange)
+            b.putString("car_mdm_mode", car_mdm_mode)
 
             //
             // TPMS new flexible wheel layout (msgCode 'Y')
@@ -1200,6 +1323,35 @@ class CarData : Serializable {
             // Capabilities (msgCode 'V')
             //
             b.putString("car_capabilities", car_capabilities)
+
+            //
+            //  Gen (msgCode 'X')
+            //
+            // not implemented yet?
+            b.putBoolean("car_gen_inprogress", car_gen_inprogress)
+            b.putBoolean("car_gen_pilot", car_gen_pilot)
+            b.putInt("car_gen_voltage", car_gen_voltage)
+            b.putFloat("car_gen_current", car_gen_current)
+            b.putFloat("car_gen_power", car_gen_power)
+            b.putFloat("car_gen_efficiency", car_gen_efficiency)
+            b.putString("car_gen_type", car_gen_type)
+            b.putString("car_gen_state", car_gen_state)
+            b.putString("car_gen_substate", car_gen_substate)
+            b.putString("car_gen_mode", car_gen_mode)
+            b.putFloat("car_gen_climit", car_gen_climit)
+            b.putFloat("car_gen_limit_range", car_gen_limit_range)
+            b.putInt("car_gen_limit_soc", car_gen_limit_soc)
+            b.putFloat("car_gen_kwh", car_gen_kwh)
+            b.putFloat("car_gen_kwh_grid", car_gen_kwh_grid)
+            b.putFloat("car_gen_kwh_grid_total", car_gen_kwh_grid_total)
+            b.putInt("car_gen_time", car_gen_time)
+            b.putInt("car_gen_timermode", car_gen_timermode)
+            b.putInt("car_gen_timerstart", car_gen_timerstart)
+            b.putInt("car_gen_duration_empty", car_gen_duration_empty)
+            b.putInt("car_gen_duration_range", car_gen_duration_range)
+            b.putInt("car_gen_duration_soc", car_gen_duration_soc)
+            b.putFloat("car_gen_temp", car_gen_temp)
+            b.putString("car_gen_timestamp", car_gen_timestamp)
         } catch (e: Exception) {
             e.printStackTrace()
         }