From 47b1b6042b59d633d513d6acdb88bc43cb7fb4af Mon Sep 17 00:00:00 2001
From: Willem Melching <willem.melching@gmail.com>
Date: Thu, 20 May 2021 14:49:59 +0200
Subject: [PATCH] add modem state to NetworkInfo

old-commit-hash: 7a8c7505d0135408a2d756c3b029ac13f583083a
---
 cereal                              |  2 +-
 selfdrive/hardware/tici/hardware.py | 23 ++++++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/cereal b/cereal
index 6fe062eca0..c6b29499c7 160000
--- a/cereal
+++ b/cereal
@@ -1 +1 @@
-Subproject commit 6fe062eca0c576cd0629cc00f4df0300abdcf5db
+Subproject commit c6b29499c798ab82ab0d9c01de1d7c512fd33999
diff --git a/selfdrive/hardware/tici/hardware.py b/selfdrive/hardware/tici/hardware.py
index 3bd69b3115..0eef97305d 100644
--- a/selfdrive/hardware/tici/hardware.py
+++ b/selfdrive/hardware/tici/hardware.py
@@ -1,4 +1,5 @@
 import os
+from enum import IntEnum
 import subprocess
 from pathlib import Path
 from smbus2 import SMBus
@@ -17,7 +18,20 @@ MM_MODEM = MM + ".Modem"
 MM_MODEM_SIMPLE = MM + ".Modem.Simple"
 MM_SIM = MM + ".Sim"
 
-MM_MODEM_STATE_CONNECTED = 11
+class MM_MODEM_STATE(IntEnum):
+       FAILED        = -1
+       UNKNOWN       = 0
+       INITIALIZING  = 1
+       LOCKED        = 2
+       DISABLED      = 3
+       DISABLING     = 4
+       ENABLING      = 5
+       ENABLED       = 6
+       SEARCHING     = 7
+       REGISTERED    = 8
+       DISCONNECTING = 9
+       CONNECTING    = 10
+       CONNECTED     = 11
 
 TIMEOUT = 0.1
 
@@ -117,7 +131,7 @@ class Tici(HardwareBase):
         'mcc_mnc': str(sim.Get(MM_SIM, 'OperatorIdentifier', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)),
         'network_type': ["Unknown"],
         'sim_state': ["READY"],
-        'data_connected': modem.Get(MM_MODEM, 'State', dbus_interface=DBUS_PROPS, timeout=TIMEOUT) == MM_MODEM_STATE_CONNECTED,
+        'data_connected': modem.Get(MM_MODEM, 'State', dbus_interface=DBUS_PROPS, timeout=TIMEOUT) == MM_MODEM_STATE.CONNECTED,
       }
 
   def get_subscriber_info(self):
@@ -134,17 +148,19 @@ class Tici(HardwareBase):
     try:
       info = modem.Command("AT+QNWINFO", int(TIMEOUT * 1000), dbus_interface=MM_MODEM, timeout=TIMEOUT)
       extra = modem.Command('AT+QENG="servingcell"', int(TIMEOUT * 1000), dbus_interface=MM_MODEM, timeout=TIMEOUT)
+      state = modem.Get(MM_MODEM, 'State', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)
     except Exception:
       return None
 
     if info and info.startswith('+QNWINFO: '):
       info = info.replace('+QNWINFO: ', '').replace('"', '').split(',')
       extra = "" if extra is None else extra.replace('+QENG: "servingcell",', '').replace('"', '')
+      state = "" if state is None else MM_MODEM_STATE(state).name
 
       if len(info) != 4:
         return None
 
-      technology, operator, band, channel = info 
+      technology, operator, band, channel = info
 
       return({
         'technology': technology,
@@ -152,6 +168,7 @@ class Tici(HardwareBase):
         'band': band,
         'channel': int(channel),
         'extra': extra,
+        'state': state,
       })
     else:
       return None