Fixed camera stream too big and colorimetry setting

README.md

@@ -1,42 +1,23 @@
-# OpenDash
+# astraDash
 
-OpenDash is a Qt-based infotainment center for your Linux OpenAuto installation!
-The OpenDash project includes OpenAuto, AASDK, and Dash.
+astraDash is a Qt-based infotainment center for my Opel Astra H GTC Linux setup!
+The astraDash project includes OpenAuto, AASDK, and OpenDash.
 
-Main features of Dash include:
+Main added features of astraDash include:
 
-*	Embedded OpenAuto `Windowed/Fullscreen`
-*	Wireless OpenAuto Capability
-*	On-screen Volume, Brightness, & Theme Control
-*	Responsive Scalable UI `Adjustable for screen size`
-*	Bluetooth Media Control
-*	Real-Time Vehicle OBD-II Data & SocketCAN Capabilities
-*	Theming `Dark/Light mode` `Customizable RGB Accent Color`
-*	True Raspberry Pi 7” Official Touchscreen Brightness Control
-*	App-Launcher built in
-*	Camera Access `Streaming/Local` `Backup` `Dash`
-*	Keyboard Shortcuts `GPIO Triggerable`
+*	Read CanBus frames from localhost
+*	Camera size fix and brightness control
+* Fix clima bar
+* Read SWC, Clima, Temps, Speed, oil level, fuel level, and more.
 
-![](docs/imgs/opendash-ui.gif)
 
-# Getting Started
 
-## Video walk through
-_steps may be slightly different such as ia (intelligent-auto) has been renamed to dash, the UI has changed, etc..._
+![VirtualBox_Raspberry_15_09_2023_17_28_48](https://github.com/Gioee/astraDash/assets/48024736/cc016721-bed5-4a62-a9d0-ec41741e3f75)
 
-https://youtu.be/CIdEN2JNAzw
+![VirtualBox_Raspberry_15_09_2023_17_29_05](https://github.com/Gioee/astraDash/assets/48024736/859c11ee-af64-4587-9a68-9535dddefcbb)
 
-## Install Script
+![VirtualBox_Raspberry_15_09_2023_17_29_18](https://github.com/Gioee/astraDash/assets/48024736/0e7b7945-c339-4613-9159-b08777a23825)
 
-Dash can be built automatically utilizing an included script.
+![VirtualBox_Raspberry_15_09_2023_17_29_27](https://github.com/Gioee/astraDash/assets/48024736/d01e0933-ddb3-4da1-bf81-2d1f71bbdc3f)
 
-The install script included in the dash repo will install all the required packages and compile all portions of the OpenDash project.
-
-### 1. Clone the repo, Run the install script
-```
-git clone https://github.com/openDsh/dash
-
-cd dash
-
-./install.sh
-```
+![VirtualBox_Raspberry_15_09_2023_17_29_36](https://github.com/Gioee/astraDash/assets/48024736/ab18e7df-929a-46ed-b63c-08c1ce8a1979)

include/app/action.hpp

@@ -96,18 +96,18 @@ class ActionEventFilter : public QObject
 {
     Q_OBJECT
 
-   public:
-    ActionEventFilter(){};
-    bool eventFilter(QObject* obj, QEvent* event);
-    static ActionEventFilter *get_instance();
-    QMap<int, Action*> eventFilterMap;
-
-    void enable() { this->disabled = false; }
-    void disable() { this->disabled = true; }
-
-   private:
-    std::mutex mutex_;
-    bool disabled = false;
+    public:
+        ActionEventFilter(){};
+        bool eventFilter(QObject* obj, QEvent* event);
+        static ActionEventFilter *get_instance();
+        QMap<int, Action*> eventFilterMap;
+
+        void enable() { this->disabled = false; }
+        void disable() { this->disabled = true; }
+
+    private:
+        std::mutex mutex_;
+        bool disabled = false;
 };
 
 

include/app/arbiter.hpp

@@ -45,6 +45,7 @@ class Arbiter : public QObject {
     void increase_volume(uint8_t val);
     void set_cursor(bool enabled);
     void set_action(Action *action, QString key);
+    void send_vehicle_data(QString gauge_id, double value);
 
     QMainWindow *window();
     QSettings &settings() { return this->session_.settings_; }
@@ -77,4 +78,5 @@ class Arbiter : public QObject {
     void volume_changed(uint8_t volume);
     void cursor_changed(bool enabled);
     void action_changed(Action *action, QString key);
+    void vehicle_update_data(QString gauge_id, double value);
 };

include/app/config.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "openauto/Configuration/Configuration.hpp"
-#include "canbus/ICANBus.hpp"
 
 #include <QObject>
 #include <QSettings>
@@ -64,8 +63,8 @@ class Config : public QObject {
         emit si_units_changed(this->si_units);
     }
 
-    inline ICANBus::VehicleBusType get_vehicle_can_bus() { return this->vehicle_can_bus; }
-    inline void set_vehicle_can_bus(ICANBus::VehicleBusType vehicle_can_bus)
+    inline bool get_vehicle_can_bus() { return this->vehicle_can_bus; }
+    inline void set_vehicle_can_bus(bool vehicle_can_bus)
     {
         this->vehicle_can_bus = vehicle_can_bus;
         this->settings.setValue("Pages/Vehicle/can_bus", this->vehicle_can_bus);
@@ -186,7 +185,7 @@ class Config : public QObject {
     QString radio_plugin;
     QString media_home;
     bool si_units;
-    ICANBus::VehicleBusType vehicle_can_bus;
+    bool vehicle_can_bus;
     QString vehicle_interface;
     QString vehicle_plugin;
     QString cam_network_url;
@@ -205,6 +204,6 @@ class Config : public QObject {
     void si_units_changed(bool si_units);
     void cam_autoconnect_changed(bool enabled);
     void cam_overlay_changed(bool enabled);
-    void vehicle_can_bus_changed(ICANBus::VehicleBusType state);
+    void vehicle_can_bus_changed(bool state);
     void vehicle_interface_changed(QString interface);
-};
+};

include/app/pages/vehicle.hpp

@@ -3,60 +3,114 @@
 #include <QPair>
 #include <QtWidgets>
 #include <QPluginLoader>
-#include <QMap>
 
 #include "canbus/socketcanbus.hpp"
 #include "obd/message.hpp"
-#include "obd/command.hpp"
+#include "obd/conversions.hpp"
+
 #include "app/widgets/selector.hpp"
 #include "app/widgets/dialog.hpp"
-
 #include "app/pages/page.hpp"
 
 class Arbiter;
 
-typedef std::function<double(double, bool)> obd_decoder_t;
 typedef QPair<QString, QString> units_t;
+struct font_size_t
+{
+    int label;
+    int value;
+    int unit;
+};
+typedef std::function<double(double, bool)> unit_converter_t;
+
+struct GaugeConfig
+{
+    QString id;
+    QString description;
+    units_t units;
+    font_size_t font_size;
+    int precision;
+    unit_converter_t converter;
+};
 
-class Gauge : public QWidget {
+// typedef QList<Gauge> Gauges;
+struct GaugesConfig
+{
+    GaugeConfig AUTONOMIA;
+    GaugeConfig COOLANT_TEMP;
+    GaugeConfig RPM;
+    GaugeConfig SPEED;
+    GaugeConfig INTAKE_TEMP;
+    GaugeConfig EXT_TEMP;
+    GaugeConfig VOLT;
+    GaugeConfig MAF;
+    GaugeConfig MAP;
+    GaugeConfig APP;
+    GaugeConfig TPAPWM;
+    GaugeConfig INJ;
+    GaugeConfig TVENT;
+    GaugeConfig TANK;
+    GaugeConfig IGNANGLE;
+    GaugeConfig BATT;
+    GaugeConfig RITCYL1;
+    GaugeConfig RITCYL2;
+    GaugeConfig RITCYL3;
+    GaugeConfig RITCYL4;
+    GaugeConfig SFT;
+    GaugeConfig LMB1;
+    GaugeConfig LMB2;
+    GaugeConfig LSOIL;
+    GaugeConfig LSLVLCOOLANT;
+    GaugeConfig LSBENZ;
+    GaugeConfig LSVOLT;
+    GaugeConfig LSINIEZS;
+    GaugeConfig LSINIEZH;
+    GaugeConfig LSINIEZKM;
+};
+
+class Gauge : public QWidget
+{
     Q_OBJECT
 
-   public:
-    enum Orientation { BOTTOM, RIGHT };
+public:
+    enum Orientation
+    {
+        BOTTOM,
+        RIGHT
+    };
 
-    Gauge(units_t units, QFont value_font, QFont unit_font, Orientation orientation, int rate,
-          std::vector<Command> cmds, int precision, obd_decoder_t decoder, QWidget *parent = nullptr);
+    Gauge(GaugeConfig cfg, QFont value_font, QFont unit_font, Orientation orientation, QWidget *parent = nullptr);
 
-    inline void start() { this->timer->start(this->rate); }
-    inline void stop() { this->timer->stop(); }
-    void can_callback(QByteArray payload);
+    inline QString get_id() { return this->id; };
+    void set_value(double value);
 
-   private:
+private:
     QString format_value(double value);
     QString null_value();
     QLabel *value_label;
 
-    obd_decoder_t decoder;
-    std::vector<Command> cmds;
+    unit_converter_t converter;
 
+    QString id;
     bool si;
-    int rate;
     int precision;
-    QTimer *timer;
+    units_t units;
 
-   signals:
+signals:
     void toggle_unit(bool si);
 };
 
-class VehiclePage : public QTabWidget, public Page {
+class VehiclePage : public QTabWidget, public Page
+{
     Q_OBJECT
 
-   public:
+public:
     VehiclePage(Arbiter &arbiter, QWidget *parent = nullptr);
+    QWidget *obd;
 
     void init() override;
 
-   private:
+private:
     void get_plugins();
     void load_plugin();
     QWidget *dialog_body();
@@ -67,26 +121,83 @@ class VehiclePage : public QTabWidget, public Page {
     QMap<QString, QFileInfo> plugins;
     QStringList can_devices;
     QStringList serial_devices;
-    QMap<QString, QString> paired_bt_devices;
     QPluginLoader *active_plugin;
     Selector *plugin_selector;
     Config *config;
 };
 
-class DataTab : public QWidget {
+class DataTab : public QWidget
+{
     Q_OBJECT
 
-   public:
+public:
     DataTab(Arbiter &arbiter, QWidget *parent = nullptr);
 
-   private:
+private:
     Arbiter &arbiter;
     QWidget *speedo_tach_widget();
-    // QWidget *mileage_data_widget();
     QWidget *engine_data_widget();
-    QWidget *coolant_temp_widget();
-    QWidget *engine_load_widget();
+    QWidget *vehicle_data_widget(GaugeConfig cfg);
+
+    std::vector<Gauge *> gauges;
+};
+
+class Obd1Tab : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Obd1Tab(Arbiter &arbiter, QWidget *parent = nullptr);
+
+private:
+    Arbiter &arbiter;
+    QWidget *obd_data_widget(int colonna);
+    QWidget *vehicle_data_widget(GaugeConfig cfg);
+
+    std::vector<Gauge *> gauges;
+};
+
+class Obd2Tab : public QWidget
+{
+    Q_OBJECT
+
+public:
+    Obd2Tab(Arbiter &arbiter, QWidget *parent = nullptr);
+
+private:
+    Arbiter &arbiter;
+    QWidget *obd_data_widget(int colonna);
+    QWidget *vehicle_data_widget(GaugeConfig cfg);
+
+    std::vector<Gauge *> gauges;
+};
+
+class LSTab : public QWidget
+{
+    Q_OBJECT
+
+public:
+    LSTab(Arbiter &arbiter, QWidget *parent = nullptr);
+
+private:
+    Arbiter &arbiter;
+    QWidget *ls_data_widget(int colonna);
+    QWidget *vehicle_data_widget(GaugeConfig cfg);
 
     std::vector<Gauge *> gauges;
 };
 
+class ACTab : public QWidget
+{
+    Q_OBJECT
+
+public:
+    ACTab(Arbiter &arbiter, QWidget *parent = nullptr);
+
+private:
+    Arbiter &arbiter;
+    QWidget *aq_row_widget();
+    QWidget *aq_selector_widget();
+    QWidget *ac_row_widget();
+    QWidget *ac_switch_widget();
+};