From ad78ff308214af451a17f065624d86328a2f9377 Mon Sep 17 00:00:00 2001
From: Thomas Barnekov <github@tgltech.dk>
Date: Wed, 5 Oct 2022 21:59:30 +0200
Subject: [PATCH] Fix implicit cast and non-const char pointer warnings

---
 src/AmsToMqttBridge.ino        |  2 +-
 src/mqtt/HomeAssistantStatic.h | 12 ++++++------
 src/web/AmsWebServer.cpp       | 16 ++++++++--------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino
index 20ee5ee5..23e7b52b 100644
--- a/src/AmsToMqttBridge.ino
+++ b/src/AmsToMqttBridge.ino
@@ -1122,7 +1122,7 @@ void WiFi_connect() {
 void mqttMessageReceived(String &topic, String &payload) {
     debugI("Received message for topic %s", topic.c_str() );
 	if(meterConfig.source == METER_SOURCE_MQTT) {
-		DataParserContext ctx = {payload.length()/2};
+		DataParserContext ctx = {static_cast<uint8_t>(payload.length()/2)};
 		fromHex(hanBuffer, payload, ctx.length);
 		uint16_t pos = unwrapData(hanBuffer, ctx);
 		// TODO: Run through DLMS/DMSR parser and apply AmsData
diff --git a/src/mqtt/HomeAssistantStatic.h b/src/mqtt/HomeAssistantStatic.h
index 7428959a..4aa2b286 100644
--- a/src/mqtt/HomeAssistantStatic.h
+++ b/src/mqtt/HomeAssistantStatic.h
@@ -4,12 +4,12 @@
 #include "Arduino.h"
 
 struct HomeAssistantSensor {
-    char* name;
-    char* topic;
-    char* path;
-    char* uom;
-    char* devcl;
-    char* stacl;
+    const char* name;
+    const char* topic;
+    const char* path;
+    const char* uom;
+    const char* devcl;
+    const char* stacl;
 };
 
 
diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp
index fa510cbc..4e3e1688 100644
--- a/src/web/AmsWebServer.cpp
+++ b/src/web/AmsWebServer.cpp
@@ -1007,7 +1007,7 @@ void AmsWebServer::handleSetup() {
 		server.sendHeader("Location", String("/"), true);
 		server.send (302, MIME_PLAIN, "");
 	} else {
-		SystemConfig sys { server.arg("board").toInt() };
+		SystemConfig sys { static_cast<uint8_t>(server.arg("board").toInt()) };
 
 		DebugConfig debugConfig;
 		config->getDebugConfig(debugConfig);
@@ -1277,11 +1277,11 @@ void AmsWebServer::handleSave() {
 	if(server.hasArg("dc") && server.arg("dc") == "true") {
 		printD("Received Domoticz config");
 		DomoticzConfig domo {
-			server.arg("elidx").toInt(),
-			server.arg("vl1idx").toInt(),
-			server.arg("vl2idx").toInt(),
-			server.arg("vl3idx").toInt(),
-			server.arg("cl1idx").toInt()
+			static_cast<uint16_t>(server.arg("elidx").toInt()),
+			static_cast<uint16_t>(server.arg("vl1idx").toInt()),
+			static_cast<uint16_t>(server.arg("vl2idx").toInt()),
+			static_cast<uint16_t>(server.arg("vl3idx").toInt()),
+			static_cast<uint16_t>(server.arg("cl1idx").toInt())
 		};
 		config->setDomoticzConfig(domo);
 	}
@@ -1358,8 +1358,8 @@ void AmsWebServer::handleSave() {
 		NtpConfig ntp {
 			server.hasArg("n") && server.arg("n") == "true",
 			server.hasArg("nd") && server.arg("nd") == "true",
-			server.arg("o").toInt() / 10,
-			server.arg("so").toInt() / 10
+			static_cast<int16_t>(server.arg("o").toInt() / 10),
+			static_cast<int16_t>(server.arg("so").toInt() / 10)
 		};
 		strcpy(ntp.server, server.arg("ns").c_str());
 		config->setNtpConfig(ntp);