From 85196a756368956c1a5b97d6fafbf583647d2aed Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Thu, 7 Apr 2016 16:14:19 +0200 Subject: [PATCH] Fix Warnings --- WifiControlSensor/EEPROM.ino | 4 ++-- WifiControlSensor/MQTT.ino | 4 ++-- WifiControlSensor/WebServer.ino | 6 +++--- WifiControlSensor/WifiControlSensor.ino | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/WifiControlSensor/EEPROM.ino b/WifiControlSensor/EEPROM.ino index 5908fc1..5286c45 100644 --- a/WifiControlSensor/EEPROM.ino +++ b/WifiControlSensor/EEPROM.ino @@ -25,7 +25,7 @@ int EepromSaveConfig(uint8_t bootMode, String ssid, String password, String host SKETCH_DEBUG_PRINTLN("Saving " + eeprom); - for (int i = 0; i < eeprom.length() && i < CONFIG_EEPROM_SIZE; i++) { + for (uint i = 0; i < eeprom.length() && i < CONFIG_EEPROM_SIZE; i++) { EEPROM.write(i, eeprom.charAt(i)); } @@ -63,7 +63,7 @@ void EepromReadConfig(uint8_t &bootMode, char **ssid, char **password, char **ho int i = 2; uint8_t boot = EEPROM.read(0); - char *tmpString = ""; + char *tmpString; if (boot == '1') { bootMode = BOOTMODE_NORMAL; diff --git a/WifiControlSensor/MQTT.ino b/WifiControlSensor/MQTT.ino index 51422d5..5605054 100644 --- a/WifiControlSensor/MQTT.ino +++ b/WifiControlSensor/MQTT.ino @@ -49,7 +49,7 @@ int MqttSetup(char *server, char *user, char *passwd, int port, char * hostname) isMqttConfigured = server[0] != '\0'; - for (int i = 0 ; i < NB_ELEMENTS(gpioWatched) && i < MAXSUBSCRIPTIONS; i++) { + for (uint i = 0 ; i < NB_ELEMENTS(gpioWatched) && i < MAXSUBSCRIPTIONS; i++) { snprintf(GPIO_FEED[i], FEED_MAX_SIZE, GPIO_FEED_FORMAT, mqttId, gpioWatched[i]); snprintf(GPIO_SET_FEED[i], FEED_MAX_SIZE, GPIO_SET_FEED_FORMAT, mqttId, gpioWatched[i]); @@ -126,7 +126,7 @@ int getGpioFromSubscription(Adafruit_MQTT_Subscribe *subscription) { } int getGpioWatchedIndex(int gpio) { - for ( int i = 0; i < NB_ELEMENTS(gpioWatched); i++) { + for ( uint i = 0; i < NB_ELEMENTS(gpioWatched); i++) { if (gpio == gpioWatched[i]) return i; } diff --git a/WifiControlSensor/WebServer.ino b/WifiControlSensor/WebServer.ino index 8b2f71c..eb717b5 100644 --- a/WifiControlSensor/WebServer.ino +++ b/WifiControlSensor/WebServer.ino @@ -37,7 +37,7 @@ void WebHandleRoot() { ); } -void WebSendError(String error) { +void WebSendError(const char *error) { server.send(500, "text/plain", error); } @@ -96,7 +96,7 @@ void WebHandleGpio() { server.send(200, "text/html", "

GPIO" + server.arg("gpio") + " changed to " + server.arg("value") + "

"); } -boolean WebSetIp(IPAddress &addr, char *id, String error) { +boolean WebSetIp(IPAddress &addr, const char *id, const char *error) { if (server.arg(id) != "" && !addr.fromString(server.arg(id).c_str())) { WebSendError(error); return false; @@ -171,7 +171,7 @@ void WebHandleReboot() { ESP.restart(); } -void WebSetupServer(int bootmode) { +void WebSetupServer(int ) { server.on("/", WebHandleRoot); server.on("/setup", WebHandleSetup); server.on("/save", WebHandleSave); diff --git a/WifiControlSensor/WifiControlSensor.ino b/WifiControlSensor/WifiControlSensor.ino index c789053..dd97dcb 100644 --- a/WifiControlSensor/WifiControlSensor.ino +++ b/WifiControlSensor/WifiControlSensor.ino @@ -57,7 +57,7 @@ char eeprom[CONFIG_EEPROM_SIZE]; double temp, pressure; float dhtTemp, dhtHumidity; uint8_t mode; -char *hostName = ""; +const char *hostName = ""; /* Set these to your desired credentials. */ const char *ssid = CONFIG_SSID_NAME;