merge back everything

.gitignore

@@ -8,3 +8,6 @@ CMakeLists.txt
 cmake-build-debug/
 mazda/installer/config/androidauto/data_persist/dev/bin/headunit
 *.creator.user
+bin/
+*/version\.h
+.vscode

common/command_server.cpp

@@ -7,43 +7,59 @@ using json = nlohmann::json;
 
 namespace
 {
-    void AddCORSHeaders(WPP::Response& resp)
-    {
-        resp.headers.emplace("Access-Control-Allow-Origin", "*");
-        resp.headers.emplace("Access-Control-Allow-Methods", "POST, GET");
-    }
+	void AddCORSHeaders(WPP::Response& resp)
+	{
+	    resp.headers.emplace("Access-Control-Allow-Origin", "*");
+	    resp.headers.emplace("Access-Control-Allow-Methods", "POST, GET");
+	}
 }
 
 CommandServer::CommandServer(ICommandServerCallbacks &callbacks)
 {
     server.get("/status", [&callbacks](WPP::Request& req, WPP::Response& resp)
     {
-       resp.type = "application/json";
-       json result;
-       result["connected"] = callbacks.IsConnected();
-       result["videoFocus"] = callbacks.HasVideoFocus();
-       result["audioFocus"] = callbacks.HasAudioFocus();
-       std::string logPath = callbacks.GetLogPath();
-       if (logPath.length() > 0)
-         result["logPath"] = logPath;
+        resp.type = "application/json";
+        json result;
+        result["connected"]  = callbacks.IsConnected();
+        result["videoFocus"] = callbacks.HasVideoFocus();
+        result["audioFocus"] = callbacks.HasAudioFocus();
+        std::string logPath = callbacks.GetLogPath();
+        if (logPath.length() > 0)
+        {
+            result["logPath"] = logPath;
+        }
+        result["headunitVersion"] = callbacks.GetVersion();
+
+        resp.body << std::setw(4) << result;
+
+        logd("Got /status call. response:\n%s\n", resp.body.str().c_str());
+
+        AddCORSHeaders(resp);
+    });
+
+    server.get("/updateConfig", [&callbacks](WPP::Request& req, WPP::Response& resp)
+    {
+        resp.type = "application/json";
+        json result;
+        result["result"] = callbacks.ChangeParameterConfig(req.query["parameter"], req.query["value"], req.query["type"]);
 
-       resp.body << std::setw(4) << result;
+        resp.body << std::setw(4) << result;
 
-       logd("Got /status call. response:\n%s\n", resp.body.str().c_str());
+        logd("Got /updateConfig call. response:\n%s\n", resp.body.str().c_str());
 
-       AddCORSHeaders(resp);
+        AddCORSHeaders(resp);
     });
 
     server.post("/takeVideoFocus", [&callbacks](WPP::Request& req, WPP::Response& resp)
     {
-       resp.type = "application/json";
-       callbacks.TakeVideoFocus();
-       json result;
-       resp.body << std::setw(4) << result;
+        resp.type = "application/json";
+        callbacks.TakeVideoFocus();
+        json result;
+        resp.body << std::setw(4) << result;
 
-       printf("Got /takeVideoFocus call. response:\n%s\n", resp.body.str().c_str());
+        printf("Got /takeVideoFocus call. response:\n%s\n", resp.body.str().c_str());
 
-       AddCORSHeaders(resp);
+        AddCORSHeaders(resp);
     });
 }
 

common/command_server.h

@@ -11,6 +11,8 @@ class ICommandServerCallbacks
     virtual bool HasVideoFocus() const = 0;
     virtual void TakeVideoFocus() = 0;
     virtual std::string GetLogPath() const = 0;
+    virtual std::string GetVersion() const = 0;
+    virtual std::string ChangeParameterConfig(std::string param, std::string value, std::string type) const = 0;
 };
 
 //This is mostly designed as a way to recieve UI events from the CMU JS code via HTTP requests

common/config.cpp

@@ -0,0 +1,106 @@
+#include <fstream>
+#include "hu_aap.h"
+#include "config.h"
+
+//default settings
+std::string config::configFile = "/tmp/root/headunit.json";
+bool config::launchOnDevice = true;
+bool config::carGPS = true;
+HU_TRANSPORT_TYPE config::transport_type = HU_TRANSPORT_TYPE::USB;
+std::string config::phoneIpAddress = "192.168.43.1";
+bool config::reverseGPS = false;
+
+void config::parseJson(json config_json)
+{
+    if (config_json["launchOnDevice"].is_boolean())
+    {
+        config::launchOnDevice = config_json["launchOnDevice"];
+    }
+    if (config_json["carGPS"].is_boolean())
+    {
+        config::carGPS = config_json["carGPS"];
+    }
+    if (config_json["wifiTransport"].is_boolean())
+    {
+        config::transport_type = config_json["wifiTransport"] ? HU_TRANSPORT_TYPE::WIFI : HU_TRANSPORT_TYPE::USB;
+    }
+    if (config_json["phoneIpAddress"].is_string())
+    {
+        config::phoneIpAddress = config_json["phoneIpAddress"];
+    }
+    if (config_json["reverseGPS"].is_boolean())
+    {
+        config::reverseGPS = config_json["reverseGPS"];
+    }
+    printf("json config parsed\n");
+}
+
+json config::readConfigFile()
+{
+    std::ifstream ifs(config::configFile);
+    json config_json;
+    //config file exists, read it
+    if (ifs.good())
+    {
+        try
+        {
+            ifs >> config_json;
+        }catch (...)
+        {
+            printf("couldn't parse config file. possible corruption\n");
+            config_json = nullptr;
+            ifs.close();
+        }
+        ifs.close();
+    }
+    else
+    {
+        printf("couldn't read config file. check permissions\n");
+    }
+    return config_json;
+}
+
+void config::readConfig()
+{
+    json config_json = readConfigFile();
+    if (config_json == nullptr) return;
+
+    config::parseJson(config_json);
+}
+
+void config::writeConfigFile(json config_json)
+{
+    std::ofstream out_file(config::configFile);
+    if (out_file.good())
+    {
+        out_file << std::setw(4) << config_json << std::endl;
+        out_file.close();
+        printf("config file written\n");
+    }
+    else
+    {
+        printf("couldn't write config file. check permissions\n");
+    }
+}
+
+void config::updateConfigString(std::string parameter, std::string value)
+{
+    printf("updating parameter [%s] = [%s]\n", parameter.c_str(), value.c_str());
+    json config_json = readConfigFile();
+    if (config_json == nullptr) return;
+
+    config_json[parameter]=value;
+    writeConfigFile(config_json);
+    config::parseJson(config_json);
+}
+
+void config::updateConfigBool(std::string parameter, bool value)
+{
+    printf("updating parameter [%s] = [%s]\n", parameter.c_str(), value ? "true" : "false");
+    json config_json = readConfigFile();
+    if (config_json == nullptr) return;
+
+    config_json[parameter]=value;
+    writeConfigFile(config_json);
+    config::parseJson(config_json);
+}

