Merge branch 'master' into P25

This commit is contained in:
Jonathan Naylor
2016-09-27 19:47:07 +01:00
26 changed files with 43736 additions and 42672 deletions

View File

@@ -177,6 +177,14 @@ void CDisplay::clearP25()
}
}
void CDisplay::writeCW()
{
m_timer1.start();
m_mode1 = MODE_CW;
writeCWInt();
}
void CDisplay::clock(unsigned int ms)
{
m_timer1.clock(ms);
@@ -202,6 +210,11 @@ void CDisplay::clock(unsigned int ms)
m_mode1 = MODE_IDLE;
m_timer1.stop();
break;
case MODE_CW:
clearCWInt();
m_mode1 = MODE_IDLE;
m_timer1.stop();
break;
default:
break;
}