From 8d8091774f9292742284f0c5748c4bce8803e1d1 Mon Sep 17 00:00:00 2001 From: Harsh Sharma Date: Wed, 26 Feb 2020 12:24:26 -0600 Subject: Added macAddress2 --- include/Device/Device.h | 1 + src/Device/Device.cpp | 10 ++++++++++ src/Version.cpp | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/include/Device/Device.h b/include/Device/Device.h index db45316..3bea375 100644 --- a/include/Device/Device.h +++ b/include/Device/Device.h @@ -93,6 +93,7 @@ class Device { void json(); void mapFileToCapability(); void mapFirmware(); + void mapMacAddress2(); void printDir(const std::string dir_name, std::vector &results); void printJson(); void printVersion (std::string name); diff --git a/src/Device/Device.cpp b/src/Device/Device.cpp index e182b20..1da4a66 100644 --- a/src/Device/Device.cpp +++ b/src/Device/Device.cpp @@ -161,6 +161,7 @@ void Device::load() { mapFileToCapability(); mapFirmware(); + mapMacAddress2(); for (const auto capability : capabilityList) { capabilities.AddMember(rapidjson::Value().SetString(capability.first.c_str(), capability.first.length(), accessoryCardsAlloc), capability.second, accessoryCardsAlloc); @@ -200,6 +201,15 @@ void Device::mapFileToCapability() { } } +void Device::mapMacAddress2() { + std::ifstream file("/sys/devices/platform/mts-io/base/mac-eth"); + if (file.is_open()){ + std::string line = ""; + std::getline(file, line); + deviceInfoList["macAddress2"] = line; + } +} + void Device::mapFirmware() { std::ifstream file(FIRMWARE_FILE); if (!file.is_open()){ diff --git a/src/Version.cpp b/src/Version.cpp index 1baaf5c..332bb69 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-13-gacb6f2d"); +const std::string Version::version("v1.0.0-14-g6516d0b"); -- cgit v1.2.3