From 4217ccebc4266f972db50d11e64df356b9ab54f5 Mon Sep 17 00:00:00 2001
From: SASANO Takayoshi <uaa@uaa.org.uk>
Date: Thu, 2 Jul 2020 06:59:51 +0900
Subject: [PATCH 1/2] remove getLocalAddress()

It was used for NXDNKenwoodNetwork.cpp to creates SSRC.
currently SSRC uses random value, this function is no longer used.
---
 UDPSocket.cpp | 28 ----------------------------
 UDPSocket.h   |  2 --
 2 files changed, 30 deletions(-)

diff --git a/UDPSocket.cpp b/UDPSocket.cpp
index 2899faf..abfa885 100644
--- a/UDPSocket.cpp
+++ b/UDPSocket.cpp
@@ -258,31 +258,3 @@ void CUDPSocket::close()
 	::close(m_fd);
 #endif
 }
-
-unsigned long CUDPSocket::getLocalAddress() const
-{
-	unsigned long address = 0UL;
-
-	char hostname[80U];
-	int ret = ::gethostname(hostname, 80);
-	if (ret == -1)
-		return 0UL;
-
-	struct hostent* phe = ::gethostbyname(hostname);
-	if (phe == NULL)
-		return 0UL;
-
-	if (phe->h_addrtype != AF_INET)
-		return 0UL;
-
-	for (unsigned int i = 0U; phe->h_addr_list[i] != NULL; i++) {
-		struct in_addr addr;
-		::memcpy(&addr, phe->h_addr_list[i], sizeof(struct in_addr));
-		if (addr.s_addr != INADDR_LOOPBACK) {
-			address = addr.s_addr;
-			break;
-		}
-	}
-
-	return address;
-}
diff --git a/UDPSocket.h b/UDPSocket.h
index 4c21a43..4aa16bd 100644
--- a/UDPSocket.h
+++ b/UDPSocket.h
@@ -47,8 +47,6 @@ public:
 
 	void close();
 
-    unsigned long getLocalAddress() const;
-
     static in_addr lookup(const std::string& hostName);
 
 private:

From 15a8e87c3ecc9c770271de65b1937b5e433e152b Mon Sep 17 00:00:00 2001
From: SASANO Takayoshi <uaa@uaa.org.uk>
Date: Thu, 2 Jul 2020 18:47:33 +0900
Subject: [PATCH 2/2] permit inline comment and ScreenLayout of Nextion

two minor improvements

- ScreenLayout in Nextion section can use hexadecimal (0xXXXXX),
  octal (0XXXX) and decimal value
- in-line comment enabled

	example:
	# conventional comment, the line starts with #
	[Section]
	Key=value # this is new style comment
	Key="quoted value # this is not comment"
	Key="quoted value" # this is prohibited (not comment)
---
 Conf.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Conf.cpp b/Conf.cpp
index 5bc7dba..6602b3c 100644
--- a/Conf.cpp
+++ b/Conf.cpp
@@ -390,6 +390,9 @@ bool CConf::read()
   if (len > 1U && *value == '"' && value[len - 1U] == '"') {
 	  value[len - 1U] = '\0';
 	  value++;
+  } else {
+	  // if value is not quoted, remove after # (to make comment)
+	  strtok(value, "#");
   }
 
   if (section == SECTION_GENERAL) {
@@ -916,7 +919,7 @@ bool CConf::read()
 		else if (::strcmp(key, "IdleBrightness") == 0)
 			m_nextionIdleBrightness = (unsigned int)::atoi(value);
 		else if (::strcmp(key, "ScreenLayout") == 0)
-			m_nextionScreenLayout = (unsigned int)::atoi(value);
+			m_nextionScreenLayout = (unsigned int)::strtoul(value, NULL, 0);
 		else if (::strcmp(key, "DisplayTempInFahrenheit") == 0)
 			m_nextionTempInFahrenheit = ::atoi(value) == 1;
 	} else if (section == SECTION_OLED) {