kopia lustrzana https://github.com/meshtastic/firmware
fix esp32 build for dev1.2
rodzic
42ae27973e
commit
f064e56dc9
|
@ -4,16 +4,21 @@ You probably don't care about this section - skip to the next one.
|
||||||
|
|
||||||
1.2 cleanup & multichannel:
|
1.2 cleanup & multichannel:
|
||||||
|
|
||||||
|
* clear priority before sending (to keep wire size small)
|
||||||
|
* generate channel hash from the name of the channel+the psk (not just one or the other)
|
||||||
* DONE remove deprecated
|
* DONE remove deprecated
|
||||||
* allow chaning packets in single transmission
|
|
||||||
* DONE fix setchannel in phoneapi.cpp
|
* DONE fix setchannel in phoneapi.cpp
|
||||||
* DONE set mynodeinfo.max_channels
|
* DONE set mynodeinfo.max_channels
|
||||||
* DONE set mynodeinfo.num_bands (formerly num_channels)
|
* DONE set mynodeinfo.num_bands (formerly num_channels)
|
||||||
* fix sniffing of non Routing packets
|
* fix sniffing of non Routing packets
|
||||||
* move portnum up?
|
* DONE move portnum up?
|
||||||
* scrub protobufs to make sure they are absoloute minimum wiresize (in particular packets, ChannelSets and positions)
|
* scrub protobufs to make sure they are absoloute minimum wiresize (in particular packets, ChannelSets and positions)
|
||||||
* send a hint that can be used to select which channel to try and hash against with each message
|
* send a hint that can be used to select which channel to try and hash against with each message
|
||||||
* change syncword
|
* change syncword
|
||||||
|
* allow chaning packets in single transmission - to increase airtime efficiency and amortize packet overhead
|
||||||
|
* move #define PACKET_FLAGS_HOP_MASK PACKET_FLAGS_WANT_ACK_MASK out of wire header, instead include keyHint. shrink header len to 14 bytes.
|
||||||
|
* move most parts of meshpacket into the Data packet, so that we can chain multiple Data for sending when they all have a common destination and key.
|
||||||
|
when selecting a MeshPacket for transmit, scan the TX queue for any Data packets we can merge together.
|
||||||
* DONE move acks into routing
|
* DONE move acks into routing
|
||||||
* DONE make all subpackets different versions of data
|
* DONE make all subpackets different versions of data
|
||||||
* DONE move routing control into a data packet
|
* DONE move routing control into a data packet
|
||||||
|
|
|
@ -15,6 +15,7 @@ default_envs = tbeam
|
||||||
;default_envs = tlora-v1
|
;default_envs = tlora-v1
|
||||||
;default_envs = tlora-v2
|
;default_envs = tlora-v2
|
||||||
;default_envs = lora-relay-v1 # nrf board
|
;default_envs = lora-relay-v1 # nrf board
|
||||||
|
;default_envs = eink
|
||||||
;default_envs = linux # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here
|
;default_envs = linux # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
|
|
2
proto
2
proto
|
@ -1 +1 @@
|
||||||
Subproject commit 65914b84f1ee8f25807187d60b43ad29dfbaedc3
|
Subproject commit 527b0fdc343f89843158977a1c1a7c14db854565
|
|
@ -145,7 +145,7 @@ bool ExternalNotificationPluginRadio::handleReceived(const MeshPacket &mp)
|
||||||
|
|
||||||
if (radioConfig.preferences.ext_notification_plugin_enabled) {
|
if (radioConfig.preferences.ext_notification_plugin_enabled) {
|
||||||
|
|
||||||
auto &p = mp.decoded.data;
|
auto &p = mp.decoded;
|
||||||
|
|
||||||
if (mp.from != nodeDB.getNodeNum()) {
|
if (mp.from != nodeDB.getNodeNum()) {
|
||||||
|
|
||||||
|
|
|
@ -120,7 +120,7 @@ bool RangeTestPluginRadio::handleReceived(const MeshPacket &mp)
|
||||||
|
|
||||||
if (radioConfig.preferences.range_test_plugin_enabled) {
|
if (radioConfig.preferences.range_test_plugin_enabled) {
|
||||||
|
|
||||||
auto &p = mp.decoded.data;
|
auto &p = mp.decoded;
|
||||||
// DEBUG_MSG("Received text msg self=0x%0x, from=0x%0x, to=0x%0x, id=%d, msg=%.*s\n",
|
// DEBUG_MSG("Received text msg self=0x%0x, from=0x%0x, to=0x%0x, id=%d, msg=%.*s\n",
|
||||||
// nodeDB.getNodeNum(), mp.from, mp.to, mp.id, p.payload.size, p.payload.bytes);
|
// nodeDB.getNodeNum(), mp.from, mp.to, mp.id, p.payload.size, p.payload.bytes);
|
||||||
|
|
||||||
|
|
|
@ -156,7 +156,7 @@ bool SerialPluginRadio::handleReceived(const MeshPacket &mp)
|
||||||
|
|
||||||
if (radioConfig.preferences.serialplugin_enabled) {
|
if (radioConfig.preferences.serialplugin_enabled) {
|
||||||
|
|
||||||
auto &p = mp.decoded.data;
|
auto &p = mp.decoded;
|
||||||
// DEBUG_MSG("Received text msg self=0x%0x, from=0x%0x, to=0x%0x, id=%d, msg=%.*s\n",
|
// DEBUG_MSG("Received text msg self=0x%0x, from=0x%0x, to=0x%0x, id=%d, msg=%.*s\n",
|
||||||
// nodeDB.getNodeNum(), mp.from, mp.to, mp.id, p.payload.size, p.payload.bytes);
|
// nodeDB.getNodeNum(), mp.from, mp.to, mp.id, p.payload.size, p.payload.bytes);
|
||||||
|
|
||||||
|
|
|
@ -118,7 +118,7 @@ bool StoreForwardPluginRadio::handleReceived(const MeshPacket &mp)
|
||||||
|
|
||||||
if (STOREFORWARDPLUGIN_ENABLED) {
|
if (STOREFORWARDPLUGIN_ENABLED) {
|
||||||
|
|
||||||
auto &p = mp.decoded.data;
|
auto &p = mp.decoded;
|
||||||
// DEBUG_MSG("Received text msg self=0x%0x, from=0x%0x, to=0x%0x, id=%d, msg=%.*s\n",
|
// DEBUG_MSG("Received text msg self=0x%0x, from=0x%0x, to=0x%0x, id=%d, msg=%.*s\n",
|
||||||
// nodeDB.getNodeNum(), mp.from, mp.to, mp.id, p.payload.size, p.payload.bytes);
|
// nodeDB.getNodeNum(), mp.from, mp.to, mp.id, p.payload.size, p.payload.bytes);
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue