Merge pull request #538 from LeeLeahy2/training-tx-power

Update the training TX power if necessary

Author: nseidle

Firmware/LoRaSerial/Commands.ino

@@ -1244,8 +1244,8 @@ const COMMAND_ENTRY commands[] =
   {'S',   0,   0,    0,   1,    0, TYPE_BOOL,         valInt,         "FlowControl",          &tempSettings.flowControl},
   {'S',   0,   0,    0,   1,    0, TYPE_BOOL,         valInt,         "InvertCts",            &tempSettings.invertCts},
   {'S',   0,   0,    0,   1,    0, TYPE_BOOL,         valInt,         "InvertRts",            &tempSettings.invertRts},
-  {'S',   0,   0,    0, SERIAL_RX_BUFFER_SIZE, 0, TYPE_U16, valInt,   "RTSOffBytes",            &tempSettings.rtsOffBytes},
-  {'S',   0,   0,    0, SERIAL_RX_BUFFER_SIZE, 0, TYPE_U16, valInt,   "RTSOnBytes",            &tempSettings.rtsOnBytes},
+  {'S',   0,   0,    0, SERIAL_RX_BUFFER_SIZE, 0, TYPE_U16, valInt,   "RTSOffBytes",          &tempSettings.rtsOffBytes},
+  {'S',   0,   0,    0, SERIAL_RX_BUFFER_SIZE, 0, TYPE_U16, valInt,   "RTSOnBytes",           &tempSettings.rtsOnBytes},
   {'S',   0,   0,   10, 2000,   0, TYPE_U16,          valInt,         "SerialDelay",          &tempSettings.serialTimeoutBeforeSendingFrame_ms},
   {'S',   0,   0,    0,   0,    0, TYPE_SPEED_SERIAL, valSpeedSerial, "SerialSpeed",          &tempSettings.serialSpeed},
   {'S',   0,   0,    0,   1,    0, TYPE_BOOL,         valInt,         "UsbSerialWait",        &tempSettings.usbSerialWait},
@@ -1254,6 +1254,7 @@ const COMMAND_ENTRY commands[] =
     Ltr, All, reset, min, max, digits,    type,         validation,     name,                   setting addr */
   {'R',   0,   1,    1, 255,    0, TYPE_U8,           valInt, "ClientFindPartnerRetryInterval", &tempSettings.clientFindPartnerRetryInterval},
   {'R',   0,   0,    0,   0,    0, TYPE_KEY,          valKey,         "TrainingKey",          &tempSettings.trainingKey},
+  {'R',   0,   1,   14,  30,    0, TYPE_U8,           valInt,         "TrainingTxPower",      &tempSettings.trainingTxPower_dbm},
   {'R',   0,   0,    1, 255,    0, TYPE_U8,           valInt,         "TrainingTimeout",      &tempSettings.trainingTimeout},
 
   /*Trigger parameters
@@ -1266,7 +1267,7 @@ const COMMAND_ENTRY commands[] =
 
   /*Virtual circuit parameters
     Ltr, All, reset, min, max, digits,    type,         validation,     name,                   setting addr */
-  {'V',   0,   0,    0, MAX_VC - 1, 0, TYPE_U8,         valInt,         "CmdVC",                &cmdVc},
+  {'V',   0,   0,    0, MAX_VC - 1, 0, TYPE_U8,         valInt,         "CmdVC",              &cmdVc},
 };
 
 const int commandCount = sizeof(commands) / sizeof(commands[0]);

Firmware/LoRaSerial/Radio.ino

@@ -1183,16 +1183,17 @@ bool xmitDatagramTrainingFindPartner()
   //Add the source (server) ID
   memcpy(endOfTxData, myUniqueId, UNIQUE_ID_BYTES);
   endOfTxData += UNIQUE_ID_BYTES;
+  *endOfTxData++ = settings.radioBroadcastPower_dbm;
 
   /*
-                                                endOfTxData ---.
-                                                               |
-                                                               V
-      +----------+---------+----------+------------+-----------+----------+
-      | Optional |         | Optional | Optional   |           | Optional |
-      | NET ID   | Control | C-Timer  | SF6 Length | Client ID | Trailer  |
-      | 8 bits   | 8 bits  | 2 bytes  | 8 bits     | 16 Bytes  | n Bytes  |
-      +----------+---------+----------+------------+-----------+----------+
+                                                           endOfTxData ---.
+                                                                          |
+                                                                          V
+      +----------+---------+----------+------------+-----------+----------+----------+
+      | Optional |         | Optional | Optional   |           |          | Optional |
+      | NET ID   | Control | C-Timer  | SF6 Length | Client ID | Tx Power | Trailer  |
+      | 8 bits   | 8 bits  | 2 bytes  | 8 bits     | 16 Bytes  |  1 Byte  | n Bytes  |
+      +----------+---------+----------+------------+-----------+----------+----------+
   */
 
   txControl.datagramType = DATAGRAM_TRAINING_FIND_PARTNER;

Firmware/LoRaSerial/States.ino

@@ -1726,6 +1726,19 @@ void updateRadioState()
             //Save the client ID
             memcpy(trainingPartnerID, rxData, UNIQUE_ID_BYTES);
 
+            //Increase the TX power if necessary
+            if (settings.radioBroadcastPower_dbm < rxData[UNIQUE_ID_BYTES])
+            {
+              settings.radioBroadcastPower_dbm = rxData[UNIQUE_ID_BYTES];
+              systemPrint("Increasing TX power to ");
+              systemPrint(settings.radioBroadcastPower_dbm);
+              systemPrint(" dB, requested by radio ");
+              systemPrintUniqueID(rxData);
+              systemPrintln();
+              int radioPowerSetting = covertdBmToSetting(settings.radioBroadcastPower_dbm);
+              radio.setOutputPower(radioPowerSetting);
+            }
+
             //Find a slot in the NVM unique ID table
             for (index = 0; index < MAX_VC; index++)
               if (!nvmIsVcUniqueIdSet(index))

Firmware/LoRaSerial/Train.ino

@@ -1,7 +1,7 @@
 //Select the training protocol
 void selectTraining()
 {
-  if (settings.server)
+  if (tempSettings.server)
     beginTrainingServer();
   else
     beginTrainingClient();
@@ -110,7 +110,7 @@ void commonTrainingInitialization()
   settings.maxResends = 1;                  //Don't waste time retransmitting
   settings.netID = 'T';                     //NetID for training
   settings.operatingMode = MODE_MULTIPOINT; //Use datagrams
-  settings.radioBroadcastPower_dbm = 14;    //Minimum, assume radios are near each other
+  settings.radioBroadcastPower_dbm = trainingSettings.trainingTxPower_dbm;    //Minimum, assume radios are near each other
   settings.selectLedUse = LEDS_CYLON;       //Display the CYLON pattern on the LEDs
   settings.verifyRxNetID = true;            //Disable netID checking
 

Firmware/LoRaSerial/settings.h

@@ -465,6 +465,7 @@ typedef struct struct_settings {
   uint8_t trainingKey[AES_KEY_BYTES] = { 0x53, 0x70, 0x61, 0x72, 0x6b, 0x46, 0x75, 0x6E, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67 };
 
   uint8_t trainingTimeout = 1; //Timeout in minutes to complete the training
+  uint8_t trainingTxPower_dbm = 14; //Transmit power in dBm. Max is 30dBm
 
   //----------------------------------------
   //Trigger parameters