NEOS 19.1 (commaai#23707)

* NEOS 19.1 * add logging * new manifest * prod bucket Co-authored-by: Comma Device <[email protected]>
twilsonco · Feb 13, 2022 · 1d26cd2 · 1d26cd2
1 parent 6849b44
commit 1d26cd2
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/launch_env.sh b/launch_env.sh
@@ -7,7 +7,7 @@ export OPENBLAS_NUM_THREADS=1
 export VECLIB_MAXIMUM_THREADS=1
 
 if [ -z "$REQUIRED_NEOS_VERSION" ]; then
-  export REQUIRED_NEOS_VERSION="18"
+  export REQUIRED_NEOS_VERSION="19.1"
 fi
 
 if [ -z "$AGNOS_VERSION" ]; then

diff --git a/selfdrive/hardware/eon/androidd.py b/selfdrive/hardware/eon/androidd.py
@@ -4,6 +4,7 @@
 import psutil
 from typing import Optional
 
+import cereal.messaging as messaging
 from common.realtime import set_core_affinity, set_realtime_priority
 from selfdrive.swaglog import cloudlog
 
@@ -37,6 +38,8 @@ def main():
   crash_count = 0
   modem_killed = False
   modem_state = "ONLINE"
+  androidLog = messaging.sub_sock('androidLog')
+
   while True:
     # check critical android services
     if any(p is None or not p.is_running() for p in procs.values()) or not len(procs):
@@ -52,11 +55,30 @@ def main():
             cloudlog.event("android service pid changed", proc=p, cur=cur[p], prev=procs[p])
       procs.update(cur)
 
+<<<<<<< HEAD
     # check modem state
     state = get_modem_state()
     if state != modem_state and not modem_killed:
       cloudlog.event("modem state changed", state=state)
     modem_state = state
+=======
+    # log caught NetworkPolicy exceptions
+    msgs = messaging.drain_sock(androidLog)
+    for m in msgs:
+      try:
+        if m.androidLog.tag == "NetworkPolicy" and m.androidLog.message.startswith("problem with advise persist threshold"):
+          print(m)
+          cloudlog.event("network policy exception caught", androidLog=m.androidLog, error=True)
+      except UnicodeDecodeError:
+        pass
+
+    if os.path.exists(MODEM_PATH):
+      # check modem state
+      state = get_modem_state()
+      if state != modem_state and not modem_killed:
+        cloudlog.event("modem state changed", state=state)
+      modem_state = state
+>>>>>>> 62e0bd5f0 (NEOS 19.1 (#23707))
 
     # check modem crashes
     cnt = get_modem_crash_count()

diff --git a/selfdrive/hardware/eon/neos.json b/selfdrive/hardware/eon/neos.json
@@ -0,0 +1,7 @@
+{
+  "ota_url": "https://commadist.azureedge.net/neosupdate/ota-signed-50da8800caa5cbc224acbaa21f3a83d21802a31d89cccfc62a898903a8eb19e7.zip",
+  "ota_hash": "50da8800caa5cbc224acbaa21f3a83d21802a31d89cccfc62a898903a8eb19e7",
+  "recovery_url": "https://commadist.azureedge.net/neosupdate/recovery-fe76739438d28ea6111853a737b616afdf340ba75c01c0ee99e6a28c19ecc29f.img",
+  "recovery_len": 15222060,
+  "recovery_hash": "fe76739438d28ea6111853a737b616afdf340ba75c01c0ee99e6a28c19ecc29f"
+}