Revision 61:08b50780eb91, committed 2017-05-31

Comitter:

Helmut Tschemernjak

Date:

Wed May 31 14:07:40 2017 +0200

Parent:

60:75426c142f6e

Child:

62:835c5e20834e

Commit message:

Made SetRfTxPower public to allow easily power TX changes

Changed in this revision

--- a/LoRa_TODO.txt	Mon May 29 16:58:41 2017 +0200
+++ b/LoRa_TODO.txt	Wed May 31 14:07:40 2017 +0200
@@ -38,6 +38,5 @@
 - Added a RxSignalPending which verifies if we have a signal pending in receive state. (May 2017 Helmut)
 - Added LoRa bandwidth mapping table, now the SetRx/Tx frequency is in Hz. (May 2017 Helmut)
 - Enabled MURATA_SX1276 for the MURATA_SX1276 chip (May 2017 Helmut)
-
+- Made SetRfTxPower public to allow easily power TX changes (May 2017 Helmut)
 
-

--- a/radio/radio.h	Mon May 29 16:58:41 2017 +0200
+++ b/radio/radio.h	Wed May 31 14:07:40 2017 +0200
@@ -478,6 +478,14 @@
      * @param [IN] enable if true, it enables a public network
      */
     virtual void SetPublicNetwork( bool enable ) = 0;
+    
+    /*!
+     * \brief Sets the radio output power.
+     *
+     * @param [IN] power Sets the RF output power
+     */
+    virtual void SetRfTxPower( int8_t power ) = 0;
+
 };
 
 #endif // __RADIO_H__

--- a/sx1276/sx1276-arduino-hal.cpp	Mon May 29 16:58:41 2017 +0200
+++ b/sx1276/sx1276-arduino-hal.cpp	Wed May 31 14:07:40 2017 +0200
@@ -239,7 +239,7 @@
 {
     if( channel > RF_MID_BAND_THRESH )
     {
-        if( boardConnected == SX1276MB1LAS || boardConnected == RFM95_SX1276)
+        if (boardConnected == SX1276MB1LAS || boardConnected == RFM95_SX1276 || boardConnected == MURATA_SX1276)
         {
             return RF_PACONFIG_PASELECT_PABOOST;
         }

--- a/sx1276/sx1276-arduino-hal.h	Mon May 29 16:58:41 2017 +0200
+++ b/sx1276/sx1276-arduino-hal.h	Wed May 31 14:07:40 2017 +0200
@@ -115,14 +115,7 @@
      * \remark Useful when going in MCU lowpower modes
      */
     virtual void IoDeInit( void );
-    
-    /*!
-     * \brief Sets the radio output power.
-     *
-     * @param [IN] power Sets the RF output power
-     */
-    virtual void SetRfTxPower( int8_t power );
-    
+
     /*!
      * @brief Gets the board PA selection configuration
      *
@@ -233,6 +226,14 @@
      * @brief Reset the SX1276
      */
     virtual void Reset( void );
+
+    /*!
+     * \brief Sets the radio output power.
+     *
+     * @param [IN] power Sets the RF output power
+     */
+    virtual void SetRfTxPower( int8_t power );
+
 };
 
 #endif // __SX1276_ARDUINO_HAL_H__

--- a/sx1276/sx1276-mbed-hal.cpp	Mon May 29 16:58:41 2017 +0200
+++ b/sx1276/sx1276-mbed-hal.cpp	Wed May 31 14:07:40 2017 +0200
@@ -242,7 +242,7 @@
 {
     if( channel > RF_MID_BAND_THRESH )
     {
-        if( boardConnected == SX1276MB1LAS || boardConnected == RFM95_SX1276 || boardConnected == MURATA_SX1276)
+        if (boardConnected == SX1276MB1LAS || boardConnected == RFM95_SX1276 || boardConnected == MURATA_SX1276)
         {
             return RF_PACONFIG_PASELECT_PABOOST;
         }

--- a/sx1276/sx1276-mbed-hal.h	Mon May 29 16:58:41 2017 +0200
+++ b/sx1276/sx1276-mbed-hal.h	Wed May 31 14:07:40 2017 +0200
@@ -116,13 +116,6 @@
     virtual void IoDeInit( void );
 
     /*!
-     * \brief Sets the radio output power.
-     *
-     * @param [IN] power Sets the RF output power
-     */
-    virtual void SetRfTxPower( int8_t power );
-
-    /*!
      * @brief Gets the board PA selection configuration
      *
      * @param [IN] channel Channel frequency in Hz
@@ -232,6 +225,14 @@
      * @brief Reset the SX1276
      */
     virtual void Reset( void );
+    
+    /*!
+     * \brief Sets the radio output power.
+     *
+     * @param [IN] power Sets the RF output power
+     */
+    virtual void SetRfTxPower( int8_t power );
+    
 };
 
 #endif // __SX1276_MBED_HAL_H__

--- a/sx1276/sx1276.h	Mon May 29 16:58:41 2017 +0200
+++ b/sx1276/sx1276.h	Wed May 31 14:07:40 2017 +0200
@@ -456,7 +456,13 @@
      */
     virtual void SetPublicNetwork( bool enable );
 
-
+    /*!
+     * @brief Sets the radio output power.
+     *
+     * @param [IN] power Sets the RF output power
+     */
+    virtual void SetRfTxPower( int8_t power ) = 0;
+    
     //-------------------------------------------------------------------------
     //                        Board relative functions
     //-------------------------------------------------------------------------
@@ -505,13 +511,6 @@
     virtual void IoDeInit( void ) = 0;
 
     /*!
-     * @brief Sets the radio output power.
-     *
-     * @param [IN] power Sets the RF output power
-     */
-    virtual void SetRfTxPower( int8_t power ) = 0;
-
-    /*!
      * @brief Gets the board PA selection configuration
      *
      * @param [IN] channel Channel frequency in Hz