mirror of
https://github.com/meshtastic/firmware.git
synced 2025-10-28 15:22:55 +00:00
Nrf built issue fix
This commit is contained in:
parent
cf9bc7ac00
commit
d779821f0e
@ -91,7 +91,7 @@ void MessageStore::saveToFlash()
|
|||||||
f.write((uint8_t *)&m.sender, sizeof(m.sender));
|
f.write((uint8_t *)&m.sender, sizeof(m.sender));
|
||||||
f.write((uint8_t *)&m.channelIndex, sizeof(m.channelIndex));
|
f.write((uint8_t *)&m.channelIndex, sizeof(m.channelIndex));
|
||||||
f.write((uint8_t *)&m.dest, sizeof(m.dest));
|
f.write((uint8_t *)&m.dest, sizeof(m.dest));
|
||||||
f.write((uint8_t *)m.text.c_str(), std::min(MAX_MESSAGE_SIZE, (uint32_t)m.text.size()));
|
f.write((uint8_t *)m.text.c_str(), std::min(static_cast<size_t>(MAX_MESSAGE_SIZE), m.text.size()));
|
||||||
f.write('\0'); // null terminator
|
f.write('\0'); // null terminator
|
||||||
}
|
}
|
||||||
spiLock->unlock();
|
spiLock->unlock();
|
||||||
@ -211,4 +211,4 @@ std::deque<StoredMessage> MessageStore::getDirectMessages() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
// === Global definition ===
|
// === Global definition ===
|
||||||
MessageStore messageStore("default");
|
MessageStore messageStore("default");
|
||||||
|
|||||||
@ -1374,6 +1374,9 @@ void Screen::handleShowPrevFrame()
|
|||||||
ui->previousFrame();
|
ui->previousFrame();
|
||||||
lastScreenTransition = millis();
|
lastScreenTransition = millis();
|
||||||
setFastFramerate();
|
setFastFramerate();
|
||||||
|
|
||||||
|
// Reset scroll state if we’re leaving the text message frame
|
||||||
|
graphics::MessageRenderer::resetScrollState();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1385,6 +1388,9 @@ void Screen::handleShowNextFrame()
|
|||||||
ui->nextFrame();
|
ui->nextFrame();
|
||||||
lastScreenTransition = millis();
|
lastScreenTransition = millis();
|
||||||
setFastFramerate();
|
setFastFramerate();
|
||||||
|
|
||||||
|
// Reset scroll state if we’re leaving the text message frame
|
||||||
|
graphics::MessageRenderer::resetScrollState();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user