Merge pull request commaai#66 from commaai/devel

Devel 0.7.6.1 merge
mcomg · Jun 19, 2020 · 44705cf · 44705cf
2 parents 0408ba7 + 40982f1
commit 44705cf
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 1 deletion.
diff --git a/RELEASES.md b/RELEASES.md
@@ -1,3 +1,7 @@
+Version 0.7.6.1 (2020-06-16)
+========================
+* Hotfix: update kernel on some comma twos (orders #8570-#8680)
+
 Version 0.7.6 (2020-06-05)
 ========================
 * White panda is deprecated, upgrade to comma two or black panda

diff --git a/cereal/car.capnp b/cereal/car.capnp
@@ -107,6 +107,10 @@ struct CarEvent @0x9b1657f34caf3ad3 {
     startupWhitePanda @82;
     canErrorPersistent @83;
     belowEngageSpeed @84;
+    noGps @85;
+    focusRecoverActive @86;
+    wrongCruiseMode @87;
+    neosUpdateRequired @88;
   }
 }
 

diff --git a/installer/updater/update_kernel.json b/installer/updater/update_kernel.json
@@ -0,0 +1,7 @@
+{
+  "ota_url": "https://commadist.azureedge.net/neosupdate/ota-signed-3bd2b3bdd6a501569e00b8f12786d65e0fd2788c0dd238f8c986e3e2e504683a-kernel.zip",
+  "ota_hash": "3bd2b3bdd6a501569e00b8f12786d65e0fd2788c0dd238f8c986e3e2e504683a",
+  "recovery_url": "https://commadist.azureedge.net/neosupdate/recovery-97c27e6ed04ed6bb0608b845a2d4100912093f9380c3f2ba6b56bccd608e5f6e.img",
+  "recovery_len": 15861036,
+  "recovery_hash": "97c27e6ed04ed6bb0608b845a2d4100912093f9380c3f2ba6b56bccd608e5f6e"
+}
diff --git a/launch_chffrplus.sh b/launch_chffrplus.sh
@@ -83,6 +83,10 @@ function launch {
     fi
 
     "$DIR/installer/updater/updater" "file://$DIR/installer/updater/update.json"
+  else
+      if [[ $(uname -v) == "#1 SMP PREEMPT Wed Jun 10 12:40:53 PDT 2020" ]]; then
+          "$DIR/installer/updater/updater" "file://$DIR/installer/updater/update_kernel.json"
+      fi
   fi
 
 

diff --git a/selfdrive/common/version.h b/selfdrive/common/version.h
@@ -1 +1 @@
-#define COMMA_VERSION "0.7.6-release"
+#define COMMA_VERSION "0.7.6.1-release"
diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 import os
 import gc
+import subprocess
 from cereal import car, log
 from common.numpy_fast import clip
 from common.realtime import sec_since_boot, set_realtime_priority, Ratekeeper, DT_CTRL
@@ -142,6 +143,10 @@ def __init__(self, sm=None, pm=None, can_sock=None):
     # if hw_type == HwType.whitePanda:
     #   self.events.add(EventName.whitePandaUnsupported, static=True)
 
+    uname = subprocess.check_output(["uname", "-v"], encoding='utf8').strip()
+    if uname == "#1 SMP PREEMPT Wed Jun 10 12:40:53 PDT 2020":
+      self.events.add(EventName.neosUpdateRequired, static=True)
+
     # controlsd is driven by can recv, expected at 100Hz
     self.rk = Ratekeeper(100, print_delay_threshold=None)
     self.prof = Profiler(False)  # off by default

diff --git a/selfdrive/controls/lib/events.py b/selfdrive/controls/lib/events.py
@@ -507,6 +507,16 @@ def calibration_incomplete_alert(CP, sm, metric):
     ET.NO_ENTRY: NoEntryAlert("Speed Too Low"),
   },
 
+  EventName.neosUpdateRequired: {
+    ET.PERMANENT: Alert(
+      "NEOS Update Required",
+      "Please Wait for Update",
+      AlertStatus.normal, AlertSize.mid,
+      Priority.HIGHEST, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
+    ET.NO_ENTRY: NoEntryAlert("NEOS Update Required"),
+  },
+
+
   EventName.sensorDataInvalid: {
     ET.PERMANENT: Alert(
       "No Data from Device Sensors",