mirror of
https://github.com/meshtastic/firmware.git
synced 2025-08-24 05:50:16 +00:00
Enable store and forward on default
This commit is contained in:
parent
4d34b3d73c
commit
d85b7f42a7
@ -338,8 +338,6 @@ void StoreForwardModule::sendErrorTextMessage(NodeNum dest, bool want_response)
|
|||||||
const char *str;
|
const char *str;
|
||||||
if (this->busy) {
|
if (this->busy) {
|
||||||
str = "S&F - Busy. Try again shortly.";
|
str = "S&F - Busy. Try again shortly.";
|
||||||
} else {
|
|
||||||
str = "S&F not permitted on the public channel.";
|
|
||||||
}
|
}
|
||||||
LOG_WARN("%s", str);
|
LOG_WARN("%s", str);
|
||||||
memcpy(pr->decoded.payload.bytes, str, strlen(str));
|
memcpy(pr->decoded.payload.bytes, str, strlen(str));
|
||||||
@ -392,7 +390,7 @@ ProcessMessage StoreForwardModule::handleReceived(const meshtastic_MeshPacket &m
|
|||||||
LOG_DEBUG("Legacy Request to send");
|
LOG_DEBUG("Legacy Request to send");
|
||||||
|
|
||||||
// Send the last 60 minutes of messages.
|
// Send the last 60 minutes of messages.
|
||||||
if (this->busy || channels.isDefaultChannel(mp.channel)) {
|
if (this->busy) {
|
||||||
sendErrorTextMessage(getFrom(&mp), mp.decoded.want_response);
|
sendErrorTextMessage(getFrom(&mp), mp.decoded.want_response);
|
||||||
} else {
|
} else {
|
||||||
storeForwardModule->historySend(historyReturnWindow * 60, getFrom(&mp));
|
storeForwardModule->historySend(historyReturnWindow * 60, getFrom(&mp));
|
||||||
@ -457,7 +455,7 @@ bool StoreForwardModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp,
|
|||||||
requests_history++;
|
requests_history++;
|
||||||
LOG_INFO("Client Request to send HISTORY");
|
LOG_INFO("Client Request to send HISTORY");
|
||||||
// Send the last 60 minutes of messages.
|
// Send the last 60 minutes of messages.
|
||||||
if (this->busy || channels.isDefaultChannel(mp.channel)) {
|
if (this->busy) {
|
||||||
sendErrorTextMessage(getFrom(&mp), mp.decoded.want_response);
|
sendErrorTextMessage(getFrom(&mp), mp.decoded.want_response);
|
||||||
} else {
|
} else {
|
||||||
if ((p->which_variant == meshtastic_StoreAndForward_history_tag) && (p->variant.history.window > 0)) {
|
if ((p->which_variant == meshtastic_StoreAndForward_history_tag) && (p->variant.history.window > 0)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user