Compare commits

..

No commits in common. "783ceef9f899150577977889c01283680c05a6a2" and "8a0b0f4be00d9b923ec3f6c9307bd8f0656da02d" have entirely different histories.

5 changed files with 8 additions and 19 deletions

View File

@ -2,7 +2,7 @@
extends = arduino_base
platform =
# renovate: datasource=custom.pio depName=platformio/ststm32 packageName=platformio/platform/ststm32
platformio/ststm32@19.3.0
platformio/ststm32@19.2.0
platform_packages =
# TODO renovate
platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.10.1.zip

View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh
PYTHON=${PYTHON:-$(which python3 python|head -n 1)}
CHANGE_MODE=false

View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh
# postinst script for meshtasticd
#
# see: dh_installdeb(1)

View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh
# postrm script for meshtasticd
#
# see: dh_installdeb(1)

View File

@ -599,21 +599,10 @@ bool CannedMessageModule::handleMessageSelectorInput(const InputEvent *event, bo
NodeNum destNode = dest;
ChannelIndex chan = channel;
#if CANNED_MESSAGE_ADD_CONFIRMATION
graphics::menuHandler::showConfirmationBanner("Send message?", [this, destNode, chan, current]() {
this->sendText(destNode, chan, current, false);
payload = runState;
runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
currentMessageIndex = -1;
// Notify UI to regenerate frame set and redraw
UIFrameEvent e;
e.action = UIFrameEvent::Action::REGENERATE_FRAMESET;
notifyObservers(&e);
screen->forceDisplay();
});
graphics::menuHandler::showConfirmationBanner(
"Send message?", [this, destNode, chan, current]() { this->sendText(destNode, chan, current, false); });
#else
payload = runState;
runState = CANNED_MESSAGE_RUN_STATE_ACTION_SELECT;
this->sendText(destNode, chan, current, false);
#endif
// Do not immediately set runState; wait for confirmation
handled = true;
@ -1730,7 +1719,7 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
// Text: split by words and wrap inside word if needed
String text = token.second;
pos = 0;
while (pos < static_cast<int>(text.length())) {
while (pos < text.length()) {
// Find next space (or end)
int spacePos = text.indexOf(' ', pos);
int endPos = (spacePos == -1) ? text.length() : spacePos + 1; // Include space