From 68c0c5ed8ad7c733743de1afc5deb9de862d60f3 Mon Sep 17 00:00:00 2001 From: Harsh Sharma Date: Mon, 6 Jan 2020 13:06:41 -0600 Subject: Changed radio capability to be based on has_radio file --- include/Device/Device.h | 9 +++++---- include/General.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/Device/Device.h b/include/Device/Device.h index b7cbeaf..946221b 100644 --- a/include/Device/Device.h +++ b/include/Device/Device.h @@ -7,9 +7,7 @@ class Device { private: - bool hasRadio; bool verbose ; - uint8_t radioTryCount; bool isRoot; rapidjson::Document capabilities; rapidjson::Document deviceInfo; @@ -55,6 +53,11 @@ class Device { void printJson(); void printVersion (std::string name); void printUsage(std::string program); + void setupLora15(std::string fileData, const char * dir_name); + void setupLoraG16(std::string fileData, const char * dir_name); + void setupLoraG64(std::string fileData, const char * dir_name); + void setupGpiob(std::string fileData, const char * dir_name); + void setupMfser(std::string fileData, const char * dir_name); void show(std::string program); void showTrigger(std::string name); void store(std::string name, std::string value); @@ -62,8 +65,6 @@ class Device { std::string toCamelCase(const char * d_name); void Verbose(bool val); bool Verbose(); - void RadioTryCount(uint8_t val); - uint8_t RadioTryCount(); void writeJson(); }; diff --git a/include/General.h b/include/General.h index 81f5a3d..2ca729a 100644 --- a/include/General.h +++ b/include/General.h @@ -67,7 +67,7 @@ typedef unsigned int uint; //32 bit - even on 64 bit machines #define READ_ACCESS 0x00 #define SPI_SPEED 8000000 -#define DEVICE_INFO_FILE "/var/run/config/device_info.json" +#define DEVICE_INFO_FILE "/var/run/config/device_info.json" #define RESET_SHORT_CMD "reset_short_handler" #define RESET_LONG_CMD "reset_long_handler" #define KILL_SIGNAL "kill -l " -- cgit v1.2.3