From b69c7514fbad36e25dbf3ea263eb49f1f28d3653 Mon Sep 17 00:00:00 2001 From: Harsh Sharma Date: Thu, 9 Jan 2020 12:52:56 -0600 Subject: Bug fix: mtcdt 2.1 FPGA matching was not working as required --- src/AccessoryCards/LoraCard15.cpp | 1 - src/Device/Device.cpp | 6 +++--- src/Version.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/AccessoryCards/LoraCard15.cpp b/src/AccessoryCards/LoraCard15.cpp index 7d2140b..28f1e5d 100644 --- a/src/AccessoryCards/LoraCard15.cpp +++ b/src/AccessoryCards/LoraCard15.cpp @@ -19,7 +19,6 @@ Device::Lora15Card::Lora15Card(Device& d, const std::string productId, const std::string port) : LoraCard(d, productId, port) { int ret; - printf("PORT %s\n", port.c_str()); if ((productId.rfind("MTCDT3-", 0) == 0 || productId.rfind("MTLGA-", 0) == 0) && (port.back() == '2')) { spiPath = "/dev/spidev1.0"; } else if (productId.find("MTAC-LORA-") == 0) { diff --git a/src/Device/Device.cpp b/src/Device/Device.cpp index 21ad9e8..e92ea6e 100644 --- a/src/Device/Device.cpp +++ b/src/Device/Device.cpp @@ -65,12 +65,12 @@ void Device::getSystemTreeJson(const char * dir_name) { accessoryCard.SetObject(); } if (strcmp(d_name, "product-id") == 0) { - if (regex_match(fileData, lora15Filters)) { - Lora15Card lora15(*this, fileData, dir_name); - } else if (regex_match(fileData, loraG16Filters)) { + if (regex_match(fileData, loraG16Filters)) { Lora21Card lora21(*this, fileData, dir_name); } else if (regex_match(fileData, loraG64Filters)) { Lora21ExtCard lora21Ext(*this, fileData, dir_name); + } else if (regex_match(fileData, lora15Filters)) { + Lora15Card lora15(*this, fileData, dir_name); } else if (regex_match(fileData, gpiobFilters)) { Gpiob ppiob(*this); } else if (regex_match(fileData, mfserFilters)) { diff --git a/src/Version.cpp b/src/Version.cpp index 365abbb..393f305 100644 --- a/src/Version.cpp +++ b/src/Version.cpp @@ -1,4 +1,4 @@ //Pre-Build Auto-Generated Source #include "Version.h" -const std::string Version::version("v1.0.0-8-gd32e7c8"); +const std::string Version::version("v1.0.0-9-g8c7856e"); -- cgit v1.2.3