diff options
| author | Harsh Sharma <harsh.sharma@multitech.com> | 2020-01-09 12:52:56 -0600 |
|---|---|---|
| committer | Harsh Sharma <harsh.sharma@multitech.com> | 2020-01-09 12:52:56 -0600 |
| commit | b69c7514fbad36e25dbf3ea263eb49f1f28d3653 (patch) | |
| tree | 54685e228320bcb5db9727f66ae4d36c2e118c2e | |
| parent | 8c7856e74ba7bc149180aa3ab9f820043260cdc8 (diff) | |
| download | mts-io-sysfs-b69c7514fbad36e25dbf3ea263eb49f1f28d3653.tar.gz mts-io-sysfs-b69c7514fbad36e25dbf3ea263eb49f1f28d3653.tar.bz2 mts-io-sysfs-b69c7514fbad36e25dbf3ea263eb49f1f28d3653.zip | |
Bug fix: mtcdt 2.1 FPGA matching was not working as required
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | build/Version.d | 3 | ||||
| -rw-r--r-- | src/AccessoryCards/LoraCard15.cpp | 1 | ||||
| -rw-r--r-- | src/Device/Device.cpp | 6 | ||||
| -rw-r--r-- | src/Version.cpp | 2 |
5 files changed, 5 insertions, 9 deletions
@@ -44,7 +44,7 @@ SOURCES += $(SOURCEDIR)/Version.cpp OBJS1 = $(patsubst $(SOURCEDIR)/%.cpp,$(BUILDDIR)/%.o,$(SOURCES)) OBJS = $(patsubst $(SOURCEDIR)/%.c,$(BUILDDIR)/%.o,$(OBJS1)) CPP_DEPPS = $(patsubst $(SOURCEDIR)/%.cpp,$(BUILDDIR)/**/%.d,$(SOURCES)) -CPP_DEPPS += $(BUILDDIR)/MtsIoSysfs.o $(BUILDDIR)/**/*.o $(BUILDDIR)/**/*.d +CPP_DEPPS += $(BUILDDIR)/*.o $(BUILDDIR)/*.d $(BUILDDIR)/**/*.o $(BUILDDIR)/**/*.d JS_OBJS = $(BUILDDIR)/Version.o OUT_DIRS=build/AccessoryCards build/Device MKDIR_P = mkdir -p diff --git a/build/Version.d b/build/Version.d deleted file mode 100644 index a253552..0000000 --- a/build/Version.d +++ /dev/null @@ -1,3 +0,0 @@ -build/Version.d: src/Version.cpp include/Version.h - -include/Version.h: 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"); |