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

Merge branch 'M17_AX25_FM' into I2C

Browse source
This commit is contained in:
Jonathan Naylor 2020-12-16 15:16:12 +00:00
commit a9980556a1
1 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
OLED.cpp
View file

@ -1088,6 +1088,36 @@ void COLED::writePOCSAGInt(uint32_t ric, const std::string& message)
clearDisplay(); clearDisplay();
fillRect(0U, OLED_LINE2, m_width, m_height, BLACK); fillRect(0U, OLED_LINE2, m_width, m_height, BLACK);
unsigned int pos;
size_t length = message.length();
std::string rubric;
// extract rublic index "(xx-xx)"
switch (ric) {
case 4512U:
case 4520U:
if (length > 0U) {
std::string::size_type start = message.find("(");
std::string::size_type end = message.find(") ");
if (start != std::string::npos && end != std::string::npos) {
rubric = message.substr(start, end - start + 1);
pos = end + 2U;
break;
}
}
/*FALLTHROUGH*/
default:
rubric = "";
pos = 0U;
break;
}
// Remove double-quotation leading/trailing message
if (length > 0U && message.at(pos) == '\"' && message.at(length - 1) == '\"') {
pos++;
length--;
}
m_cursorX = 0U; m_cursorX = 0U;
m_cursorY = OLED_LINE2; m_cursorY = OLED_LINE2;
@ -1097,10 +1127,14 @@ void COLED::writePOCSAGInt(uint32_t ric, const std::string& message)
m_textWrap = true; // text wrap temorally enable m_textWrap = true; // text wrap temorally enable
if (!rubric.empty()) {
::sprintf(text, " / %s", rubric.c_str());
print(text);
}
m_cursorX = 0U; m_cursorX = 0U;
m_cursorY = OLED_LINE3; m_cursorY = OLED_LINE3;
// No room to display "MSG: " header
print(message.c_str()); print(message.c_str());
m_textWrap = false; m_textWrap = false;