From cd117f342cc07b4dffa57cc2471d3403ddc974d0 Mon Sep 17 00:00:00 2001
From: Mathieu Maret <mathieu.maret@gmail.com>
Date: Mon, 9 Mar 2020 22:38:43 +0100
Subject: [PATCH] more const

---
 WifiControlSensor/MQTT.h   |  4 ++--
 WifiControlSensor/MQTT.ino | 17 +++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/WifiControlSensor/MQTT.h b/WifiControlSensor/MQTT.h
index 6212d9f..92d673e 100644
--- a/WifiControlSensor/MQTT.h
+++ b/WifiControlSensor/MQTT.h
@@ -31,7 +31,7 @@ int MqttBatchPublish(std::vector<struct mqttInfo> tab, ...);
 Adafruit_MQTT_Publish *MqttCreatePublisher(uint8_t qos, uint8_t retain, const char *fmt, ...);
 int MqttConnect();
 int MqttIsConnected();
-int MqttSetup(char *server, char *user, char *passwd, int port, char * hostname);
+int MqttSetup(const char *server, const char *user, const char *passwd, int port, const char * hostname);
 template<typename T> int MqttPublish(Adafruit_MQTT_Publish *publisher, T value);
 int MqttPublishIp(const String &ip);
 void MqttCheckSubscription();
@@ -44,7 +44,7 @@ void MqttNofity(int gpio, int value);
 int MqttBatchPublish(std::vector<struct mqttInfo> tab, ...){return 0;}
 int MqttConnect(){return 0;}
 int MqttIsConnected(){return 0;}
-int MqttSetup(char *server, char *user, char *passwd, int port, char * hostname){return 0;}
+int MqttSetup(const char *server, const char *user, const char *passwd, int port, const char * hostname){return 0;}
 template<typename T> int MqttPublish(Adafruit_MQTT_Publish *publisher, T value){return 0;}
 int MqttPublishIP(const String &ip){return 0;}
 void MqttCheckSubscription(){}
diff --git a/WifiControlSensor/MQTT.ino b/WifiControlSensor/MQTT.ino
index a1fd2a8..9542bc0 100644
--- a/WifiControlSensor/MQTT.ino
+++ b/WifiControlSensor/MQTT.ino
@@ -14,14 +14,11 @@ gpioInfo mqttIRQ[MAX_PIN + 1] = {};
 
 #define FEED_MAX_SIZE 96
 
-char *mqttId;
-
 bool isMqttConfigured = false;
 bool useMqtts = false;
 
 
-int MqttSetup(char *server, char *user, char *passwd, int port, char *hostname) {
-  mqttId = hostname;
+int MqttSetup(const char *server, const char *user, const char *passwd, int port, const char *hostname) {
   useMqtts = (port == 8883);
   isMqttConfigured = server[0] != '\0';
 
@@ -35,7 +32,7 @@ int MqttSetup(char *server, char *user, char *passwd, int port, char *hostname)
 #endif
     mqtt = new Adafruit_MQTT_Client(new WiFiClient(), server, port, user, passwd);
 
-  mqtt_ip = MqttCreatePublisher(0, 1, IP_FEED_FORMAT, user, mqttId);
+  mqtt_ip = MqttCreatePublisher(0, 1, IP_FEED_FORMAT, user, hostname);
 
   if (NB_ELEMENTS(gpioControlled) + NB_ELEMENTS(pwmControlled) > MAXSUBSCRIPTIONS) {
     SKETCH_DEBUG_PRINTF("Too much gpio/pwm to control\n Nb gpio %d Nb pwm %d Max is %d",
@@ -49,18 +46,18 @@ int MqttSetup(char *server, char *user, char *passwd, int port, char *hostname)
   }
 
   for (uint i = 0 ; i < NB_ELEMENTS(gpioControlled); i++) {
-    mqtt->subscribe(MqttCreateSubscribe(GPIO_SET_FEED_FORMAT, user, mqttId, gpioControlled[i]));
-    mqttGpio[i] = MqttCreatePublisher(0, 0, GPIO_FEED_FORMAT, user, mqttId, gpioControlled[i]);
+    mqtt->subscribe(MqttCreateSubscribe(GPIO_SET_FEED_FORMAT, user, hostname, gpioControlled[i]));
+    mqttGpio[i] = MqttCreatePublisher(0, 0, GPIO_FEED_FORMAT, user, hostname, gpioControlled[i]);
   }
 
   for (uint i = 0 ; i < NB_ELEMENTS(gpioObserved) && i < MAX_GPIO_OBSERVED ; i++) {
-    mqttGpioObserved[i] = MqttCreatePublisher(0, 0, GPIO_FEED_FORMAT, user, mqttId, gpioObserved[i]);
+    mqttGpioObserved[i] = MqttCreatePublisher(0, 0, GPIO_FEED_FORMAT, user, hostname, gpioObserved[i]);
     new HIB(gpioObserved[i], HIGH, MqttNofityIRQ , MqttNofityIRQ, NULL );
   }
 
   for (uint i = 0 ; i < NB_ELEMENTS(pwmControlled); i++) {
-    mqtt->subscribe(MqttCreateSubscribe(PWM_SET_FEED_FORMAT, user, mqttId, pwmControlled[i]));
-    mqttPwm[i] = MqttCreatePublisher(0, 0, PWM_FEED_FORMAT, user, mqttId, pwmControlled[i]);
+    mqtt->subscribe(MqttCreateSubscribe(PWM_SET_FEED_FORMAT, user, hostname, pwmControlled[i]));
+    mqttPwm[i] = MqttCreatePublisher(0, 0, PWM_FEED_FORMAT, user, hostname, pwmControlled[i]);
   }
 
   return 0;