update example sender

Author: Heltec-Aaron-Lee

examples/LoRa/OLED_LoRa_Sender/OLED_LoRa_Sender.ino

@@ -20,7 +20,7 @@
 #include "heltec.h"
 #include "images.h"
 
-#define BAND    433E6  //you can set band here directly,e.g. 868E6,915E6
+#define BAND    868E6  //you can set band here directly,e.g. 868E6,915E6
 
 unsigned int counter = 0;
 String rssi = "RSSI --";
@@ -63,6 +63,9 @@ void loop()
 
   // send packet
   LoRa.beginPacket();
+
+  //LoRa.setTxPower(txPower,RFOUT_pin);RFOUT_pin could be RF_PACONFIG_PASELECT_PABOOST or RF_PACONFIG_PASELECT_RFO, this board only support RF_PACONFIG_PASELECT_PABOOST
+  LoRa.setTxPower(14,RF_PACONFIG_PASELECT_PABOOST);
   LoRa.print("hello ");
   LoRa.print(counter);
   LoRa.endPacket();
@@ -72,4 +75,4 @@ void loop()
   delay(1000);                       // wait for a second
   digitalWrite(LED, LOW);    // turn the LED off by making the voltage LOW
   delay(1000);                       // wait for a second
-}
+}

examples/LoRa/OLED_LoRa_Sender/images.h

@@ -95,3 +95,7 @@ const char inactiveSymbol[] PROGMEM = {
     B00000000,
     B00000000
 };
+
+//Added by Sloeber 
+#pragma once
+

src/lora/LoRa.cpp

@@ -47,6 +47,7 @@
 #define IRQ_PAYLOAD_CRC_ERROR_MASK 0x20
 #define IRQ_RX_DONE_MASK           0x40
 
+
 #define MAX_PKT_LENGTH           255
 
 LoRaClass::LoRaClass() :
@@ -277,37 +278,66 @@ void LoRaClass::sleep()
   writeRegister(REG_OP_MODE, MODE_LONG_RANGE_MODE | MODE_SLEEP);
 }
 
-void LoRaClass::setTxPower(int level, int outputPin)
-{
-  if (PA_OUTPUT_RFO_PIN == outputPin)
-  {
-    // RFO
-    if (level < -1)      {
-		level = -1;
-	}
-    else if (level > 14){
-		level = 14;
-	}
-	writeRegister(REG_PaDac,0x84);
-  	writeRegister(REG_PA_CONFIG, RFO | (level + 1));
-	//spiWrite(RH_RF95_REG_09_PA_CONFIG, RH_RF95_MAX_POWER | (power + 1));
-//  	writeRegister(REG_PA_CONFIG, RFO | level);
-  }
-
-  else {
-    // PA BOOST
-    if (level < 2)
-    {
-		level = 2; 
-	}
-    else if (level > 17)
-    {
-    	level = 17;
-	}
-	//writeRegister(REG_LR_OCP,0x3f);
-	writeRegister(REG_PaDac,0x87);
-	writeRegister(REG_PA_CONFIG, PA_BOOST | (level - 2));//writeRegister(REG_PA_CONFIG, PA_BOOST | (level - 2))
-  }
+void LoRaClass::setTxPower(int8_t power, int8_t outputPin)
+{
+	  uint8_t paConfig = 0;
+	  uint8_t paDac = 0;
+
+	  paConfig = readRegister( REG_PA_CONFIG );
+	  paDac = readRegister( REG_PaDac );
+
+	  paConfig = ( paConfig & RF_PACONFIG_PASELECT_MASK ) | outputPin;
+	  paConfig = ( paConfig & RF_PACONFIG_MAX_POWER_MASK ) | 0x70;
+
+	  if( ( paConfig & RF_PACONFIG_PASELECT_PABOOST ) == RF_PACONFIG_PASELECT_PABOOST )
+	  {
+	    if( power > 17 )
+	    {
+	      paDac = ( paDac & RF_PADAC_20DBM_MASK ) | RF_PADAC_20DBM_ON;
+	    }
+	    else
+	    {
+	      paDac = ( paDac & RF_PADAC_20DBM_MASK ) | RF_PADAC_20DBM_OFF;
+	    }
+	    if( ( paDac & RF_PADAC_20DBM_ON ) == RF_PADAC_20DBM_ON )
+	    {
+	      if( power < 5 )
+	      {
+	        power = 5;
+	      }
+	      if( power > 20 )
+	      {
+	        power = 20;
+	      }
+	      paConfig = ( paConfig & RF_PACONFIG_OUTPUTPOWER_MASK ) | ( uint8_t )( ( uint16_t )( power - 5 ) & 0x0F );
+	    }
+	    else
+	    {
+	      if( power < 2 )
+	      {
+	        power = 2;
+	      }
+	      if( power > 17 )
+	      {
+	        power = 17;
+	      }
+	      paConfig = ( paConfig & RF_PACONFIG_OUTPUTPOWER_MASK ) | ( uint8_t )( ( uint16_t )( power - 2 ) & 0x0F );
+	    }
+	  }
+	  else
+	  {
+	    if( power < -1 )
+	    {
+	      power = -1;
+	    }
+	    if( power > 14 )
+	    {
+	      power = 14;
+	    }
+	    paConfig = ( paConfig & RF_PACONFIG_OUTPUTPOWER_MASK ) | ( uint8_t )( ( uint16_t )( power + 1 ) & 0x0F );
+	  }
+	  writeRegister( REG_PA_CONFIG, paConfig );
+	  writeRegister( REG_PaDac, paDac );
 }
 
 void LoRaClass::setTxPowerMax(int level)

src/lora/LoRa.h

@@ -11,6 +11,26 @@
 #define PA_OUTPUT_PA_BOOST_PIN  1
 #define PA_OUTPUT_RFO_PIN       0
 
+/*!
+ * RegPaConfig
+ */
+#define RF_PACONFIG_PASELECT_MASK                   0x7F
+#define RF_PACONFIG_PASELECT_PABOOST                0x80
+#define RF_PACONFIG_PASELECT_RFO                    0x00 // Default
+
+#define RF_PACONFIG_MAX_POWER_MASK                  0x8F
+
+#define RF_PACONFIG_OUTPUTPOWER_MASK                0xF0
+
+/*!
+ * RegPaDac
+ */
+#define RF_PADAC_20DBM_MASK                         0xF8
+#define RF_PADAC_20DBM_ON                           0x07
+#define RF_PADAC_20DBM_OFF                          0x04  // Default
+
+
+
 #if defined (__STM32F1__)
 inline unsigned char  digitalPinToInterrupt(unsigned char Interrupt_pin) { return Interrupt_pin; } //This isn't included in the stm32duino libs (yet)
 #define portOutputRegister(port) (volatile byte *)( &(port->regs->ODR) ) //These are defined in STM32F1/variants/generic_stm32f103c/variant.h but return a non byte* value
@@ -47,7 +67,7 @@ class LoRaClass : public Stream {
   void idle();
   void sleep();
 
-  void setTxPower(int level, int outputPin);
+  void setTxPower(int8_t power, int8_t outputPin);
   void setTxPowerMax(int level);
   void setFrequency(long frequency);
   void setSpreadingFactor(int sf);