Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update for VS2017

Browse source
This commit is contained in:
Jonathan Naylor 2019-12-15 22:20:03 +00:00
parent 0e78fafa91
commit 3b7452feda
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MMDVMHost.vcxproj
View file

@ -233,6 +233,7 @@
<ClInclude Include="StopWatch.h" /> <ClInclude Include="StopWatch.h" />
<ClInclude Include="Sync.h" /> <ClInclude Include="Sync.h" />
<ClInclude Include="TFTSerial.h" /> <ClInclude Include="TFTSerial.h" />
<ClInclude Include="TFTSurenoo.h" />
<ClInclude Include="Thread.h" /> <ClInclude Include="Thread.h" />
<ClInclude Include="Timer.h" /> <ClInclude Include="Timer.h" />
<ClInclude Include="UDPSocket.h" /> <ClInclude Include="UDPSocket.h" />
@ -321,6 +322,7 @@
<ClCompile Include="StopWatch.cpp" /> <ClCompile Include="StopWatch.cpp" />
<ClCompile Include="Sync.cpp" /> <ClCompile Include="Sync.cpp" />
<ClCompile Include="TFTSerial.cpp" /> <ClCompile Include="TFTSerial.cpp" />
<ClCompile Include="TFTSurenoo.cpp" />
<ClCompile Include="Thread.cpp" /> <ClCompile Include="Thread.cpp" />
<ClCompile Include="Timer.cpp" /> <ClCompile Include="Timer.cpp" />
<ClCompile Include="UDPSocket.cpp" /> <ClCompile Include="UDPSocket.cpp" />

6
MMDVMHost.vcxproj.filters
View file

@ -290,6 +290,9 @@
<ClInclude Include="CASTInfo.h"> <ClInclude Include="CASTInfo.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="TFTSurenoo.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="BPTC19696.cpp"> <ClCompile Include="BPTC19696.cpp">
@ -544,5 +547,8 @@
<ClCompile Include="CASTInfo.cpp"> <ClCompile Include="CASTInfo.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="TFTSurenoo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

16
TFTSurenoo.cpp
View file

@ -377,7 +377,7 @@ void CTFTSurenoo::refreshDisplay(void)
// mode line // mode line
::snprintf(m_temp, sizeof(m_temp), "DCV%d(%d,%d,'%s',%d);", ::snprintf(m_temp, sizeof(m_temp), "DCV%d(%d,%d,'%s',%d);",
MODE_FONT_SIZE, 0, 0, m_lineBuf, MODE_COLOUR); 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 // status line
for (int i = 0; i < STATUS_LINES; i++) { for (int i = 0; i < STATUS_LINES; i++) {
@ -385,12 +385,12 @@ void CTFTSurenoo::refreshDisplay(void)
STATUS_FONT_SIZE, 0, STATUS_FONT_SIZE, 0,
STATUS_MARGIN + STATUS_FONT_SIZE * i, STATUS_MARGIN + STATUS_FONT_SIZE * i,
m_lineBuf + statusLine_offset(i), FG_COLOUR); 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 // sending CR+LF finishes commands
::snprintf(m_temp, sizeof(m_temp), STR_CRLF); ::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; m_refresh = false;
} }
@ -398,7 +398,7 @@ void CTFTSurenoo::refreshDisplay(void)
void CTFTSurenoo::lcdReset(void) void CTFTSurenoo::lcdReset(void)
{ {
::snprintf(m_temp, sizeof(m_temp), "RESET;" STR_CRLF); ::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 CThread::sleep(250); // document says 230ms
} }
@ -407,7 +407,7 @@ void CTFTSurenoo::clearScreen(unsigned char colour)
assert(colour >= 0U && colour <= 63U); assert(colour >= 0U && colour <= 63U);
::snprintf(m_temp, sizeof(m_temp), "CLR(%d);" STR_CRLF, colour); ::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) CThread::sleep(100); // at least 60ms (@240x320 panel)
} }
@ -416,7 +416,7 @@ void CTFTSurenoo::setBackground(unsigned char colour)
assert(colour >= 0U && colour <= 63U); assert(colour >= 0U && colour <= 63U);
::snprintf(m_temp, sizeof(m_temp), "SBC(%d);", colour); ::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) void CTFTSurenoo::setRotation(unsigned char rotation)
@ -424,7 +424,7 @@ void CTFTSurenoo::setRotation(unsigned char rotation)
assert(rotation >= 0U && rotation <= 1U); assert(rotation >= 0U && rotation <= 1U);
::snprintf(m_temp, sizeof(m_temp), "DIR(%d);", rotation); ::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) void CTFTSurenoo::setBrightness(unsigned char brightness)
@ -432,5 +432,5 @@ void CTFTSurenoo::setBrightness(unsigned char brightness)
assert(brightness >= 0U && brightness <= 255U); assert(brightness >= 0U && brightness <= 255U);
::snprintf(m_temp, sizeof(m_temp), "BL(%d);", brightness); ::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));
} }