Torqued: Hide torqued in Dev UI when Custom Live Tune is overriding (#317)

This commit is contained in:
Jason Wen
2023-10-01 03:14:36 -04:00
committed by GitHub
parent cc47228363
commit e6d11a46b4
3 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -588,7 +588,7 @@ void AnnotatedCameraWidget::updateState(const UIState &s) {
steeringTorqueEps = car_state.getSteeringTorqueEps();
bearingAccuracyDeg = gpsLocationExternal.getBearingAccuracyDeg();
bearingDeg = gpsLocationExternal.getBearingDeg();
torquedUseParams = ltp.getUseParams() || s.scene.live_torque_toggle;
torquedUseParams = (ltp.getUseParams() || s.scene.live_torque_toggle) && !s.scene.torqued_override;
latAccelFactorFiltered = ltp.getLatAccelFactorFiltered();
frictionCoefficientFiltered = ltp.getFrictionCoefficientFiltered();
liveValid = ltp.getLiveValid();
+1
View File
@@ -254,6 +254,7 @@ void ui_update_params(UIState *s) {
s->scene.e2e_long_alert_ui = params.getBool("EndToEndLongAlertUI");
s->scene.map_3d_buildings = params.getBool("Map3DBuildings");
s->scene.live_torque_toggle = params.getBool("LiveTorque");
s->scene.torqued_override = params.getBool("TorquedOverride");
// Handle Onroad Screen Off params
if (s->scene.onroadScreenOff > 0) {
+2
View File
@@ -238,6 +238,8 @@ typedef struct UIScene {
bool onroad_settings_visible;
bool map_3d_buildings;
bool torqued_override;
} UIScene;
class UIState : public QObject {