LoRa updates with MTAC-0030.2.0

1 files changed, 31 insertions, 17 deletions

diff --git a/src/AccessoryCards/LoraCard21.cpp b/src/AccessoryCards/LoraCard21.cpp
index d40876b..4337bfa 100644
--- a/src/AccessoryCards/LoraCard21.cpp
+++ b/src/AccessoryCards/LoraCard21.cpp
@@ -1,25 +1,39 @@
 /**********************************************************************
-* COPYRIGHT 2020 MULTI-TECH SYSTEMS, INC.
-*
-* ALL RIGHTS RESERVED BY AND FOR THE EXCLUSIVE BENEFIT OF
-* MULTI-TECH SYSTEMS, INC.
-*
-* MULTI-TECH SYSTEMS, INC. - CONFIDENTIAL AND PROPRIETARY
-* INFORMATION AND/OR TRADE SECRET.
-*
-* NOTICE: ALL CODE, PROGRAM, INFORMATION, SCRIPT, INSTRUCTION,
-* DATA, AND COMMENT HEREIN IS AND SHALL REMAIN THE CONFIDENTIAL
-* INFORMATION AND PROPERTY OF MULTI-TECH SYSTEMS, INC.
-* USE AND DISCLOSURE THEREOF, EXCEPT AS STRICTLY AUTHORIZED IN A
-* WRITTEN AGREEMENT SIGNED BY MULTI-TECH SYSTEMS, INC. IS PROHIBITED.
-*
-***********************************************************************/
+ * COPYRIGHT 2020 MULTI-TECH SYSTEMS, INC.
+ *
+ * ALL RIGHTS RESERVED BY AND FOR THE EXCLUSIVE BENEFIT OF
+ * MULTI-TECH SYSTEMS, INC.
+ *
+ * MULTI-TECH SYSTEMS, INC. - CONFIDENTIAL AND PROPRIETARY
+ * INFORMATION AND/OR TRADE SECRET.
+ *
+ * NOTICE: ALL CODE, PROGRAM, INFORMATION, SCRIPT, INSTRUCTION,
+ * DATA, AND COMMENT HEREIN IS AND SHALL REMAIN THE CONFIDENTIAL
+ * INFORMATION AND PROPERTY OF MULTI-TECH SYSTEMS, INC.
+ * USE AND DISCLOSURE THEREOF, EXCEPT AS STRICTLY AUTHORIZED IN A
+ * WRITTEN AGREEMENT SIGNED BY MULTI-TECH SYSTEMS, INC. IS PROHIBITED.
+ *
+ ***********************************************************************/
 
 #include "Device.h"
 
-Device::Lora21Card::Lora21Card(Device& d, const std::string ProductId, const std::string Port): LoraCard(d, ProductId, Port) {
+Device::Lora21Card::Lora21Card(Device &d)
+    : LoraCard(d, std::regex("(MTAC-LORA-G16)(.*)")) {}
+Device::Lora21Card::Lora21Card(Device &d, const std::regex Name)
+    : LoraCard(d, Name) {}
+
+void Device::Lora21Card::AddToDeviceInfo(const std::string Port,
+                                         const std::string ProductID) {
+
+    LoraCard::AddToDeviceInfo(Port, ProductID);
+
     spiPath = "/dev/spidev32766.2";
     MTS::System::cmd(LORA_2_1_FPGA_VERSION, cmdFpgaVersion);
     fpgaVersion = std::stoi(cmdFpgaVersion);
-    setCapabilities();
+
+    device.accessoryCard.AddMember("fpgaVersion", fpgaVersion, device.acAlloc);
+    device.accessoryCard.AddMember(
+        "spiPath",
+        rapidjson::Value().SetString(spiPath.c_str(), device.acAlloc),
+        device.acAlloc);
 }
\ No newline at end of file