From 3b7452feda558bc52c414fab9911880ed14f69b3 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Sun, 15 Dec 2019 22:20:03 +0000
Subject: [PATCH] Update for VS2017

---
 MMDVMHost.vcxproj         |  2 ++
 MMDVMHost.vcxproj.filters |  6 ++++++
 TFTSurenoo.cpp            | 16 ++++++++--------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/MMDVMHost.vcxproj b/MMDVMHost.vcxproj
index 1adb9bc..e2f4435 100644
--- a/MMDVMHost.vcxproj
+++ b/MMDVMHost.vcxproj
@@ -233,6 +233,7 @@
     <ClInclude Include="StopWatch.h" />
     <ClInclude Include="Sync.h" />
     <ClInclude Include="TFTSerial.h" />
+    <ClInclude Include="TFTSurenoo.h" />
     <ClInclude Include="Thread.h" />
     <ClInclude Include="Timer.h" />
     <ClInclude Include="UDPSocket.h" />
@@ -321,6 +322,7 @@
     <ClCompile Include="StopWatch.cpp" />
     <ClCompile Include="Sync.cpp" />
     <ClCompile Include="TFTSerial.cpp" />
+    <ClCompile Include="TFTSurenoo.cpp" />
     <ClCompile Include="Thread.cpp" />
     <ClCompile Include="Timer.cpp" />
     <ClCompile Include="UDPSocket.cpp" />
diff --git a/MMDVMHost.vcxproj.filters b/MMDVMHost.vcxproj.filters
index de9ba23..3b299d3 100644
--- a/MMDVMHost.vcxproj.filters
+++ b/MMDVMHost.vcxproj.filters
@@ -290,6 +290,9 @@
     <ClInclude Include="CASTInfo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="TFTSurenoo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="BPTC19696.cpp">
@@ -544,5 +547,8 @@
     <ClCompile Include="CASTInfo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="TFTSurenoo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/TFTSurenoo.cpp b/TFTSurenoo.cpp
index 91368f2..26fba17 100644
--- a/TFTSurenoo.cpp
+++ b/TFTSurenoo.cpp
@@ -377,7 +377,7 @@ void CTFTSurenoo::refreshDisplay(void)
 	// mode line
 	::snprintf(m_temp, sizeof(m_temp), "DCV%d(%d,%d,'%s',%d);",
 		   MODE_FONT_SIZE, 0, 0, m_lineBuf, MODE_COLOUR);
-	m_serial->write((unsigned char*)m_temp, ::strlen(m_temp));
+	m_serial->write((unsigned char*)m_temp, (unsigned int)::strlen(m_temp));
 
 	// status line
 	for (int i = 0; i < STATUS_LINES; i++) {
@@ -385,12 +385,12 @@ void CTFTSurenoo::refreshDisplay(void)
 			   STATUS_FONT_SIZE, 0,
 			   STATUS_MARGIN + STATUS_FONT_SIZE * i,
 			   m_lineBuf + statusLine_offset(i), FG_COLOUR);
-		m_serial->write((unsigned char*)m_temp, ::strlen(m_temp));
+		m_serial->write((unsigned char*)m_temp, (unsigned int)::strlen(m_temp));
 	}
 
 	// sending CR+LF finishes commands
 	::snprintf(m_temp, sizeof(m_temp), STR_CRLF);
-	m_serial->write((unsigned char*)m_temp, ::strlen(m_temp));
+	m_serial->write((unsigned char*)m_temp, (unsigned int)::strlen(m_temp));
 
 	m_refresh = false;
 }
@@ -398,7 +398,7 @@ void CTFTSurenoo::refreshDisplay(void)
 void CTFTSurenoo::lcdReset(void)
 {
 	::snprintf(m_temp, sizeof(m_temp), "RESET;" STR_CRLF);
-	m_serial->write((unsigned char*)m_temp, ::strlen(m_temp));
+	m_serial->write((unsigned char*)m_temp, (unsigned int)::strlen(m_temp));
 	CThread::sleep(250);	// document says 230ms
 }
 
@@ -407,7 +407,7 @@ void CTFTSurenoo::clearScreen(unsigned char colour)
 	assert(colour >= 0U && colour <= 63U);
 
 	::snprintf(m_temp, sizeof(m_temp), "CLR(%d);" STR_CRLF, colour);
-	m_serial->write((unsigned char*)m_temp, ::strlen(m_temp));
+	m_serial->write((unsigned char*)m_temp, (unsigned int)::strlen(m_temp));
 	CThread::sleep(100);	// at least 60ms (@240x320 panel)
 }
 
@@ -416,7 +416,7 @@ void CTFTSurenoo::setBackground(unsigned char colour)
 	assert(colour >= 0U && colour <= 63U);
 
 	::snprintf(m_temp, sizeof(m_temp), "SBC(%d);", colour);
-	m_serial->write((unsigned char*)m_temp, ::strlen(m_temp));
+	m_serial->write((unsigned char*)m_temp, (unsigned int)::strlen(m_temp));
 }
 
 void CTFTSurenoo::setRotation(unsigned char rotation)
@@ -424,7 +424,7 @@ void CTFTSurenoo::setRotation(unsigned char rotation)
 	assert(rotation >= 0U && rotation <= 1U);
 
 	::snprintf(m_temp, sizeof(m_temp), "DIR(%d);", rotation);
-	m_serial->write((unsigned char*)m_temp, ::strlen(m_temp));
+	m_serial->write((unsigned char*)m_temp, (unsigned int)::strlen(m_temp));
 }
 
 void CTFTSurenoo::setBrightness(unsigned char brightness)
@@ -432,5 +432,5 @@ void CTFTSurenoo::setBrightness(unsigned char brightness)
 	assert(brightness >= 0U && brightness <= 255U);
 
 	::snprintf(m_temp, sizeof(m_temp), "BL(%d);", brightness);
-	m_serial->write((unsigned char*)m_temp, ::strlen(m_temp));
+	m_serial->write((unsigned char*)m_temp, (unsigned int)::strlen(m_temp));
 }