diff --git a/assets/camera-hot.png b/assets/camera-hot.png new file mode 100644 index 0000000..ac8d3ec Binary files /dev/null and b/assets/camera-hot.png differ diff --git a/assets/resources.qrc b/assets/resources.qrc index 17a9e9f..f952e89 100644 --- a/assets/resources.qrc +++ b/assets/resources.qrc @@ -14,5 +14,6 @@ sleep-hot.png wifi-hot.png brightness-hot.png + camera-hot.png diff --git a/include/f1x/openauto/autoapp/UI/MainWindow.hpp b/include/f1x/openauto/autoapp/UI/MainWindow.hpp index 2db7fd6..d75556a 100644 --- a/include/f1x/openauto/autoapp/UI/MainWindow.hpp +++ b/include/f1x/openauto/autoapp/UI/MainWindow.hpp @@ -48,6 +48,7 @@ signals: void exit(); void openSettings(); void toggleCursor(); + void toggleCamera(); void openConnectDialog(); void showBrightnessSlider(); diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp index 8a26910..524b5bd 100644 --- a/src/autoapp/UI/MainWindow.cpp +++ b/src/autoapp/UI/MainWindow.cpp @@ -56,6 +56,7 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi ui_->setupUi(this); connect(ui_->pushButtonSettings, &QPushButton::clicked, this, &MainWindow::openSettings); connect(ui_->pushButtonExit, &QPushButton::clicked, this, &MainWindow::exit); + connect(ui_->pushButtonToggleCamera, &QPushButton::clicked, this, &MainWindow::toggleCamera); connect(ui_->pushButtonToggleCursor, &QPushButton::clicked, this, &MainWindow::toggleCursor); connect(ui_->pushButtonWirelessConnection, &QPushButton::clicked, this, &MainWindow::openConnectDialog); connect(ui_->pushButtonBrightness, &QPushButton::clicked, this, &MainWindow::showBrightnessSlider); diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui index 71166c5..a8dfce1 100644 --- a/src/autoapp/UI/mainwindow.ui +++ b/src/autoapp/UI/mainwindow.ui @@ -152,6 +152,32 @@ Qt::Horizontal + + + + 30 + 314 + 64 + 64 + + + + + :/camera-hot.png:/camera-hot.png + + + + 64 + 64 + + + + false + + + true + + @@ -185,6 +211,7 @@ pushButtonWirelessConnection pushButtonToggleCursor pushButtonBrightness + pushButtonToggleCamera pushButtonExit diff --git a/src/autoapp/autoapp.cpp b/src/autoapp/autoapp.cpp index a371880..ddd74bf 100644 --- a/src/autoapp/autoapp.cpp +++ b/src/autoapp/autoapp.cpp @@ -110,6 +110,15 @@ int main(int argc, char* argv[]) qApplication.setOverrideCursor(cursor); }); + QObject::connect(&mainWindow, &autoapp::ui::MainWindow::toggleCamera, [&qApplication]() { +#ifdef RASPBERRYPI3 + system("/opt/crankshaft/toggle_rpicam.sh &"); + OPENAUTO_LOG(info) << "[CS] Ran RPiCam script."; +#else + OPENAUTO_LOG(info) << "[CS] You are not running this on a Raspberry Pi, skipping Cam script."; +#endif + }); + mainWindow.showFullScreen(); aasdk::usb::USBWrapper usbWrapper(usbContext);