diff --git a/openpilot/cereal/custom.capnp b/openpilot/cereal/custom.capnp index 3da899919..b8c833ed8 100644 --- a/openpilot/cereal/custom.capnp +++ b/openpilot/cereal/custom.capnp @@ -345,7 +345,7 @@ struct OnroadEventSP @0xda96579883444c35 { silentParkBrake @11; controlsMismatchLateral @12; hyundaiRadarTracksConfirmed @13; - experimentalModeSwitched @14; + experimentalModeSwitchedDEPRECATED @14; wrongCarModeAlertOnly @15; pedalPressedAlertOnly @16; laneTurnLeft @17; diff --git a/openpilot/cereal/log.capnp b/openpilot/cereal/log.capnp index 10d5a925d..0e3e9674b 100644 --- a/openpilot/cereal/log.capnp +++ b/openpilot/cereal/log.capnp @@ -128,6 +128,7 @@ struct OnroadEvent @0xc4fa6047f024e718 { personalityChanged @91; aeb @92; userBookmark @95; + userBookmarkNotPaired @104; excessiveActuation @96; bigModelLoading @100; bigModelFailed @102; @@ -166,12 +167,7 @@ struct InitData { gitSrcCommit @23 :Text; gitSrcCommitDate @24 :Text; - androidProperties @16 :Map(Text, Text); - - pandaInfo @8 :PandaInfo; - dirty @9 :Bool; - passive @12 :Bool; params @17 :Map(Text, Data); commands @19 :Map(Text, Data); @@ -189,6 +185,17 @@ struct InitData { mici @7; # comma four } + deprecated :group { + gctx @1 :Text; + androidBuildInfo @5 :Deprecated.AndroidBuildInfo; + androidSensors @6 :List(Deprecated.AndroidSensor); + chffrAndroidExtra @7 :ChffrAndroidExtra; + pandaInfo @8 :PandaInfo; + passive @12 :Bool; + iosBuildInfo @14 :Deprecated.IosBuildInfo; + androidProperties @16 :Map(Text, Text); + } + struct PandaInfo { hasPanda @0 :Bool; dongleId @1 :Text; @@ -199,14 +206,6 @@ struct InitData { struct ChffrAndroidExtra { allCameraCharacteristics @0 :Map(Text, Text); } - - deprecated :group { - gctx @1 :Text; - androidBuildInfo @5 :Deprecated.AndroidBuildInfo; - androidSensors @6 :List(Deprecated.AndroidSensor); - chffrAndroidExtra @7 :ChffrAndroidExtra; - iosBuildInfo @14 :Deprecated.IosBuildInfo; - } } struct FrameData { @@ -572,6 +571,9 @@ struct PandaState @0xa7649e2575e4591e { controlsAllowedLateral @38 :Bool; controlsAllowedLongitudinal @39 :Bool; + nmiReset @40 :Bool; + hardfaultReset @41 :Bool; + enum FaultStatus { none @0; faultTemp @1; @@ -694,6 +696,7 @@ struct PeripheralState { struct UsbState { devices @0 :List(Device); + connected @1 :Bool; struct Device { busnum @0 :UInt8; @@ -819,7 +822,6 @@ struct SelfdriveState { alertHudVisual @12 :Car.CarControl.HUDControl.VisualAlert; # configurable driving settings - experimentalMode @10 :Bool; personality @11 :LongitudinalPersonality; enum AudibleAlert { @@ -863,6 +865,7 @@ struct SelfdriveState { deprecated :group { alertSound @8 :Car.CarControl.HUDControl.AudibleAlert; + experimentalMode @10 :Bool; } } @@ -1237,6 +1240,7 @@ struct LongitudinalPlan @0xe00b5b3eba12876c { shouldStop @37: Bool; allowThrottle @38: Bool; allowBrake @39: Bool; + accelBoost @40 :Float32; solverExecutionTime @35 :Float32; @@ -2234,6 +2238,7 @@ struct DriverMonitoringState { pose @0: Bool; eye @1: Bool; phone @2: Bool; + sleep @3: Bool; } struct Pose { @@ -2705,8 +2710,8 @@ struct Event { driverMonitoringStateDEPRECATED @71 :DriverMonitoringStateDEPRECATED; gpsNMEADEPRECATED @3 :GPSNMEAData; uploaderStateDEPRECATED @79 :UploaderState; - navInstructionDEPRECATED @82 :NavInstruction; - navRouteDEPRECATED @83 :NavRoute; + navInstruction @82 :NavInstruction; + navRoute @83 :NavRoute; navThumbnailDEPRECATED @84 :Thumbnail; gnssMeasurementsDEPRECATED @91 :GnssMeasurements; mapRenderStateDEPRECATED @105: MapRenderState; diff --git a/openpilot/cereal/services.py b/openpilot/cereal/services.py index 78c7bde18..541a06298 100755 --- a/openpilot/cereal/services.py +++ b/openpilot/cereal/services.py @@ -52,6 +52,8 @@ _services: dict[str, tuple] = { "procLog": (True, 0.5, 15, QueueSize.BIG), "gpsLocationExternal": (True, 10., 10), "gpsLocation": (True, 1., 1), + "navInstruction": (True, 1., 10), + "navRoute": (True, 0.), "ubloxGnss": (True, 10.), "qcomGnss": (True, 2.), "clocks": (True, 0.1, 1),