Revert "Remove by 5, rename toggle"

This reverts commit 6629a90.
garrettpall · Feb 1, 2024 · afba3ff · afba3ff
1 parent 0d5a8d1
commit afba3ff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/selfdrive/car/gm/gmcan.py b/selfdrive/car/gm/gmcan.py
@@ -258,10 +258,10 @@ def create_gm_acc_spam_command(packer, controller, CS, slcSet, bus):
   FRAMES_ON = 12
   FRAMES_OFF = 18
 
-  if False: #slcSet <= int(math.floor((speedSetPoint - 1)/5.0)*5.0) and speedSetPoint > 20:
+  if slcSet <= int(math.floor((speedSetPoint - 1)/5.0)*5.0) and speedSetPoint > 20:
     cruiseBtn = CruiseButtons.DECEL_SET
     byfive = 1
-  elif False: #slcSet >= int(math.ceil((speedSetPoint + 1)/5.0)*5.0):
+  elif slcSet >= int(math.ceil((speedSetPoint + 1)/5.0)*5.0):
     cruiseBtn = CruiseButtons.RES_ACCEL
     byfive = 1
   elif slcSet < speedSetPoint and speedSetPoint > 16:

diff --git a/selfdrive/frogpilot/ui/vehicle_settings.cc b/selfdrive/frogpilot/ui/vehicle_settings.cc
@@ -102,7 +102,7 @@ FrogPilotVehiclesPanel::FrogPilotVehiclesPanel(SettingsWindow *parent) : FrogPil
   addItem(forceFingerprint);
 
   std::vector<std::tuple<QString, QString, QString, QString>> vehicleToggles {
-    {"CSLCEnabled", "GM CSLC", "Set cars cruise speed based on SLC, MTSC, and VTSC. For SDGM and CAM cars only.", ""},
+    {"CSLCEnabled", "GM SDGM CSLC", "Set cars cruise speed based on SLC, MTSC, and VTSC.", ""},
     {"EVTable", "EV Lookup Tables", "Smoothen out the gas and brake controls for EV vehicles.", ""},
     {"GasRegenCmd", "GM Truck Gas Tune", "Increase acceleration and smoothen brake to stop. For use on Silverado/Sierra only.", ""},
     {"LongPitch", "Long Pitch Compensation", "Reduce speed and acceleration error for greater passenger comfort and improved vehicle efficiency.", ""},