common/config.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include "json/json.hpp"
+using json = nlohmann::json;
+
+class config {
+public:
+
+    static void readConfig();
+    static void updateConfigString(std::string parameter, std::string value);
+    static void updateConfigBool(std::string parameter, bool value);
+
+    static std::string configFile;
+    static bool launchOnDevice;
+    static bool carGPS;
+    static HU_TRANSPORT_TYPE transport_type;
+    static std::string phoneIpAddress;
+    static bool reverseGPS;
+
+private:
+    static json readConfigFile();
+    static void writeConfigFile(json config_json);
+    static void parseJson(json config_json);
+};
+

hu/hu.proto

@@ -390,7 +390,12 @@ message ChannelDescriptor
         }
 
         required uint32 minimum_interval_ms = 1;
-        required uint32 type = 2;
+        enum CLUSTER_TYPE
+        {
+            CUSTOM_IMAGES_SUPPORTED = 1;
+            IMAGE_CODES_ONLY = 2;
+        }
+        required CLUSTER_TYPE type = 2;
         optional ImageOptions image_options = 3;
     }
     optional NavigationStatusService navigation_status_service = 8;
@@ -417,10 +422,9 @@ message ChannelDescriptor
 
     optional VendorExtensionService vendor_extension_service = 12;
 
-    //vendor extension==12
-    //genericnotification==13
     message GenericNotificationService
     {
+        optional string name = 1;
     }
     optional GenericNotificationService generic_notification_service = 13;
 }
@@ -694,3 +698,68 @@ message BluetoothAuthData
 {
     optional string data = 1;
 }
+
+message NAVMessagesStatus
+{
+    enum STATUS
+    {
+        START = 1;
+        STOP = 2;
+    }
+    optional STATUS status = 1;
+}
+
+message NAVTurnMessage
+{
+    optional string event_name = 1;
+    enum TURN_SIDE
+    {
+        TURN_LEFT = 1;
+        TURN_RIGHT = 2;
+        TURN_UNSPECIFIED = 3;
+    }
+    optional TURN_SIDE turn_side = 2;
+    enum TURN_EVENT
+    {
+        TURN_UNKNOWN = 0;
+        TURN_DEPART = 1;
+        TURN_NAME_CHANGE = 2;
+        TURN_SLIGHT_TURN = 3;
+        TURN_TURN = 4;
+        TURN_SHARP_TURN = 5;
+        TURN_U_TURN = 6;
+        TURN_ON_RAMP = 7;
+        TURN_OFF_RAMP = 8;
+        TURN_FORK = 9;
+        TURN_MERGE = 10;
+        TURN_ROUNDABOUT_ENTER = 11;
+        TURN_ROUNDABOUT_EXIT = 12;
+        TURN_ROUNDABOUT_ENTER_AND_EXIT = 13;
+        TURN_STRAIGHT = 14;
+        TURN_FERRY_BOAT = 16;
+        TURN_FERRY_TRAIN = 17;
+        TURN_DESTINATION = 19;
+    }
+    optional TURN_EVENT turn_event = 3;
+    optional bytes image = 4; // image in png format
+    optional int32 turn_number = 5;
+    optional int32 turn_angle = 6;
+}
+
+//32773   (0x8005)
+message NAVDistanceMessage
+{
+    optional int32 distance = 1; //meters
+    optional int32 time_until = 2; //seconds
+    optional uint64 display_distance = 3; //distance rounded for display
+    enum DISPLAY_DISTANCE_UNIT
+    {
+        METERS = 1;       // meters * 1000, used when rounded distance < 1000m
+        KILOMETERS10 = 2; // kilometers * 1000, used when rounded distance > 10km, not same as just meters because "km" is displayed on screen
+        KILOMETERS = 3;   // kilometers * 1000, used when rounded distance between 1km and 10km, not same as just meters because "km" is displayed on screen
+        MILES10 = 4;      // miles * 1000, used when rounded distance > 10mi
+        MILES = 5;        // miles * 1000, used when rounded distance between 1mi and 10mi
+        FEET = 6;         // feet * 1000
+    }
+    optional DISPLAY_DISTANCE_UNIT display_distance_unit = 4;
+}