From afba3ff9d128160a60e4f55467f9a3dc436b32da Mon Sep 17 00:00:00 2001 From: garrettpall <76917194+garrettpall@users.noreply.github.com> Date: Wed, 31 Jan 2024 19:38:05 -0500 Subject: [PATCH] Revert "Remove by 5, rename toggle" This reverts commit 6629a9067668575900e0a92efb8e19ad732444cc. --- selfdrive/car/gm/gmcan.py | 4 ++-- selfdrive/frogpilot/ui/vehicle_settings.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/selfdrive/car/gm/gmcan.py b/selfdrive/car/gm/gmcan.py index aa45b3d2084f32..274f44c32d440b 100644 --- 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 index f4c201a6dd810e..6c3ddd0ab68148 100644 --- 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> 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.", ""},