mirror
/
meshtastic-firmware
kopia lustrzana https://github.com/meshtastic/firmware
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

- prevent crash when no messages defined 

- remove debug print
pull/1771/head
Thomas Göttgens 2022-10-08 11:20:54 +02:00
rodzic e50e15dc04
commit c9398e7b8a
1 zmienionych plików z 17 dodań i 21 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

38
src/modules/CannedMessageModule.cpp
Wyświetl plik

@ -203,7 +203,7 @@ void CannedMessageModule::sendText(NodeNum dest, const char *message, bool wantR
p->decoded.payload.size++; p->decoded.payload.size++;
} }
DEBUG_MSG("Sending message id=%d, msg=%.*s\n", p->id, p->decoded.payload.size, p->decoded.payload.bytes); DEBUG_MSG("Sending message id=%d, dest=%x, msg=%.*s\n", p->id, p->to, p->decoded.payload.size, p->decoded.payload.bytes);
service.sendToMesh(p); service.sendToMesh(p);
} }
@ -266,19 +266,23 @@ int32_t CannedMessageModule::runOnce()
e.frameChanged = true; e.frameChanged = true;
this->runState = CANNED_MESSAGE_RUN_STATE_ACTIVE; this->runState = CANNED_MESSAGE_RUN_STATE_ACTIVE;
} else if (this->runState == CANNED_MESSAGE_RUN_STATE_ACTION_UP) { } else if (this->runState == CANNED_MESSAGE_RUN_STATE_ACTION_UP) {
this->currentMessageIndex = getPrevIndex(); if (this->messagesCount > 0) {
this->freetext = ""; // clear freetext this->currentMessageIndex = getPrevIndex();
this->cursor = 0; this->freetext = ""; // clear freetext
this->destSelect = false; this->cursor = 0;
this->runState = CANNED_MESSAGE_RUN_STATE_ACTIVE; this->destSelect = false;
DEBUG_MSG("MOVE UP (%d):%s\n", this->currentMessageIndex, this->getCurrentMessage()); this->runState = CANNED_MESSAGE_RUN_STATE_ACTIVE;
DEBUG_MSG("MOVE UP (%d):%s\n", this->currentMessageIndex, this->getCurrentMessage());
}
} else if (this->runState == CANNED_MESSAGE_RUN_STATE_ACTION_DOWN) { } else if (this->runState == CANNED_MESSAGE_RUN_STATE_ACTION_DOWN) {
this->currentMessageIndex = this->getNextIndex(); if (this->messagesCount > 0) {
this->freetext = ""; // clear freetext this->currentMessageIndex = this->getNextIndex();
this->cursor = 0; this->freetext = ""; // clear freetext
this->destSelect = false; this->cursor = 0;
this->runState = CANNED_MESSAGE_RUN_STATE_ACTIVE; this->destSelect = false;
DEBUG_MSG("MOVE DOWN (%d):%s\n", this->currentMessageIndex, this->getCurrentMessage()); this->runState = CANNED_MESSAGE_RUN_STATE_ACTIVE;
DEBUG_MSG("MOVE DOWN (%d):%s\n", this->currentMessageIndex, this->getCurrentMessage());
}
} else if (this->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT) { } else if (this->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT) {
e.frameChanged = true; e.frameChanged = true;
switch (this->payload) { switch (this->payload) {
@ -287,19 +291,15 @@ int32_t CannedMessageModule::runOnce()
size_t numNodes = nodeDB.getNumNodes(); size_t numNodes = nodeDB.getNumNodes();
if(this->dest == NODENUM_BROADCAST) { if(this->dest == NODENUM_BROADCAST) {
this->dest = nodeDB.getNodeNum(); this->dest = nodeDB.getNodeNum();
DEBUG_MSG("Replacing NodeNum_BROADCAST with %x\n",nodeDB.getNodeNum());
} }
for (int i = 0; i < numNodes; i++) { for (int i = 0; i < numNodes; i++) {
DEBUG_MSG("Considering %x\n",nodeDB.getNodeByIndex(i)->num);
if (nodeDB.getNodeByIndex(i)->num == this->dest) { if (nodeDB.getNodeByIndex(i)->num == this->dest) {
DEBUG_MSG("Match - advance %i-\n",i);
this->dest = (i > 0) ? nodeDB.getNodeByIndex(i-1)->num : nodeDB.getNodeByIndex(numNodes-1)->num; this->dest = (i > 0) ? nodeDB.getNodeByIndex(i-1)->num : nodeDB.getNodeByIndex(numNodes-1)->num;
break; break;
} }
} }
if(this->dest == nodeDB.getNodeNum()) { if(this->dest == nodeDB.getNodeNum()) {
this->dest = NODENUM_BROADCAST; this->dest = NODENUM_BROADCAST;
DEBUG_MSG("Replacing %x with NodeNum_BROADCAST\n",nodeDB.getNodeNum());
} }
}else{ }else{
if (this->cursor > 0) { if (this->cursor > 0) {
@ -312,19 +312,15 @@ int32_t CannedMessageModule::runOnce()
size_t numNodes = nodeDB.getNumNodes(); size_t numNodes = nodeDB.getNumNodes();
if(this->dest == NODENUM_BROADCAST) { if(this->dest == NODENUM_BROADCAST) {
this->dest = nodeDB.getNodeNum(); this->dest = nodeDB.getNodeNum();
DEBUG_MSG("Replacing NodeNum_BROADCAST with %x\n",nodeDB.getNodeNum());
} }
for (int i = 0; i < numNodes; i++) { for (int i = 0; i < numNodes; i++) {
DEBUG_MSG("Considering %x\n",nodeDB.getNodeByIndex(i)->num);
if (nodeDB.getNodeByIndex(i)->num == this->dest) { if (nodeDB.getNodeByIndex(i)->num == this->dest) {
DEBUG_MSG("Match - advance %i+\n",i);
this->dest = (i < numNodes-1) ? nodeDB.getNodeByIndex(i+1)->num : nodeDB.getNodeByIndex(0)->num; this->dest = (i < numNodes-1) ? nodeDB.getNodeByIndex(i+1)->num : nodeDB.getNodeByIndex(0)->num;
break; break;
} }
} }
if(this->dest == nodeDB.getNodeNum()) { if(this->dest == nodeDB.getNodeNum()) {
this->dest = NODENUM_BROADCAST; this->dest = NODENUM_BROADCAST;
DEBUG_MSG("Replacing %x with NodeNum_BROADCAST\n",nodeDB.getNodeNum());
} }
}else{ }else{
if (this->cursor < this->freetext.length()) { if (this->cursor < this->freetext.length()) {