diff --git a/RELEASES.md b/RELEASES.md index e4eef1ff8f072d..4f502fd4ff8db1 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,7 +1,3 @@ -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 index 6d7133198e7f1c..05c2dd6d295592 100644 --- a/cereal/car.capnp +++ b/cereal/car.capnp @@ -107,10 +107,6 @@ 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 deleted file mode 100644 index 41dc595b00fb44..00000000000000 --- a/installer/updater/update_kernel.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 index 6b77478f7ef166..f88f6fb7d1b6f2 100755 --- a/launch_chffrplus.sh +++ b/launch_chffrplus.sh @@ -83,10 +83,6 @@ 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 index 9bad817fcb6b92..57e0b1798b53f1 100644 --- a/selfdrive/common/version.h +++ b/selfdrive/common/version.h @@ -1 +1 @@ -#define COMMA_VERSION "0.7.6.1-release" +#define COMMA_VERSION "0.7.6-release" diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index 168ef7e4f37f10..55cfe1bf1e1cd3 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -1,7 +1,6 @@ #!/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 @@ -143,10 +142,6 @@ 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 index 0067339026fe7b..9be369a4d87f25 100644 --- a/selfdrive/controls/lib/events.py +++ b/selfdrive/controls/lib/events.py @@ -507,16 +507,6 @@ 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",