allow MQTT port config entry to be optional (backward compatiblity)

MQTTClient.cpp

@@ -69,15 +69,15 @@ void MQTTClient::subscriptionUpdate(char* topic, byte* message, unsigned int len
   publications.erase(willTopic);
 }
 
-void MQTTClient::setup(const char* mqttServer, const char* mqttPort, const char* mqttUsername, const char* mqttPassword, const char* cid, const char* wt, const char* wm)
+void MQTTClient::setup(const char* mqttServer, uint16 mqttPort, const char* mqttUsername, const char* mqttPassword, const char* cid, const char* wt, const char* wm)
 {
   mqttuser = mqttUsername;
   mqttpw = mqttPassword;
   clientId = cid;
   willTopic = wt;
   willMessage = wm;
 
-  mqttClient.setServer(mqttServer, atoi(mqttPort));
+  mqttClient.setServer(mqttServer, mqttPort);
   mqttClient.setCallback(std::bind(&MQTTClient::subscriptionUpdate, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
 }
 
@@ -186,6 +186,6 @@ bool MQTTClient::publish(const char* topic, const String& message, bool retain,
       return published;
     }
   }
-  
+
   return false;
 }

MQTTClient.h

@@ -47,12 +47,12 @@ class MQTTClient
   void addSubscriber(const char* topic, void (*setter)(bool value));
   void addSubscriber(const char* topic, void (*setter)(int value));
 
-  void setup(const char* mqttServer, const char* mqttPort, const char* mqttUsername, const char* mqttPassword,const char* clientId, const char* willTopic, const char* willMessage);
+  void setup(const char* mqttServer, uint16 mqttPort, const char* mqttUsername, const char* mqttPassword,const char* clientId, const char* willTopic, const char* willMessage);
   void loop();
 
   bool isConnected();
   bool publish(const char* topic, const String& payload, bool retain=false, bool force=false);
-  
+
 private:
   static const unsigned int RECONNECT_DELAY = 3000; // [ms]
 

README.md

@@ -257,14 +257,17 @@ Example:
  "wifiSSID":       "WiFi-SSID",
  "wifiPassphrase": "WiFi-secret",
  "mqttServer":     "mqtt.at.home",
- "mqttUser":       "leave blank if you don't need authentication",
- "mqttPassword":   "leave blank if you don't need authentication",
+ "mqttPort":       "1883",
+ "mqttUser":       "userName",
+ "mqttPassword":   "password",
  "mqttRetain":     "no",
  "firmwareURL":    "http://webserver.at.home/firmware/SB-H20-WiFiController.bin",
  "errorLanguage":  "EN"
 }
 ```
 
+The config entry *mqttPort* can be omitted and defaults to 1883.
+
 If *mqttUser* is omitted no authentication is used for the MQTT connection and
 *mqttPassword* can also be omitted.
 

common.h

@@ -51,7 +51,7 @@
 
 namespace CONFIG
 {
-  const char WIFI_VERSION[] = "1.0.6.2"; // 30.07.2023
+  const char WIFI_VERSION[] = "1.0.7.0"; // 11.08.2023
 
   // WiFi parameters
   const unsigned long WIFI_MAX_DISCONNECT_DURATION = 900000; // [ms] 5 min until reboot

esp8266-intexsbh20.ino

@@ -67,6 +67,7 @@ MQTTClient mqttClient;
 MQTTPublisher mqttPublisher(mqttClient, pureSpaIO, thermometer);
 String username;
 String password;
+String mqttPort;
 
 unsigned long disconnectTime = 0;
 LANG language = LANG::CODE;
@@ -132,7 +133,16 @@ void setup()
         username = config.get(CONFIG_TAG::MQTT_USER);
         password = config.get(CONFIG_TAG::MQTT_PASSWORD);
       }
-      mqttClient.setup(config.get(CONFIG_TAG::MQTT_SERVER), config.get(CONFIG_TAG::MQTT_PORT), username.c_str(), password.c_str(), pureSpaIO.getModelName(), MQTT_TOPIC::STATE, "offline");
+      uint16 mqttPort;
+      if (config.exists(CONFIG_TAG::MQTT_PORT))
+      {
+        mqttPort = atoi(config.get(CONFIG_TAG::MQTT_PORT));
+      }
+      else
+      {
+        mqttPort = 1883;
+      }
+      mqttClient.setup(config.get(CONFIG_TAG::MQTT_SERVER), mqttPort, username.c_str(), password.c_str(), pureSpaIO.getModelName(), MQTT_TOPIC::STATE, "offline");
 
       // init NTC thermometer
       thermometer.setup(22000, 3.33f, 320.f/100.f); // measured: 21990, 3.327f, 319.f/99.6f