From a2c1bbffd44fe90ad5835815e17f9d8d77d3702e Mon Sep 17 00:00:00 2001
From: Anthony Hinsinger <anthony.hinsinger@gmail.com>
Date: Thu, 31 May 2018 12:01:51 +0200
Subject: [PATCH] Added app parameters for available  sensors and their
 configurations

---
 main.cpp      | 24 ++++++++++++++++++++----
 mbed_app.json | 18 ++++++++++++++++--
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/main.cpp b/main.cpp
index f30198b..03e8313 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,7 +4,10 @@
 #include "events/EventQueue.h"
 #include "lora_radio_helper.h"
 #include "CayenneLPP.h"
+
+#if MBED_CONF_APP_DHT_ENABLED
 #include "DHT.h"
+#endif
 
 using namespace events;
 
@@ -32,9 +35,15 @@ static void lora_event_handler(lorawan_event_t event);
 static LoRaWANInterface lorawan(radio);
 static lorawan_app_callbacks_t callbacks;
 static CayenneLPP cayenne(51);
-DHT dht(PA_1, DHT::DHT22);
 
-AnalogIn bat(PA_2);
+#if MBED_CONF_APP_BATTERY_ENABLED
+AnalogIn bat(MBED_CONF_APP_BATTERY_ADC);
+#endif
+
+#if MBED_CONF_APP_DHT_ENABLED
+DHT dht(MBED_CONF_APP_DHT_DATA, MBED_CONF_APP_DHT_TYPE);
+#endif
+
 DigitalOut led(LED1);
 
 int main(void) {
@@ -93,12 +102,13 @@ static void send_message()
 {
     int16_t retcode;
 
-    // vbat
+#if MBED_CONF_APP_BATTERY_ENABLED
     float vbat = bat.read();
     vbat =  vbat*5/3*3.3f;
     cayenne.addAnalogInput(1, vbat);
+#endif
 
-    // dht
+#if MBED_CONF_APP_DHT_ENABLED
     int err = dht.read();
     if (err == DHT::SUCCESS) {
         cayenne.addTemperature(1, dht.getTemperature());
@@ -106,6 +116,12 @@ static void send_message()
     } else {
         printf("Error code : %d\r\n", err);
     }
+#endif
+
+    // No data to send
+    if (cayenne.getSize() == 0) {
+        return;
+    }
 
     retcode = lorawan.send(MBED_CONF_LORA_APP_PORT, cayenne.getBuffer(), cayenne.getSize(),
                            MSG_UNCONFIRMED_FLAG);
diff --git a/mbed_app.json b/mbed_app.json
index 899af1d..299a4e4 100644
--- a/mbed_app.json
+++ b/mbed_app.json
@@ -25,7 +25,14 @@
         "lora-rxctl":          { "value": "NC" },
         "lora-ant-switch":     { "value": "NC" },
         "lora-pwr-amp-ctl":    { "value": "NC" },
-        "lora-tcxo":           { "value": "NC" }
+        "lora-tcxo":           { "value": "NC" },
+
+        "battery-enabled":     { "value": "false" },
+        "battery-adc":         { "value": "NC" },
+
+        "dht-enabled":         { "value": "false" },
+        "dht-type":            { "value": "DHT::DHT22" },
+        "dht-data":            { "value": "NC" }
     },
     "target_overrides": {
         "*": {
@@ -251,7 +258,14 @@
             "lora-rxctl":          "ANT_CRX_RX",
             "lora-ant-switch":     "NC",
             "lora-pwr-amp-ctl":    "NC",
-            "lora-tcxo":           "RF_TCXO_EN"
+            "lora-tcxo":           "RF_TCXO_EN",
+
+            "battery-enabled":     true,
+            "battery-adc":         "PA_2",
+
+            "dht-enabled":         false,
+            "dht-data":            "PA_1",
+            "dht-type":            "DHT::DHT22"
         }
     },
     "macros": ["MBEDTLS_USER_CONFIG_FILE=\"mbedtls_lora_config.h\""]