mathieu/Domotique
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix strange indent in MQTT

Browse Source
This commit is contained in:
Mathieu Maret 2016-09-27 23:51:01 +02:00
parent 20e4869a21
commit 3a6987af44
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
WifiControlSensor/MQTT.ino
View File

@ -36,7 +36,7 @@ bool isMqttConfigured = false;
bool useMqtts = false; bool useMqtts = false;
int MqttSetup(char *server, char *user, char *passwd, int port, char * hostname) { int MqttSetup(char *server, char *user, char *passwd, int port, char *hostname) {
mqttId = hostname; mqttId = hostname;
useMqtts = (port == 8883); useMqtts = (port == 8883);
isMqttConfigured = server[0] != '\0'; isMqttConfigured = server[0] != '\0';
@ -48,12 +48,13 @@ int MqttSetup(char *server, char *user, char *passwd, int port, char * hostname)
mqtt = new Adafruit_MQTT_Client(new WiFiClientSecure(), server, port, user, passwd); mqtt = new Adafruit_MQTT_Client(new WiFiClientSecure(), server, port, user, passwd);
else else
mqtt = new Adafruit_MQTT_Client(new WiFiClient(), server, port, user, passwd); mqtt = new Adafruit_MQTT_Client(new WiFiClient(), server, port, user, passwd);
mqtt_dht_temp = MqttCreatePublisher(TEMPERATURE_DHT_FEED_FORMAT, user, mqttId);
mqtt_dht_humidity = MqttCreatePublisher(HUMIDITY_DHT_FEED_FORMAT, user, mqttId); mqtt_dht_temp = MqttCreatePublisher(TEMPERATURE_DHT_FEED_FORMAT, user, mqttId);
mqtt_temp = MqttCreatePublisher(TEMPERATURE_FEED_FORMAT, user, mqttId); mqtt_dht_humidity = MqttCreatePublisher(HUMIDITY_DHT_FEED_FORMAT, user, mqttId);
mqtt_pressure = MqttCreatePublisher(PRESSURE_FEED_FORMAT, user, mqttId); mqtt_temp = MqttCreatePublisher(TEMPERATURE_FEED_FORMAT, user, mqttId);
mqtt_dry = MqttCreatePublisher(DRY_FEED_FORMAT, user, mqttId); mqtt_pressure = MqttCreatePublisher(PRESSURE_FEED_FORMAT, user, mqttId);
mqtt_ip = MqttCreatePublisher(IP_FEED_FORMAT, user, mqttId); mqtt_dry = MqttCreatePublisher(DRY_FEED_FORMAT, user, mqttId);
mqtt_ip = MqttCreatePublisher(IP_FEED_FORMAT, user, mqttId);
for (uint i = 0 ; i < NB_ELEMENTS(gpioWatched) && i < MAXSUBSCRIPTIONS; i++) { for (uint i = 0 ; i < NB_ELEMENTS(gpioWatched) && i < MAXSUBSCRIPTIONS; i++) {
mqtt->subscribe(MqttCreateSubscribe(GPIO_SET_FEED_FORMAT, user, mqttId, gpioWatched[i])); mqtt->subscribe(MqttCreateSubscribe(GPIO_SET_FEED_FORMAT, user, mqttId, gpioWatched[i]));