esp32: Merge with master up to version 1.13.0.b1.

Author: Daniel Campora

drivers/sx127x/radio.h

@@ -15,6 +15,10 @@ Maintainer: Miguel Luis and Gregory Cristian
 #ifndef __RADIO_H__
 #define __RADIO_H__
 
+#define RADIO_IRQ_FLAG_RX_TIMEOUT                   ( 0x01 )
+#define RADIO_IRQ_FLAG_RX_DONE                      ( 0x02 )
+#define RADIO_IRQ_FLAG_RX_ERROR                     ( 0x04 )
+
 /*!
  * Radio driver supported modems
  */
@@ -159,12 +163,12 @@ struct Radio_s
      *                          FSK : N/A ( set to 0 ) 
      *                          LoRa: timeout in symbols
      * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
-     * \param [IN] payloadLen   Sets payload length when fixed lenght is used
+     * \param [IN] payloadLen   Sets payload length when fixed length is used
      * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
      * \param [IN] FreqHopOn    Enables disables the intra-packet frequency hopping
      *                          FSK : N/A ( set to 0 )
      *                          LoRa: [0: OFF, 1: ON]
-     * \param [IN] HopPeriod    Number of symbols bewteen each hop
+     * \param [IN] HopPeriod    Number of symbols between each hop
      *                          FSK : N/A ( set to 0 )
      *                          LoRa: Number of symbols
      * \param [IN] iqInverted   Inverts IQ signals (LoRa only)
@@ -207,7 +211,7 @@ struct Radio_s
      * \param [IN] FreqHopOn    Enables disables the intra-packet frequency hopping
      *                          FSK : N/A ( set to 0 )
      *                          LoRa: [0: OFF, 1: ON]
-     * \param [IN] HopPeriod    Number of symbols bewteen each hop
+     * \param [IN] HopPeriod    Number of symbols between each hop
      *                          FSK : N/A ( set to 0 )
      *                          LoRa: Number of symbols
      * \param [IN] iqInverted   Inverts IQ signals (LoRa only)
@@ -228,14 +232,14 @@ struct Radio_s
      */
     bool    ( *CheckRfFrequency )( uint32_t frequency );
     /*!
-     * \brief Computes the packet time on air in us for the given payload
+     * \brief Computes the packet time on air in ms for the given payload
      *
      * \Remark Can only be called once SetRxConfig or SetTxConfig have been called
      *
      * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
      * \param [IN] pktLen     Packet payload length
      *
-     * \retval airTime        Computed airTime (us) for the given packet payload length
+     * \retval airTime        Computed airTime (ms) for the given packet payload length
      */
     uint32_t  ( *TimeOnAir )( RadioModems_t modem, uint8_t pktLen );
     /*!
@@ -264,6 +268,14 @@ struct Radio_s
      * \brief Start a Channel Activity Detection
      */
     void    ( *StartCad )( void );
+    /*!
+     * \brief Sets the radio in continuous wave transmission mode
+     *
+     * \param [IN]: freq       Channel RF frequency
+     * \param [IN]: power      Sets the output power [dBm]
+     * \param [IN]: time       Transmission mode timeout [s]
+     */
+    void    ( *SetTxContinuousWave )( uint32_t freq, int8_t power, uint16_t time );
     /*!
      * \brief Reads the current RSSI value
      *
@@ -306,8 +318,15 @@ struct Radio_s
      * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
      * \param [IN] max        Maximum payload length in bytes
      */
-    void ( *SetMaxPayloadLength )( RadioModems_t modem, uint8_t max );
-
+    void    ( *SetMaxPayloadLength )( RadioModems_t modem, uint8_t max );
+    /*!
+     * \brief Sets the network to public or private. Updates the sync byte.
+     *
+     * \remark Applies to LoRa modem only
+     *
+     * \param [IN] enable if true, it enables a public network
+     */
+    void    ( *SetPublicNetwork )( bool enable );
 };
 
 /*!

drivers/sx127x/sx1272/sx1272.c

@@ -781,6 +781,16 @@ void SX1272SetTx( uint32_t timeout )
     SX1272SetOpMode( RF_OPMODE_TRANSMITTER );
 }
 
+void SX1272SetTxContinuousWave( uint32_t freq, int8_t power, uint16_t time )
+{
+
+}
+
+void SX1272SetPublicNetwork( bool enable )
+{
+
+}
+
 void SX1272StartCad( void )
 {
     switch( SX1272.Settings.Modem )

drivers/sx127x/sx1272/sx1272.h

@@ -33,10 +33,6 @@ Maintainer: Miguel Luis and Gregory Cristian
  */
 #define RADIO_WAKEUP_TIME                           ( RADIO_OSC_STARTUP + RADIO_SLEEP_TO_RX )
 
-#define RADIO_IRQ_FLAG_RX_TIMEOUT                   ( 0x01 )
-#define RADIO_IRQ_FLAG_RX_DONE                      ( 0x02 )
-#define RADIO_IRQ_FLAG_RX_ERROR                     ( 0x04 )
-
 /*!
  * Radio FSK modem parameters
  */
@@ -386,4 +382,8 @@ void SX1272SetMaxPayloadLength( RadioModems_t modem, uint8_t max );
  */
 void SX1272SetOpMode( uint8_t opMode );
 
+void SX1272SetTxContinuousWave( uint32_t freq, int8_t power, uint16_t time );
+
+void SX1272SetPublicNetwork( bool enable );
+
 #endif // __SX1272_H__