diff --git a/include/f1x/openauto/autoapp/Service/SensorService.hpp b/include/f1x/openauto/autoapp/Service/SensorService.hpp
index 4343d3e..ee0e2b4 100644
--- a/include/f1x/openauto/autoapp/Service/SensorService.hpp
+++ b/include/f1x/openauto/autoapp/Service/SensorService.hpp
@@ -36,6 +36,7 @@ public:
SensorService(boost::asio::io_service& ioService, aasdk::messenger::IMessenger::Pointer messenger);
bool isNight = false;
bool previous = false;
+ bool stopPolling = false;
void start() override;
void stop() override;
@@ -50,6 +51,7 @@ private:
void sendNightData();
bool is_file_exist(const char *filename);
void nightSensorPolling();
+ bool firstRun = true;
boost::asio::deadline_timer timer_;
boost::asio::io_service::strand strand_;
diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp
index 6519b70..e8d5ba1 100644
--- a/src/autoapp/UI/MainWindow.cpp
+++ b/src/autoapp/UI/MainWindow.cpp
@@ -191,7 +191,6 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
ui_->SysinfoTopLeft->hide();
ui_->pushButtonWifiSetup->hide();
- //ui_->pushButtonNoDevice->hide();
ui_->pushButtonAndroidAuto->hide();
ui_->pushButtonAndroidAuto2->hide();
@@ -251,11 +250,11 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
// hide wifi if not forced
if (!this->wifiButtonForce) {
- //ui_->pushButtonWifi->hide();
- ui_->pushButtonWifi2->hide();
ui_->AAWIFIWidget->hide();
+ ui_->AAWIFIWidget2->hide();
} else {
ui_->AAUSBWidget->hide();
+ ui_->AAUSBWidget2->hide();
}
// set custom buttons if file enabled by trigger file
@@ -1199,7 +1198,7 @@ void f1x::openauto::autoapp::ui::MainWindow::setTrigger()
void f1x::openauto::autoapp::ui::MainWindow::setRetryUSBConnect()
{
- ui_->SysinfoTopLeft->setText("Trying USB reconnect ...");
+ ui_->SysinfoTopLeft->setText("Trying USB connect ...");
ui_->SysinfoTopLeft->show();
QTimer::singleShot(10000, this, SLOT(resetRetryUSBMessage()));
@@ -1387,18 +1386,23 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged()
}
// check if phone is conencted to usb
-
if (std::ifstream("/tmp/android_device")) {
if (ui_->pushButtonAndroidAuto->isVisible() == false) {
ui_->pushButtonAndroidAuto->show();
- ui_->pushButtonAndroidAuto2->show();
ui_->pushButtonNoDevice->hide();
}
+ if (ui_->pushButtonAndroidAuto2->isVisible() == false) {
+ ui_->pushButtonAndroidAuto2->show();
+ ui_->pushButtonNoDevice2->hide();
+ }
} else {
if (ui_->pushButtonAndroidAuto->isVisible() == true) {
- ui_->pushButtonAndroidAuto->hide();
- ui_->pushButtonAndroidAuto2->hide();
ui_->pushButtonNoDevice->show();
+ ui_->pushButtonAndroidAuto->hide();
+ }
+ if (ui_->pushButtonAndroidAuto2->isVisible() == true) {
+ ui_->pushButtonNoDevice2->show();
+ ui_->pushButtonAndroidAuto2->hide();
}
}
@@ -1534,7 +1538,7 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged()
}
}
- // check if sutdown is external triggered and init clean app exit
+ // check if shutdown is external triggered and init clean app exit
if (std::ifstream("/tmp/external_exit")) {
f1x::openauto::autoapp::ui::MainWindow::MainWindow::exit();
}
@@ -1542,20 +1546,20 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged()
QFileInfo hotspotFile("/tmp/hotspot_active");
this->hotspotActive = hotspotFile.exists();
- // hide wifi if not forced
+ // hide wifi if hotspot disabled
if (!this->hotspotActive) {
- if ((ui_->AAWIFIWidget->isVisible() == true) || (ui_->pushButtonWifi2->isVisible() == true)){
- //ui_->pushButtonWifi->hide();
+ if ((ui_->AAWIFIWidget->isVisible() == true) || (ui_->AAWIFIWidget2->isVisible() == true)){
ui_->AAWIFIWidget->hide();
- ui_->pushButtonWifi2->hide();
+ ui_->AAWIFIWidget2->hide();
ui_->AAUSBWidget->show();
+ ui_->AAUSBWidget2->show();
}
} else {
- if ((ui_->AAWIFIWidget->isVisible() == false) || (ui_->pushButtonWifi2->isVisible() == false)) {
- //ui_->pushButtonWifi->show();
+ if ((ui_->AAWIFIWidget->isVisible() == false) || (ui_->AAWIFIWidget2->isVisible() == false)) {
ui_->AAWIFIWidget->show();
- ui_->pushButtonWifi2->show();
+ ui_->AAWIFIWidget2->show();
ui_->AAUSBWidget->hide();
+ ui_->AAUSBWidget2->hide();
}
}
@@ -1564,11 +1568,19 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged()
ui_->pushButtonWifi->show();
ui_->pushButtonNoWiFiDevice->hide();
}
+ if (ui_->pushButtonWifi2->isVisible() == false) {
+ ui_->pushButtonWifi2->show();
+ ui_->pushButtonNoWiFiDevice2->hide();
+ }
} else {
if (ui_->pushButtonWifi->isVisible() == true) {
ui_->pushButtonNoWiFiDevice->show();
ui_->pushButtonWifi->hide();
}
+ if (ui_->pushButtonWifi2->isVisible() == true) {
+ ui_->pushButtonNoWiFiDevice2->show();
+ ui_->pushButtonWifi2->hide();
+ }
}
// handle dummys in classic menu
@@ -1576,7 +1588,7 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged()
if (ui_->pushButtonCameraShow2->isVisible() == true) {
button_count = button_count + 1;
}
- if (ui_->pushButtonWifi2->isVisible() == true) {
+ if (ui_->AAWIFIWidget2->isVisible() == true) {
button_count = button_count + 1;
}
if (ui_->pushButtonDebug2->isVisible() == true) {
diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui
index 7f2ab11..d0b75a2 100644
--- a/src/autoapp/UI/mainwindow.ui
+++ b/src/autoapp/UI/mainwindow.ui
@@ -7,7 +7,7 @@
0
0
862
- 1301
+ 1419
@@ -1621,6 +1621,18 @@ outline: none;
0
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
background-color: rgba(136, 138, 133, 0.5);
outline: none;
@@ -1649,6 +1661,18 @@ outline: none;
0
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
background-color: rgba(136, 138, 133, 0.5);
outline: none;
@@ -1677,6 +1701,18 @@ outline: none;
0
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
background-color: rgba(136, 138, 133, 0.5);
outline: none;
@@ -1705,6 +1741,18 @@ outline: none;
0
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
background-color: rgba(136, 138, 133, 0.5);
outline: none;
@@ -1733,6 +1781,18 @@ outline: none;
0
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
background-color: rgba(136, 138, 133, 0.5);
outline: none;
@@ -1761,6 +1821,18 @@ outline: none;
0
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
background-color: rgba(136, 138, 133, 0.5);
outline: none;
@@ -1813,6 +1885,18 @@ outline: none;
0
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
background-color: rgba(136, 138, 133, 0.5);
outline: none;
@@ -1841,6 +1925,18 @@ outline: none;
0
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
background-color: rgba(136, 138, 133, 0.5);
outline: none;
@@ -1869,6 +1965,18 @@ outline: none;
0
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
background-color: rgba(136, 138, 133, 0.5);
outline: none;
@@ -1948,59 +2056,207 @@ outline: none;
10
-
-
+
0
0
-
- background-color: rgba(136, 138, 133, 0.5);
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
+
+ background-color: rgba(136, 138, 133, 0.5);
outline: none;
-
-
-
-
-
-
- :/aausb-hot.png
-
-
-
-
- 50
- 50
-
-
+
+
+
+
+
+
+ :/aausb-hot.png
+
+
+
+
+ 50
+ 50
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
+
+
+ 75
+ true
+
+
+
+ background-color: rgba(136, 138, 133, 0.5);
+color: rgb(255, 255, 255);
+outline: none;
+
+
+ No
+USB
+Device
+
+
+
+
-
-
+
0
0
-
- background-color: rgba(136, 138, 133, 0.5);
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
+
+ background-color: rgba(136, 138, 133, 0.5);
outline: none;
-
-
-
-
-
-
- :/aawifi-hot.png
-
-
-
-
- 50
- 50
-
-
+
+
+
+
+
+
+ :/aawifi-hot.png
+
+
+
+
+ 50
+ 50
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
+
+
+ 75
+ true
+
+
+
+ background-color: rgba(136, 138, 133, 0.5);
+color: rgb(255, 255, 255);
+outline: none;
+
+
+ No
+WiFi
+Device
+
+
+
+
-
@@ -2011,6 +2267,18 @@ outline: none;
0
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
background-color: rgba(136, 138, 133, 0.5);
outline: none;
@@ -2039,6 +2307,18 @@ outline: none;
0
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
background-color: rgba(136, 138, 133, 0.5);
outline: none;
@@ -2067,6 +2347,18 @@ outline: none;
0
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
background-color: rgba(136, 138, 133, 0.5);
outline: none;
@@ -2095,6 +2387,18 @@ outline: none;
0
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
background-color: rgba(136, 138, 133, 0.5);
outline: none;
@@ -2123,6 +2427,18 @@ outline: none;
0
+
+
+ 66
+ 0
+
+
+
+
+ 66
+ 16777215
+
+
background-color: rgba(136, 138, 133, 0.5);
outline: none;