Compiled on Apr.23,2024

RELEASES.md

@@ -1,5 +1,6 @@
 Version 0.9.6 (2024-02-27)
 ========================
+* 巡航速度按键对调 (2024-04-23)
 * 踏板状态导出日志 (2024-04-15)
 * 方向油门刹车状态 (2024-04-11)
 * D档数字+导出日志 (2024-04-07)

selfdrive/car/car_helpers.py

@@ -215,7 +215,7 @@ def crash_log(candidate):
     "ConditionalExperimental", "CESpeed", "CESpeedLead", "CECurves", "CECurvesLead", "CENavigation", "CENavigationIntersections",
     "CENavigationLead", "CENavigationTurns", "CESlowerLead", "CEStopLights", "CEStopLightsLead", "CESignal", "CustomPersonalities",
     "AggressiveFollow", "AggressiveJerk", "StandardFollow", "StandardJerk", "RelaxedFollow", "RelaxedJerk", "DeviceShutdown",
-    "ExperimentalModeActivation", "ExperimentalModeViaLKAS", "ExperimentalModeViaScreen", "FireTheBabysitter", "NoLogging", "MuteOverheated",
+    "ExperimentalModeActivation", "ExperimentalModeViaLKAS", "ExperimentalModeViaScreen", "FireTheBabysitter", "NoLogging", "NoDashCam", "MuteOverheated",
     "OfflineMode", "LateralTune", "ForceAutoTune", "NNFF", "SteerRatio", "UseLateralJerk", "LongitudinalTune", "AccelerationProfile",
     "DecelerationProfile", "AggressiveAcceleration", "StoppingDistance", "SmoothBraking", "Model", "MTSCEnabled", "DisableMTSCSmoothing",
     "MTSCAggressiveness", "MTSCCurvatureCheck", "MTSCLimit", "NudgelessLaneChange", "LaneChangeTime", "LaneDetection", "LaneDetectionWidth",

selfdrive/controls/controlsd.py

@@ -178,6 +178,11 @@ class Controls:
     self.params = Params()
     self.params_memory = Params("/dev/shm/params")
 
+    #self.frogpilot_variables.reverse_cruise_increase
+    self.params_memory.put_bool("ReverseCruiseRunTime", self.params.get_bool("ReverseCruise"))
+
+    self.ignore_controls_mismatch = False
+
     self.frogpilot_variables = SimpleNamespace()
 
     self.driving_gear = False
@@ -479,8 +484,9 @@ class Controls:
       if (safety_mismatch and self.sm.frame*DT_CTRL > 10.) or pandaState.safetyRxChecksInvalid or self.mismatch_counter >= 200:
         if self.random_events: #Show Controls Mismatch Error
           self.events.add(EventName.controlsMismatch)
-        else: #Shown as GPS alert
+        elif not self.ignore_controls_mismatch: #Shown as GPS alert
           self.events.add(EventName.noGps)
+          self.ignore_controls_mismatch = True
 
       if log.PandaState.FaultType.relayMalfunction in pandaState.faults:
         self.events.add(EventName.relayMalfunction)

selfdrive/controls/lib/drive_helpers.py

@@ -94,7 +94,7 @@ class VCruiseHelper:
           break
 
     # Reverse the long press value for reverse cruise increase
-    if frogpilot_variables.reverse_cruise_increase:
+    if frogpilot_variables.reverse_cruise_increase and self.params_memory.get_bool("ReverseCruiseRunTime"):
       long_press = not long_press
 
     if button_type is None:

selfdrive/frogpilot/fleetmanager/helpers.py

@@ -446,7 +446,7 @@ def get_all_toggle_values():
     "CENavigationLead", "CENavigationTurns", "CESlowerLead", "CEStopLights", "CEStopLightsLead", "CESignal", "HideCEMStatusBar",
     "CustomPersonalities", "AggressiveFollow", "AggressiveJerk", "StandardFollow", "StandardJerk", "RelaxedFollow", "RelaxedJerk", "DeviceShutdown",
     "ExperimentalModeActivation", "ExperimentalModeViaDistance", "ExperimentalModeViaLKAS", "ExperimentalModeViaScreen", "FireTheBabysitter",
-    "NoLogging", "NoUploads", "MuteOverheated", "OfflineMode", "LateralTune", "ForceAutoTune", "NNFF", "SteerRatio", "UseLateralJerk", "LongitudinalTune",
+    "NoLogging", "NoDashCam", "NoUploads", "MuteOverheated", "OfflineMode", "LateralTune", "ForceAutoTune", "NNFF", "SteerRatio", "UseLateralJerk", "LongitudinalTune",
     "AccelerationProfile", "DecelerationProfile", "AggressiveAcceleration", "StoppingDistance", "SmoothBraking", "Model", "MTSCEnabled",
     "DisableMTSCSmoothing", "MTSCAggressiveness", "MTSCCurvatureCheck", "MTSCLimit", "NudgelessLaneChange", "LaneChangeTime", "LaneDetection",
     "LaneDetectionWidth", "OneLaneChange", "QOLControls", "DisableOnroadUploads", "HigherBitrate", "NavChill", "PauseLateralOnSignal",

selfdrive/manager/manager.py

@@ -196,6 +196,7 @@ def manager_init() -> None:
     ("NavChill", "0"),
     ("NNFF", "1"),
     ("NoLogging", "0"),
+    ("NoDashCam", "0"),
     ("NoUploads", "0"),
     ("NudgelessLaneChange", "1"),
     ("NumericalTemp", "0"),