From 6516d0bbfc4217e3f1204ce07334e709e91b7bb6 Mon Sep 17 00:00:00 2001
From: Harsh Sharma <harsh.sharma@multitech.com>
Date: Wed, 15 Jan 2020 17:05:44 -0600
Subject: Added port to accessory card list. Added sorting for accessory card
 array if the array is longer than 1

---
 src/AccessoryCards/AcessoryCard.cpp  | 3 ++-
 src/AccessoryCards/Gpiob.cpp         | 2 +-
 src/AccessoryCards/LoraCard.cpp      | 6 ++----
 src/AccessoryCards/LoraCard15.cpp    | 2 +-
 src/AccessoryCards/LoraCard21.cpp    | 2 +-
 src/AccessoryCards/LoraCard21Ext.cpp | 2 +-
 src/AccessoryCards/Mfser.cpp         | 3 +--
 7 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'src/AccessoryCards')

diff --git a/src/AccessoryCards/AcessoryCard.cpp b/src/AccessoryCards/AcessoryCard.cpp
index 16589b0..c4804d1 100644
--- a/src/AccessoryCards/AcessoryCard.cpp
+++ b/src/AccessoryCards/AcessoryCard.cpp
@@ -17,5 +17,6 @@
 
 #include "Device.h"
 
-Device::AccessoryCard::AccessoryCard(Device& d) : device(d) {
+Device::AccessoryCard::AccessoryCard(Device& d, const std::string ProductId, const std::string Port) : device(d), productId(ProductId), port(Port) {
+    device.accessoryCard.AddMember("port", rapidjson::Value().SetString(port.c_str(), device.accessoryCardsAlloc), device.accessoryCardsAlloc);
 }
diff --git a/src/AccessoryCards/Gpiob.cpp b/src/AccessoryCards/Gpiob.cpp
index 3a87c8a..44728ae 100644
--- a/src/AccessoryCards/Gpiob.cpp
+++ b/src/AccessoryCards/Gpiob.cpp
@@ -17,7 +17,7 @@
 
 #include "Device.h"
 
-Device::Gpiob::Gpiob(Device& d) : AccessoryCard(d) {
+Device::Gpiob::Gpiob(Device& d, const std::string ProductId, const std::string Port) : AccessoryCard(d, ProductId, Port) {
     capabilityList["adc"] = true;
     capabilityList["din"] = true;
     capabilityList["dout"] = true;
diff --git a/src/AccessoryCards/LoraCard.cpp b/src/AccessoryCards/LoraCard.cpp
index 66047f3..7a248dc 100644
--- a/src/AccessoryCards/LoraCard.cpp
+++ b/src/AccessoryCards/LoraCard.cpp
@@ -17,12 +17,10 @@
 
 #include "Device.h"
 
-Device::LoraCard::LoraCard(Device& d, const std::string productId, const std::string port) : AccessoryCard(d) {
-    spiPath = "/dev/spidev0.0";
-}
+Device::LoraCard::LoraCard(Device& d, const std::string ProductId, const std::string Port) : AccessoryCard(d, ProductId, Port), spiPath("/dev/spidev0.0") {}
 
 void Device::LoraCard::setCapabilities() {
     device.capabilityList["lora"] = true;
-    device.accessoryCard.AddMember("spiPath", rapidjson::Value().SetString(spiPath.c_str(), device.accessoryCardsAlloc), device.accessoryCardsAlloc);
     device.accessoryCard.AddMember("fpgaVersion", fpgaVersion, device.accessoryCardsAlloc);
+    device.accessoryCard.AddMember("spiPath", rapidjson::Value().SetString(spiPath.c_str(), device.accessoryCardsAlloc), device.accessoryCardsAlloc);
 }
\ No newline at end of file
diff --git a/src/AccessoryCards/LoraCard15.cpp b/src/AccessoryCards/LoraCard15.cpp
index 28f1e5d..69efb6b 100644
--- a/src/AccessoryCards/LoraCard15.cpp
+++ b/src/AccessoryCards/LoraCard15.cpp
@@ -17,7 +17,7 @@
 
 #include "Device.h"
 
-Device::Lora15Card::Lora15Card(Device& d, const std::string productId, const std::string port) : LoraCard(d, productId, port) {
+Device::Lora15Card::Lora15Card(Device& d, const std::string ProductId, const std::string Port) : LoraCard(d, ProductId, Port) {
     int ret;
     if ((productId.rfind("MTCDT3-", 0) == 0 || productId.rfind("MTLGA-", 0) == 0) && (port.back() == '2')) {
         spiPath = "/dev/spidev1.0";
diff --git a/src/AccessoryCards/LoraCard21.cpp b/src/AccessoryCards/LoraCard21.cpp
index 99f76d6..d40876b 100644
--- a/src/AccessoryCards/LoraCard21.cpp
+++ b/src/AccessoryCards/LoraCard21.cpp
@@ -17,7 +17,7 @@
 
 #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, const std::string ProductId, const std::string Port): LoraCard(d, ProductId, Port) {
     spiPath = "/dev/spidev32766.2";
     MTS::System::cmd(LORA_2_1_FPGA_VERSION, cmdFpgaVersion);
     fpgaVersion = std::stoi(cmdFpgaVersion);
diff --git a/src/AccessoryCards/LoraCard21Ext.cpp b/src/AccessoryCards/LoraCard21Ext.cpp
index 51b43f7..2595286 100644
--- a/src/AccessoryCards/LoraCard21Ext.cpp
+++ b/src/AccessoryCards/LoraCard21Ext.cpp
@@ -17,7 +17,7 @@
 
 #include "Device.h"
 
-Device::Lora21ExtCard::Lora21ExtCard(Device& d, const std::string productId, const std::string port): Lora21Card(d, productId, port) {
+Device::Lora21ExtCard::Lora21ExtCard(Device& d, const std::string ProductId, const std::string Port): Lora21Card(d, ProductId, Port) {
     MTS::System::cmd(LORA_2_1_EXT_FPGA_VERSION, cmdFpgaVersion2);
     device.accessoryCard.AddMember("fpgaVersion2", std::stoi(cmdFpgaVersion2), device.accessoryCardsAlloc);
 }
\ No newline at end of file
diff --git a/src/AccessoryCards/Mfser.cpp b/src/AccessoryCards/Mfser.cpp
index ac6bb26..dfdfeb3 100644
--- a/src/AccessoryCards/Mfser.cpp
+++ b/src/AccessoryCards/Mfser.cpp
@@ -16,8 +16,7 @@
 ***********************************************************************/
 
 #include "Device.h"
-
-Device::Mfser::Mfser(Device& d, const std::string port) : AccessoryCard(d) {
+Device::Mfser::Mfser(Device& d, const std::string ProductId, const std::string Port) : AccessoryCard(d, ProductId, Port) {
 	capabilityList["rs232"] = true;
     capabilityList["rs422"] = true;
     capabilityList["rs485"] = true;
-- 
cgit v1.2.3