kopia lustrzana https://github.com/meshtastic/firmware
Merge branch 'meshtastic:master' into router
commit
c1c8fea21e
|
@ -341,5 +341,8 @@ jobs:
|
||||||
with:
|
with:
|
||||||
commit: ${{ (github.event.pull_request_target || github.event.pull_request).head.sha }}
|
commit: ${{ (github.event.pull_request_target || github.event.pull_request).head.sha }}
|
||||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
artifacts-branch: artifacts
|
artifacts-token: ${{ secrets.ARTIFACTS_TOKEN }}
|
||||||
|
artifacts-repo: meshtastic/artifacts
|
||||||
|
artifacts-branch: device
|
||||||
|
artifacts-dir: pr
|
||||||
artifacts: ./firmware-${{ steps.version.outputs.version }}.zip
|
artifacts: ./firmware-${{ steps.version.outputs.version }}.zip
|
||||||
|
|
|
@ -11,7 +11,7 @@ env.Replace( MKSPIFFSTOOL=env.get("PROJECT_DIR") + '/bin/mklittlefs.py' )
|
||||||
try:
|
try:
|
||||||
import littlefs
|
import littlefs
|
||||||
except ImportError:
|
except ImportError:
|
||||||
env.Execute("$PYTHONEXE -m pip install --user littlefs-python")
|
env.Execute("$PYTHONEXE -m pip install littlefs-python")
|
||||||
|
|
||||||
Import("projenv")
|
Import("projenv")
|
||||||
|
|
||||||
|
|
|
@ -1367,13 +1367,15 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
|
||||||
} else if (channels.getPrimary().modem_config == 1) {
|
} else if (channels.getPrimary().modem_config == 1) {
|
||||||
mode = "ShrtFast";
|
mode = "ShrtFast";
|
||||||
} else if (channels.getPrimary().modem_config == 2) {
|
} else if (channels.getPrimary().modem_config == 2) {
|
||||||
mode = "LngFast";
|
|
||||||
} else if (channels.getPrimary().modem_config == 3) {
|
|
||||||
mode = "LngSlow";
|
|
||||||
} else if (channels.getPrimary().modem_config == 4) {
|
|
||||||
mode = "MedSlow";
|
mode = "MedSlow";
|
||||||
} else if (channels.getPrimary().modem_config == 5) {
|
} else if (channels.getPrimary().modem_config == 3) {
|
||||||
mode = "MedFast";
|
mode = "MedFast";
|
||||||
|
} else if (channels.getPrimary().modem_config == 4) {
|
||||||
|
mode = "LngFast";
|
||||||
|
} else if (channels.getPrimary().modem_config == 5) {
|
||||||
|
mode = "LngSlow";
|
||||||
|
} else if (channels.getPrimary().modem_config == 6) {
|
||||||
|
mode = "VngSlow";
|
||||||
} else {
|
} else {
|
||||||
mode = "Custom";
|
mode = "Custom";
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,7 +59,7 @@ class PhoneAPI
|
||||||
|
|
||||||
// Call this when the client drops the connection, resets the state to STATE_SEND_NOTHING
|
// Call this when the client drops the connection, resets the state to STATE_SEND_NOTHING
|
||||||
// Unregisters our observer. A closed connection **can** be reopened by calling init again.
|
// Unregisters our observer. A closed connection **can** be reopened by calling init again.
|
||||||
void close();
|
virtual void close();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle a ToRadio protobuf
|
* Handle a ToRadio protobuf
|
||||||
|
|
|
@ -276,7 +276,7 @@ bool perhapsDecode(MeshPacket *p)
|
||||||
if (p->which_payloadVariant == MeshPacket_decoded_tag)
|
if (p->which_payloadVariant == MeshPacket_decoded_tag)
|
||||||
return true; // If packet was already decoded just return
|
return true; // If packet was already decoded just return
|
||||||
|
|
||||||
assert(p->which_payloadVariant == MeshPacket_encrypted_tag);
|
//assert(p->which_payloadVariant == MeshPacket_encrypted_tag);
|
||||||
|
|
||||||
// Try to find a channel that works with this hash
|
// Try to find a channel that works with this hash
|
||||||
for (ChannelIndex chIndex = 0; chIndex < channels.getNumChannels(); chIndex++) {
|
for (ChannelIndex chIndex = 0; chIndex < channels.getNumChannels(); chIndex++) {
|
||||||
|
|
|
@ -36,3 +36,7 @@ cstyleCast
|
||||||
// ignore stuff that is not ours
|
// ignore stuff that is not ours
|
||||||
*:.pio/*
|
*:.pio/*
|
||||||
*:*/libdeps/*
|
*:*/libdeps/*
|
||||||
|
|
||||||
|
// these two caused issues
|
||||||
|
missingOverride
|
||||||
|
virtualCallInConstructor
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
[VERSION]
|
[VERSION]
|
||||||
major = 1
|
major = 1
|
||||||
minor = 3
|
minor = 3
|
||||||
build = 1
|
build = 3
|
||||||
|
|
Ładowanie…
Reference in New Issue