Merge branch 'master' into dev-priv/master

common/params.cc

@@ -244,6 +244,7 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"GpxDeleteAfterUpload", PERSISTENT},
     {"GpxDeleteIfUploaded", PERSISTENT},
     {"HandsOnWheelMonitoring", PERSISTENT},
+    {"HideVEgoUi", PERSISTENT},
     {"LastCarModel", PERSISTENT},
     {"LastSpeedLimitSignTap", PERSISTENT},
     {"LiveTorque", PERSISTENT},
@@ -263,7 +264,6 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"QuietDrive", PERSISTENT},
     {"ReverseAccChange", PERSISTENT},
     {"ShowDebugUI", PERSISTENT},
-    {"ShowVEgoUI", PERSISTENT},
     {"SpeedLimitControl", PERSISTENT},
     {"SpeedLimitPercOffset", PERSISTENT},
     {"SpeedLimitStyle", PERSISTENT},

selfdrive/manager/manager.py

@@ -75,6 +75,7 @@ def manager_init() -> None:
     ("GpxDeleteAfterUpload", "1"),
     ("GpxDeleteIfUploaded", "1"),
     ("HandsOnWheelMonitoring", "0"),
+    ("HideVEgoUi", "0"),
     ("LastSpeedLimitSignTap", "0"),
     ("MadsIconToggle", "1"),
     ("MaxTimeOffroad", "9"),
@@ -93,6 +94,7 @@ def manager_init() -> None:
     ("TorqueDeadzoneDeg", "0"),
     ("TorqueFriction", "1"),
     ("TorqueMaxLatAccel", "250"),
+    ("TrueVEgoUi", "0"),
     ("TurnSpeedControl", "0"),
     ("TurnVisionControl", "0"),
     ("VisionCurveLaneless", "0"),