Merge pull request #493 from liamcottle/fix/cli-messages
Don't show CLI replies on display
This commit is contained in:
@@ -319,13 +319,17 @@ void MyMesh::queueMessage(const ContactInfo &from, uint8_t txt_type, mesh::Packe
|
|||||||
uint8_t frame[1];
|
uint8_t frame[1];
|
||||||
frame[0] = PUSH_CODE_MSG_WAITING; // send push 'tickle'
|
frame[0] = PUSH_CODE_MSG_WAITING; // send push 'tickle'
|
||||||
_serial->writeFrame(frame, 1);
|
_serial->writeFrame(frame, 1);
|
||||||
} else {
|
|
||||||
#ifdef DISPLAY_CLASS
|
|
||||||
ui_task.soundBuzzer(UIEventType::contactMessage);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DISPLAY_CLASS
|
#ifdef DISPLAY_CLASS
|
||||||
ui_task.newMsg(path_len, from.name, text, offline_queue_len);
|
// we only want to show text messages on display, not cli data
|
||||||
|
bool should_display = txt_type == TXT_TYPE_PLAIN || txt_type == TXT_TYPE_SIGNED_PLAIN;
|
||||||
|
if (should_display) {
|
||||||
|
ui_task.newMsg(path_len, from.name, text, offline_queue_len);
|
||||||
|
if (!_serial->isConnected()) {
|
||||||
|
ui_task.soundBuzzer(UIEventType::contactMessage);
|
||||||
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user