From 64b9c1370fc384a02f121265e9d27e88b8b10d9d Mon Sep 17 00:00:00 2001 From: Simon Dean Date: Tue, 7 Jan 2025 22:35:28 +0000 Subject: [PATCH] Switch back to CrankShaft branding --- src/autoapp/Service/AndroidAutoEntity.cpp | 14 +++++++------- src/autoapp/UI/ConnectDialog.cpp | 2 +- src/autoapp/UI/MainWindow.cpp | 6 +++--- src/autoapp/UI/UpdateDialog.cpp | 3 +-- src/autoapp/UI/mainwindow.ui | 2 +- src/btservice/AndroidBluetoothService.cpp | 2 +- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/autoapp/Service/AndroidAutoEntity.cpp b/src/autoapp/Service/AndroidAutoEntity.cpp index 74d968d..c692d07 100644 --- a/src/autoapp/Service/AndroidAutoEntity.cpp +++ b/src/autoapp/Service/AndroidAutoEntity.cpp @@ -177,7 +177,7 @@ namespace f1x { serviceDiscoveryResponse.mutable_channels()->Reserve(256); serviceDiscoveryResponse.set_driver_position(aap_protobuf::service::control::message::DriverPosition::DRIVER_POSITION_RIGHT); serviceDiscoveryResponse.set_can_play_native_media_during_vr(false); - serviceDiscoveryResponse.set_display_name("CubeOne Journey"); + serviceDiscoveryResponse.set_display_name("Crankshaft-NG"); serviceDiscoveryResponse.set_probe_for_support(false); auto *connectionConfiguration = serviceDiscoveryResponse.mutable_connection_configuration(); @@ -191,13 +191,13 @@ namespace f1x { auto *headUnitInfo = serviceDiscoveryResponse.mutable_headunit_info(); - serviceDiscoveryResponse.set_display_name("JourneyOS"); - headUnitInfo->set_make("CubeOne"); - headUnitInfo->set_model("Journey"); - headUnitInfo->set_year("2024"); + serviceDiscoveryResponse.set_display_name("Crankshaft-NG"); + headUnitInfo->set_make("Crankshaft"); + headUnitInfo->set_model("Universal"); + headUnitInfo->set_year("2018"); headUnitInfo->set_vehicle_id("2024110822150988"); - headUnitInfo->set_head_unit_make("CubeOne"); - headUnitInfo->set_head_unit_model("Journey"); + headUnitInfo->set_head_unit_make("f1x"); + headUnitInfo->set_head_unit_model("Crankshaft-NG Autoapp"); headUnitInfo->set_head_unit_software_build("1"); headUnitInfo->set_head_unit_software_version("1.0"); diff --git a/src/autoapp/UI/ConnectDialog.cpp b/src/autoapp/UI/ConnectDialog.cpp index 88587cc..bb503d7 100644 --- a/src/autoapp/UI/ConnectDialog.cpp +++ b/src/autoapp/UI/ConnectDialog.cpp @@ -131,7 +131,7 @@ void ConnectDialog::loadClientList() if (std::ifstream("/tmp/hotspot_active")) { ui_->listWidgetClients->show(); - //ui_->pushButtonUpdate->show(); + ui_->pushButtonUpdate->show(); if (std::ifstream("/tmp/temp_recent_list")) { QFile versionFile(QString("/tmp/temp_recent_list")); versionFile.open(QIODevice::ReadOnly); diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp index a28dec7..77c9e70 100644 --- a/src/autoapp/UI/MainWindow.cpp +++ b/src/autoapp/UI/MainWindow.cpp @@ -2142,7 +2142,7 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged() this->openautoupdate = check_file_exist("/tmp/openauto_update_available"); this->systemupdate = check_file_exist("/tmp/system_update_available"); - /*if (this->csmtupdate || this->udevupdate || this->openautoupdate || this->systemupdate) { + if (this->csmtupdate || this->udevupdate || this->openautoupdate || this->systemupdate) { if (ui_->pushButtonUpdate->isVisible() == false) { ui_->pushButtonUpdate->show(); ui_->label_left->show(); @@ -2153,7 +2153,7 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged() ui_->label_dummy_right->show(); } } - } else {*/ + } else { if (ui_->pushButtonUpdate->isVisible() == true) { ui_->pushButtonUpdate->hide(); ui_->label_left->hide(); @@ -2163,7 +2163,7 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged() ui_->devlabel_right->show(); } } - // } + } if (std::ifstream("/tmp/btdevice") || std::ifstream("/tmp/media_playing") || std::ifstream("/tmp/dev_mode_enabled") || std::ifstream("/tmp/android_device")) { if (ui_->labelLock->isVisible() == false) { diff --git a/src/autoapp/UI/UpdateDialog.cpp b/src/autoapp/UI/UpdateDialog.cpp index 4a311ef..635ea13 100644 --- a/src/autoapp/UI/UpdateDialog.cpp +++ b/src/autoapp/UI/UpdateDialog.cpp @@ -36,8 +36,7 @@ UpdateDialog::UpdateDialog(QWidget *parent) ui_->labelSystemReadyInstall->hide(); ui_->labelUpdateChecking->hide(); ui_->pushButtonUpdateCancel->hide(); - // TODO: Restore once switched - //updateCheck(); + updateCheck(); watcher_tmp = new QFileSystemWatcher(this); watcher_tmp->addPath("/tmp"); diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui index dd911e5..503c8e0 100644 --- a/src/autoapp/UI/mainwindow.ui +++ b/src/autoapp/UI/mainwindow.ui @@ -305,7 +305,7 @@ color: rgb(211, 215, 207); background-color: rgba(255, 255, 255, 0); - <html><head/><body><p><span style=" font-style:normal; color:#7700C8;">Journey</span><span style=" font-style:normal; color:#ffffff;">OS </span></p></body></html> + <html><head/><body><p><span style=" font-style:normal; color:#ffffff;">crank</span><span style=" font-style:normal; color:#5ce739;">shaft </span><span style=" font-style:normal; color:#40bfbf;">NG </span><span style=" font-style:normal; color:#888a85;">- OpenCarOS</span></p></body></html> Qt::AlignCenter diff --git a/src/btservice/AndroidBluetoothService.cpp b/src/btservice/AndroidBluetoothService.cpp index f979848..ce03956 100644 --- a/src/btservice/AndroidBluetoothService.cpp +++ b/src/btservice/AndroidBluetoothService.cpp @@ -32,7 +32,7 @@ namespace f1x::openauto::btservice { serviceInfo_.setAttribute(QBluetoothServiceInfo::ServiceClassIds, classId); serviceInfo_.setAttribute(QBluetoothServiceInfo::ServiceName, "OpenAuto Bluetooth Service"); serviceInfo_.setAttribute(QBluetoothServiceInfo::ServiceDescription, "AndroidAuto WiFi projection automatic setup"); - serviceInfo_.setAttribute(QBluetoothServiceInfo::ServiceProvider, "cubeone.co.uk"); + serviceInfo_.setAttribute(QBluetoothServiceInfo::ServiceProvider, "f1xstudio.com"); serviceInfo_.setServiceUuid(serviceUuid); QBluetoothServiceInfo::Sequence publicBrowse;