Merge branch 'background-sunnylink-register' into master-dev-c3

# Conflicts:
#	selfdrive/ui/qt/offroad/sunnypilot/sunnylink_settings.cc
#	system/manager/manager.py
#	system/manager/sunnylink.py
This commit is contained in:
DevTekVE
2024-06-20 08:18:55 +02:00
3 changed files with 1 additions and 9 deletions
@@ -45,10 +45,6 @@ SunnylinkPanel::SunnylinkPanel(QWidget* parent) : QFrame(parent) {
sunnylinkEnabledBtn->setDescription(shame_description);
}
//auto dialog_text = tr("A reboot is required to") + " " + (enabled ? tr("start") : tr("stop")) +" "+ tr("all connections and processes from sunnylink.") + "<br/><small>"+ tr("If that's not a problem for you, you can ignore this.")+ "</small>";
//if (ConfirmationDialog::confirm(dialog_text, tr("Reboot Now!"), this)) {
// Hardware::reboot();
//}
updateLabels();
});
+1 -4
View File
@@ -73,11 +73,9 @@ def manager_init() -> None:
("LastSpeedLimitSignTap", "0"),
("LkasToggle", "0"),
("MadsIconToggle", "1"),
("MapboxFullScreen", "0"),
("MapdVersion", f"{VERSION}"),
("MaxTimeOffroad", "9"),
("NNFF", "0"),
("NNFFNoLateralJerk", "0"),
("OnroadScreenOff", "-2"),
("OnroadScreenOffBrightness", "50"),
("OnroadScreenOffEvent", "1"),
@@ -98,7 +96,6 @@ def manager_init() -> None:
("StockLongToyota", "0"),
("TorqueDeadzoneDeg", "0"),
("TorqueFriction", "1"),
("TorqueLateralJerk", "0"),
("TorqueMaxLatAccel", "250"),
("TrueVEgoUi", "0"),
("TurnSpeedControl", "0"),
@@ -109,7 +106,7 @@ def manager_init() -> None:
("OsmDownloadedDate", "0"),
("OSMDownloadProgress", "{}"),
("SidebarTemperatureOptions", "0"),
("SunnylinkEnabled", "1"),
("SunnylinkEnabled", "0" if (build_metadata.release_channel or build_metadata.release_sp_channel) else "1"),
("SunnylinkDongleId", f"{UNREGISTERED_SUNNYLINK_DONGLE_ID}"),
("CustomDrivingModel", "0"),
("DrivingModelGeneration", "4"),
-1
View File
@@ -11,7 +11,6 @@ def main():
if not Params().get_bool("SunnylinkEnabled"):
print("Sunnylink is not enabled. Exiting.")
# spinner.close()
exit(0)
if not is_prebuilt():