From 963604b870a911f94a0ad7c18b5d69aa6fdc3f18 Mon Sep 17 00:00:00 2001
From: BlueMark Innovations BV <roel@bluemark.io>
Date: Sat, 6 Jan 2024 13:56:04 +0100
Subject: [PATCH] store operator ID in parameters

---
 RemoteIDModule/RemoteIDModule.ino | 17 +++++++++++++++++
 RemoteIDModule/parameters.cpp     |  8 ++++++++
 RemoteIDModule/parameters.h       |  3 +++
 3 files changed, 28 insertions(+)

diff --git a/RemoteIDModule/RemoteIDModule.ino b/RemoteIDModule/RemoteIDModule.ino
index fd3bcd7..f29ef3b 100644
--- a/RemoteIDModule/RemoteIDModule.ino
+++ b/RemoteIDModule/RemoteIDModule.ino
@@ -277,6 +277,23 @@ static void set_data(Transport &t)
         UAS_data.OperatorID.OperatorIdType = (ODID_operatorIdType_t)operator_id.operator_id_type;
         ODID_COPY_STR(UAS_data.OperatorID.OperatorId, operator_id.operator_id);
         UAS_data.OperatorIDValid = 1;
+
+        //copy to parameters if is not stored yet.
+        if (strcmp((const char*)g.operator_id, (const char*)operator_id.operator_id) != 0) {
+            g.set_by_name_uint8("OPERATOR_ID_TYPE", operator_id.operator_id_type);
+            char operator_id_tmp[ODID_ID_SIZE + 1] {};
+            ODID_COPY_STR(operator_id_tmp, operator_id.operator_id);
+            g.set_by_name_string("OPERATOR_ID", operator_id_tmp);
+        }
+    }
+    else
+    {
+        if (g.have_operator_id_info()) {
+            // from parameters
+            UAS_data.OperatorID.OperatorIdType  = (ODID_operatorIdType_t)g.operator_id_type;
+            ODID_COPY_STR(UAS_data.OperatorID.OperatorId, g.operator_id);
+            UAS_data.OperatorIDValid = 1;
+        }
     }
 
     // SelfID
diff --git a/RemoteIDModule/parameters.cpp b/RemoteIDModule/parameters.cpp
index fbeb3a0..204c895 100644
--- a/RemoteIDModule/parameters.cpp
+++ b/RemoteIDModule/parameters.cpp
@@ -18,6 +18,8 @@ const Parameters::Param Parameters::params[] = {
     { "UAS_TYPE_2",        Parameters::ParamType::UINT8,  (const void*)&g.ua_type_2,          0, 0, 15 },
     { "UAS_ID_TYPE_2",     Parameters::ParamType::UINT8,  (const void*)&g.id_type_2,          0, 0, 4 },
     { "UAS_ID_2",          Parameters::ParamType::CHAR20, (const void*)&g.uas_id_2[0],        0, 0, 0 },
+    { "OPERATOR_ID",       Parameters::ParamType::CHAR20, (const void*)&g.operator_id[0],        0, 0, 0 },
+    { "OPERATOR_ID_TYPE",  Parameters::ParamType::UINT8,  (const void*)&g.operator_id_type,          0, 0, 0 },
     { "BAUDRATE",          Parameters::ParamType::UINT32, (const void*)&g.baudrate,         57600, 9600, 921600 },
     { "WIFI_NAN_RATE",     Parameters::ParamType::FLOAT,  (const void*)&g.wifi_nan_rate,    0, 0, 5 },
     { "WIFI_BCN_RATE",     Parameters::ParamType::FLOAT,  (const void*)&g.wifi_beacon_rate,    0, 0, 5 },
@@ -380,6 +382,12 @@ bool Parameters::have_basic_id_2_info(void) const
     return strlen(g.uas_id_2) > 0 && g.id_type_2 > 0 && g.ua_type_2 > 0;
 }
 
+bool Parameters::have_operator_id_info(void) const
+{
+    return strlen(g.operator_id) > 0; //at the moment the operator type can only be zero. So no checking on the type.
+}
+
+
 bool Parameters::set_by_name_uint8(const char *name, uint8_t v)
 {
     const auto *f = find(name);
diff --git a/RemoteIDModule/parameters.h b/RemoteIDModule/parameters.h
index b537c97..d5ac347 100644
--- a/RemoteIDModule/parameters.h
+++ b/RemoteIDModule/parameters.h
@@ -22,6 +22,8 @@ class Parameters {
     uint8_t ua_type_2;
     uint8_t id_type_2;
     char uas_id_2[21] = "ABCD123456789";
+    char operator_id[21] = "";
+    uint8_t operator_id_type;
     float wifi_nan_rate;
     float wifi_beacon_rate;
     float wifi_power;
@@ -85,6 +87,7 @@ class Parameters {
 
     bool have_basic_id_info(void) const;
     bool have_basic_id_2_info(void) const;
+    bool have_operator_id_info(void) const;
 
     bool set_by_name_uint8(const char *name, uint8_t v);
     bool set_by_name_int8(const char *name, int8_t v);