Trunk
This commit is contained in:
+3
-14
@@ -17,26 +17,15 @@
|
|||||||
"f_flash": "80000000L",
|
"f_flash": "80000000L",
|
||||||
"flash_mode": "qio",
|
"flash_mode": "qio",
|
||||||
"psram_type": "opi",
|
"psram_type": "opi",
|
||||||
"hwids": [
|
"hwids": [["0x303A", "0x1001"]],
|
||||||
[
|
|
||||||
"0x303A",
|
|
||||||
"0x1001"
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"mcu": "esp32s3",
|
"mcu": "esp32s3",
|
||||||
"variant": "t-beam-1w"
|
"variant": "t-beam-1w"
|
||||||
},
|
},
|
||||||
"connectivity": [
|
"connectivity": ["wifi", "bluetooth", "lora"],
|
||||||
"wifi",
|
|
||||||
"bluetooth",
|
|
||||||
"lora"
|
|
||||||
],
|
|
||||||
"debug": {
|
"debug": {
|
||||||
"openocd_target": "esp32s3.cfg"
|
"openocd_target": "esp32s3.cfg"
|
||||||
},
|
},
|
||||||
"frameworks": [
|
"frameworks": ["arduino"],
|
||||||
"arduino"
|
|
||||||
],
|
|
||||||
"name": "LilyGo TBeam-1W",
|
"name": "LilyGo TBeam-1W",
|
||||||
"upload": {
|
"upload": {
|
||||||
"flash_size": "16MB",
|
"flash_size": "16MB",
|
||||||
|
|||||||
@@ -246,8 +246,9 @@ uint32_t RadioInterface::getPacketTime(const meshtastic_MeshPacket *p, bool rece
|
|||||||
/** The delay to use for retransmitting dropped packets */
|
/** The delay to use for retransmitting dropped packets */
|
||||||
uint32_t RadioInterface::getRetransmissionMsec(const meshtastic_MeshPacket *p)
|
uint32_t RadioInterface::getRetransmissionMsec(const meshtastic_MeshPacket *p)
|
||||||
{
|
{
|
||||||
size_t numbytes =p->which_payload_variant == meshtastic_MeshPacket_decoded_tag ?
|
size_t numbytes = p->which_payload_variant == meshtastic_MeshPacket_decoded_tag
|
||||||
pb_encode_to_bytes(bytes, sizeof(bytes), &meshtastic_Data_msg, &p->decoded) : p->encrypted.size+MESHTASTIC_HEADER_LENGTH;
|
? pb_encode_to_bytes(bytes, sizeof(bytes), &meshtastic_Data_msg, &p->decoded)
|
||||||
|
: p->encrypted.size + MESHTASTIC_HEADER_LENGTH;
|
||||||
uint32_t packetAirtime = getPacketTime(numbytes + sizeof(PacketHeader));
|
uint32_t packetAirtime = getPacketTime(numbytes + sizeof(PacketHeader));
|
||||||
// Make sure enough time has elapsed for this packet to be sent and an ACK is received.
|
// Make sure enough time has elapsed for this packet to be sent and an ACK is received.
|
||||||
// LOG_DEBUG("Waiting for flooding message with airtime %d and slotTime is %d", packetAirtime, slotTimeMsec);
|
// LOG_DEBUG("Waiting for flooding message with airtime %d and slotTime is %d", packetAirtime, slotTimeMsec);
|
||||||
|
|||||||
Reference in New Issue
Block a user