Move OBD2 reading/parsing logic from Vehicle page to dedicated plugin

.gitignore

@@ -65,6 +65,8 @@ openauto.ini
 
 # Plugins #
 ###########
+!plugins/vehicle/
 plugins/vehicle/*
 !plugins/vehicle/test
+!plugins/vehicle/obd2
 !plugins/vehicle/README.md

include/app/arbiter.hpp

@@ -39,6 +39,7 @@ class Arbiter : public QObject {
     void set_action(Action *action, QString key);
     void send_openauto_button_press(aasdk::proto::enums::ButtonCode::Enum buttonCode, openauto::projection::WheelDirection wheelDirection = openauto::projection::WheelDirection::NONE);
     void send_openauto_full_screen(bool fullscreen = true);
+    void send_vehicle_data(QString gauge_id, int value);
 
     QMainWindow *window() { return this->window_; }
     QSettings &settings() { return this->session_.settings_; }
@@ -68,4 +69,5 @@ class Arbiter : public QObject {
     void action_changed(Action *action, QString key);
     void openauto_button_press(aasdk::proto::enums::ButtonCode::Enum buttonCode, openauto::projection::WheelDirection wheelDirection);
     void openauto_full_screen(bool fullscreen);
+    void vehicle_update_data(QString gauge_id, int value);
 };

include/app/pages/vehicle.hpp

@@ -6,42 +6,63 @@
 
 #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;
+};
+
+// typedef QList<Gauge> Gauges;
+struct GaugesConfig {
+    GaugeConfig LOAD;
+    GaugeConfig COOLANT_TEMP;
+    GaugeConfig RPM;
+    GaugeConfig SPEED;
+    GaugeConfig INTAKE_TEMP;
+    GaugeConfig MPG;
+};
 
 class Gauge : public QWidget {
     Q_OBJECT
 
    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(int value);
 
    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:
     void toggle_unit(bool si);
@@ -82,8 +103,7 @@ class DataTab : public QWidget {
     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;
 };

include/obd/command.hpp

@@ -2,22 +2,29 @@
 
 #include <functional>
 #include <string>
+
+#include <QTimer>
 #include <QCanBusFrame>
 #include "obd/message.hpp"
 
+typedef std::function<double(Response)> decoder_t;
+
 struct Command {
-    std::string description;
+    QString id;
     QCanBusFrame frame;
-    std::function<double(Response)> decoder;
+    decoder_t decoder;
+    QTimer *timer;
+    int rate;
 };
 
-struct Commands {
-    Command LOAD;
-    Command COOLANT_TEMP;
-    Command RPM;
-    Command SPEED;
-    Command INTAKE_TEMP;
-    Command MAF;
-};
+typedef QList<Command> Commands;
+// struct Commands {
+//     Command LOAD;
+//     Command COOLANT_TEMP;
+//     Command RPM;
+//     Command SPEED;
+//     Command INTAKE_TEMP;
+//     Command MAF;
+// };
 
 extern Commands cmds;

include/obd/conversions.hpp

@@ -1,9 +1,14 @@
 #pragma once
 
-double kph_to_mph(double val) { return val * 0.621371; }
+class Conversion {
+  public:
+    static double kph_to_mph(double val) { return val * 0.621371; };
 
-double c_to_f(double val) { return (val * 9 / 5) + 32; }
+    static double c_to_f(double val) { return (val * 9 / 5) + 32; };
 
-double gps_to_gph(double val) { return val * 0.0805; }
+    static double gps_to_gph(double val) { return val * 0.0805; };
 
-double gps_to_lph(double val) { return val * 3.6; }
+    static double gps_to_lph(double val) { return val * 3.6; };
+
+    static double l100km_to_mpg(double val) { return (val == 0 ? 0 : (235.214583 / val)); };
+};

plugins/vehicle/obd2/README.md

@@ -0,0 +1,21 @@
+# OBD2 integration
+
+To test without OBD2, send packets via CANBUS:
+
+```bash
+cansend can0 7e8#03010D1e11100000 # speed 30 km/h
+cansend can0 7e8#03010C1e11100000 # rpm to 1.9
+cansend can0 7e8#0301056e00000000 # temp to 70C
+cansend can0 7e8#0301046e11100000 # engine load 43%
+# mpg  - 10l/100km (23mpg)
+cansend can0 7e8#030110004f111110 && cansend can0 7e8#03010D1e11100000
+*/
+```
+
+Current functionality:
+
+* Speed
+* RPM
+* Engine temp
+* Engine load
+* MPG

plugins/vehicle/obd2/obd2.cpp

@@ -0,0 +1,44 @@
+#include "obd2.hpp"
+
+bool Obd2::init(ICANBus* canbus){
+    if (this->arbiter) {
+        OBD2_LOG(info)<<"loading plugin, totoal commands: "<<cmds.size();
+
+        for (int i = 0; i < cmds.size(); ++i){
+            canbus->registerFrameHandler(cmds.at(i).frame.frameId()+0x9, [this,i](QByteArray payload){this->readObd2(cmds.at(i), payload);});
+            cmds[i].timer = new QTimer(this);
+            connect(cmds.at(i).timer, &QTimer::timeout, [this, canbus, i]() {
+                canbus->writeFrame(cmds.at(i).frame);
+            });
+            cmds.at(i).timer->start(cmds.at(i).rate);
+            OBD2_LOG(info)<<"loaded "<< QString((cmds.at(i).id)).toStdString();
+        }
+        OBD2_LOG(info)<<"loaded successfully";
+        return true;
+    }
+    else{
+        OBD2_LOG(error)<<"Failed to get arbiter";
+        return false;
+    }
+}
+
+QList<QWidget *> Obd2::widgets()
+{
+    QList<QWidget *> tabs;
+    return tabs;
+}
+
+void Obd2::readObd2(Command cmd, QByteArray payload){
+    Response resp = Response(payload);
+    if(cmd.frame.payload().at(2) == resp.PID){
+        double value = cmd.decoder(resp);
+        OBD2_LOG(debug)<<QString(cmd.id).toStdString()<<": "<<value;
+        if (cmd.id == "maf_rate") {
+            this->maf_rate = Conversion::gps_to_lph(value);
+        } else if (cmd.id == "speed") {
+            const double mpg = this->maf_rate == 0 ? 0 : value / this->maf_rate;
+            this->arbiter->vehicle_update_data("mpg", mpg);    
+        }
+        this->arbiter->vehicle_update_data(cmd.id, value);
+    }
+}

plugins/vehicle/obd2/obd2.hpp

@@ -0,0 +1,29 @@
+#include <QString>
+#include <iostream>
+#include <stdlib.h>
+#include <QByteArray>
+#include <boost/log/trivial.hpp>
+
+#include "plugins/vehicle_plugin.hpp"
+#include "obd/command.hpp"
+#include "obd/conversions.hpp"
+
+#include "app/arbiter.hpp"
+#include "openauto/Service/InputService.hpp"
+
+#define OBD2_LOG(severity) BOOST_LOG_TRIVIAL(severity) << "[OBD2Plugin] "
+
+class Obd2 : public QObject, VehiclePlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID VehiclePlugin_iid)
+    Q_INTERFACES(VehiclePlugin)
+
+    public:
+        bool init(ICANBus* canbus) override;
+
+    private:
+        QList<QWidget *> widgets() override;
+        double maf_rate;
+        void readObd2(Command cmd, QByteArray payload);
+};

src/app/arbiter.cpp

@@ -199,3 +199,8 @@ void Arbiter::send_openauto_full_screen(bool fullscreen)
 {
     emit openauto_full_screen(fullscreen);
 }
+
+void Arbiter::send_vehicle_data(QString gauge_id, int value)
+{
+    emit vehicle_update_data(gauge_id, value);
+}