From 34b624b9a0c9324e2e9ef3ab81a72cfa69de13dc Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Wed, 28 Sep 2016 13:45:01 +0200 Subject: [PATCH] Code cleaning --- WifiControlSensor/MQTT.ino | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/WifiControlSensor/MQTT.ino b/WifiControlSensor/MQTT.ino index afd5ec2..752696f 100644 --- a/WifiControlSensor/MQTT.ino +++ b/WifiControlSensor/MQTT.ino @@ -9,29 +9,26 @@ Adafruit_MQTT_Publish *mqtt_dht_temp; Adafruit_MQTT_Publish *mqtt_dht_humidity; Adafruit_MQTT_Publish *mqtt_dry; Adafruit_MQTT_Publish *mqtt_ip; +Adafruit_MQTT_Publish *mqttGpio[MAXSUBSCRIPTIONS] = {}; #define FEED_MAX_SIZE 96 //FEED have the following formats /feeds/USER/DEVICE_NAME/.... -#define TEMPERATURE_FEED_FORMAT "/feeds/%s/%s/temperature" -#define PRESSURE_FEED_FORMAT "/feeds/%s/%s/pressure" -#define TEMPERATURE_DHT_FEED_FORMAT "/feeds/%s/%s/dht/temperature" -#define HUMIDITY_DHT_FEED_FORMAT "/feeds/%s/%s/dht/humidity" -#define DRY_FEED_FORMAT "/feeds/%s/%s/dry" +#define TEMPERATURE_FEED_FORMAT "/feeds/%s/%s/temperature" +#define PRESSURE_FEED_FORMAT "/feeds/%s/%s/pressure" +#define TEMPERATURE_DHT_FEED_FORMAT "/feeds/%s/%s/dht/temperature" +#define HUMIDITY_DHT_FEED_FORMAT "/feeds/%s/%s/dht/humidity" +#define DRY_FEED_FORMAT "/feeds/%s/%s/dry" +#define GPIO_FEED_FORMAT "/feeds/%s/%s/gpio/%d" +#define GPIO_SET_FEED_FORMAT "/feeds/%s/%s/gpio/%d/set" +#define IP_FEED_FORMAT "/feeds/%s/%s/configuration/ip/addr" // Should have less that MAXSUBSCRIPTIONS elements // MAXSUBSCRIPTIONS is defined is Adafruit_mqtt.h const int gpioWatched[] = CONFIG_MQTT_CONTROLLED_GPIO; -#define GPIO_FEED_FORMAT "/feeds/%s/%s/gpio/%d" -#define GPIO_SET_FEED_FORMAT "/feeds/%s/%s/gpio/%d/set" - -#define IP_FEED_FORMAT "/feeds/%s/%s/configuration/ip/addr" - char *mqttId; -Adafruit_MQTT_Publish * mqttGpio[MAXSUBSCRIPTIONS] = {}; - bool isMqttConfigured = false; bool useMqtts = false;