Update main.cpp

This commit is contained in:
tuxphone 2020-10-02 20:30:02 +02:00 committed by GitHub
parent be42a0c88f
commit ce8a0f488f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions

View File

@ -14,8 +14,8 @@ static ChannelSettings ChanSet;
static RadioEvents_t RadioEvents; static RadioEvents_t RadioEvents;
static TimerEvent_t CheckRadio; static TimerEvent_t CheckRadio;
static uint32_t lastreceivedID = 0; static uint32_t lastreceivedID = 0;
static uint32_t airTime = 500; //ms static uint32_t airTime;
static bool noTimer = true; static bool noTimer;
static uint32_t startTime = 0; static uint32_t startTime = 0;
#ifndef NOBLINK #ifndef NOBLINK
@ -114,8 +114,7 @@ void setup() {
ChanSet.spread_factor = 7; ChanSet.spread_factor = 7;
} }
} }
airTime = floor(symbTime[MESHTASTIC_SPEED] * (36.5 + 20*8 + 16) + 0.5); // simplified AirTime for the smallest MPacket (length 20 bytes) airTime = sleepTime[MESHTASTIC_SPEED];
//real AirTime is much longer, but this will give a good compromise regarding battery savings vs. reaction time
ConfigureRadio( ChanSet ); ConfigureRadio( ChanSet );
#ifndef SILENT #ifndef SILENT
MSG("..done! Switch to Receive Mode.\n"); MSG("..done! Switch to Receive Mode.\n");
@ -285,10 +284,7 @@ void ConfigureRadio( ChannelSettings ChanSet )
MSG("Setting bandwidth to index %i ..\n",ChanSet.bandwidth); MSG("Setting bandwidth to index %i ..\n",ChanSet.bandwidth);
MSG("Setting CodeRate to index %i .. \n", ChanSet.coding_rate); MSG("Setting CodeRate to index %i .. \n", ChanSet.coding_rate);
MSG("Setting SpreadingFactor to %i ..\n",ChanSet.spread_factor); MSG("Setting SpreadingFactor to %i ..\n",ChanSet.spread_factor);
MSG("(est. SymbolTime for setting is "); MSG("LowPowerTime: %ims ..\n", airTime);
Serial.print(symbTime[MESHTASTIC_SPEED]); MSG("ms)\n");
MSG("(LowPowerTime = (36.5 + 8 x 20 + 16) x SymbolTime (Preamble + 20 byte minimal packet length + 16 bit CRC) - very simplified calculation!)\n");
MSG("LowPowerTime: "); Serial.print(airTime); MSG("ms ..\n");
#endif #endif
Radio.SetChannel( freq ); Radio.SetChannel( freq );
Radio.SetTxConfig( MODEM_LORA, ChanSet.tx_power ,0 , ChanSet.bandwidth, ChanSet.spread_factor, ChanSet.coding_rate, Radio.SetTxConfig( MODEM_LORA, ChanSet.tx_power ,0 , ChanSet.bandwidth, ChanSet.spread_factor, ChanSet.coding_rate,