esp32: Merge with master up to version 1.16.0.b1

Author: Daniel Campora

.gitignore

@@ -41,4 +41,4 @@ user.props
 .cproject
 .project
 .pydevproject
-.settings/language.settings.xml
+.settings

Jenkinsfile

@@ -67,34 +67,26 @@ stage ('Test'){
 	parallel parallelTests
 }
 
-
 def boardBuild(name) {
     def name_u = name.toUpperCase()
     def name_short = name_u.split('_')[0]
-    def lora_band = ""
-    if (name_u == "LOPY_868" || name_u == "FIPY_868"  || name_u == "LOPY4_868") {
-        lora_band = " LORA_BAND=USE_BAND_868"
-    }
-    else if (name_u == "LOPY_915" || name_u == "FIPY_915" || name_u == "LOPY4_915") {
-        lora_band = " LORA_BAND=USE_BAND_915"
-    }
     def app_bin = name.toLowerCase() + '.bin'
     return {
     		release_dir = "${JENKINS_HOME}/release/${JOB_NAME}/" + PYCOM_VERSION + "/" + GIT_TAG + "/"
         sh '''export PATH=$PATH:/opt/xtensa-esp32-elf/bin;
         export IDF_PATH=${WORKSPACE}/esp-idf;
         cd esp32;
-        make clean BOARD=''' + name_short + lora_band
+        make clean BOARD=''' + name_short
 
         sh '''export PATH=$PATH:/opt/xtensa-esp32-elf/bin;
         export IDF_PATH=${WORKSPACE}/esp-idf;
         cd esp32;
-        make TARGET=boot -j2 BOARD=''' + name_short + lora_band
+        make TARGET=boot -j2 BOARD=''' + name_short
 
         sh '''export PATH=$PATH:/opt/xtensa-esp32-elf/bin;
         export IDF_PATH=${WORKSPACE}/esp-idf;
         cd esp32;
-        make TARGET=app -j2 BOARD=''' + name_short + lora_band
+        make TARGET=app -j2 BOARD=''' + name_short
 
         sh '''cd esp32/build/'''+ name_u +'''/release;
         mkdir -p firmware_package;

README.md

@@ -23,19 +23,17 @@ implemented for the data types and modules.
 See the repository www.github.com/micropython/pyboard for the MicroPython
 board (PyBoard), the officially supported reference electronic circuit board.
 
-Major components in this repository:
+The following components are actively maintained by Pycom:
 - py/ -- the core Python implementation, including compiler, runtime, and
   core library.
-- unix/ -- a version of MicroPython that runs on Unix.
 - exp32/ -- a version of MicroPython that runs on the ESP32 based boards from Pycom.
+- tests/ -- test framework and test scripts.
+
+Additional components:
 - stmhal/ -- a version of MicroPython that runs on the PyBoard and similar
   STM32 boards (using ST's Cube HAL drivers).
 - minimal/ -- a minimal MicroPython port. Start with this if you want
   to port MicroPython to another microcontroller.
-- tests/ -- test framework and test scripts.
-- docs/ -- user documentation in Sphinx reStructuredText format.
-
-Additional components:
 - bare-arm/ -- a bare minimum version of MicroPython for ARM MCUs. Used
   mostly to control code size.
 - teensy/ -- a version of MicroPython that runs on the Teensy 3.1
@@ -45,6 +43,7 @@ Additional components:
 - esp8266/ -- an experimental port for ESP8266 WiFi modules.
 - tools/ -- various tools, including the pyboard.py module.
 - examples/ -- a few example Python scripts.
+- docs/ -- user documentation in Sphinx reStructuredText format.
 
 The subdirectories above may include READMEs with additional info.
 
@@ -104,14 +103,15 @@ By default the firmware is built for the WIPY2:
     $ make TARGET=boot
     $ make TARGET=app
     $ make flash
+    
+You can change the board type by using the BOARD variable:
 
 You can change the board type by using the BOARD variable:
 
     $ cd esp32
     $ make BOARD=GPY clean
     $ make BOARD=GPY TARGET=boot
     $ make BOARD=GPY TARGET=app
-    $ make BOARD=GPY flash
 
 We currently support the following BOARD types:
 
@@ -132,26 +132,23 @@ To flash at full speed, use ESPSPEED variable:
 
 	$ make ESPSPEED=921600 flash
 
-To build and flash a LoPy for the default region (868 MHz):
+To build and flash your LoPy for the default region (868 MHz):
+	$ make ESPSPEED=921600 flash
+
+To build and flash a LoPy:
 
-    $ # LORA_BAND defaults to USE_BAND_868
     $ cd esp32
     $ make BOARD=LOPY clean
     $ make BOARD=LOPY TARGET=boot
     $ make BOARD=LOPY TARGET=app
     $ make BOARD=LOPY flash
 
+The above also applies to the FiPy and LoPy4
+or for 915MHz regions:
 
-For 915MHz regions add the `LORA_BAND=USE_BAND_915` variable:
+Make sure that your board is placed into programming mode, otherwise flashing will fail.<br>
 
-    $ cd esp32
-    $ make BOARD=LOPY LORA_BAND=USE_BAND_915 clean
-    $ make BOARD=LOPY LORA_BAND=USE_BAND_915 TARGET=boot
-    $ make BOARD=LOPY LORA_BAND=USE_BAND_915 TARGET=app
-    $ make BOARD=LOPY LORA_BAND=USE_BAND_915 flash
 
-The above also applies to the FiPy and LoPy4
 
-Make sure that your board is placed into programming mode, otherwise flashing will fail.<br>
-PyTrack and PySense boards will automatically switch into programming mode (currently supported on MacOS and Linux only!)<br>
+Make sure that your board is placed into programming mode, otherwise flahing will fail.
 Expansion Board 2.0 users, please connect ``P2`` to ``GND`` and then reset the board.

drivers/sx127x/radio.h

@@ -33,10 +33,10 @@ typedef enum
  */
 typedef enum
 {
-    RF_IDLE = 0,
-    RF_RX_RUNNING,
-    RF_TX_RUNNING,
-    RF_CAD,
+    RF_IDLE = 0,   //!< The radio is idle
+    RF_RX_RUNNING, //!< The radio is in reception state
+    RF_TX_RUNNING, //!< The radio is in transmission state
+    RF_CAD,        //!< The radio is doing channel activity detection
 }RadioState_t;
 
 /*!
@@ -108,7 +108,7 @@ struct Radio_s
     /*!
      * \brief Configures the radio with the given modem
      *
-     * \param [IN] modem Modem to be used [0: FSK, 1: LoRa] 
+     * \param [IN] modem Modem to be used [0: FSK, 1: LoRa]
      */
     void    ( *SetModem )( RadioModems_t modem );
     /*!
@@ -118,19 +118,20 @@ struct Radio_s
      */
     void    ( *SetChannel )( uint32_t freq );
     /*!
-     * \brief Sets the channels configuration
+     * \brief Checks if the channel is free for the given time
      *
      * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
      * \param [IN] freq       Channel RF frequency
      * \param [IN] rssiThresh RSSI threshold
+     * \param [IN] maxCarrierSenseTime Max time while the RSSI is measured
      *
      * \retval isFree         [true: Channel is free, false: Channel is not free]
      */
-    bool    ( *IsChannelFree )( RadioModems_t modem, uint32_t freq, int16_t rssiThresh );
+    bool    ( *IsChannelFree )( RadioModems_t modem, uint32_t freq, int16_t rssiThresh, uint32_t maxCarrierSenseTime );
     /*!
      * \brief Generates a 32 bits random value based on the RSSI readings
      *
-     * \remark This function sets the radio in LoRa modem mode and disables 
+     * \remark This function sets the radio in LoRa modem mode and disables
      *         all interrupts.
      *         After calling this function either Radio.SetRxConfig or
      *         Radio.SetTxConfig functions must be called.
@@ -145,30 +146,30 @@ struct Radio_s
      * \param [IN] bandwidth    Sets the bandwidth
      *                          FSK : >= 2600 and <= 250000 Hz
      *                          LoRa: [0: 125 kHz, 1: 250 kHz,
-     *                                 2: 500 kHz, 3: Reserved] 
+     *                                 2: 500 kHz, 3: Reserved]
      * \param [IN] datarate     Sets the Datarate
      *                          FSK : 600..300000 bits/s
      *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
      *                                10: 1024, 11: 2048, 12: 4096  chips]
      * \param [IN] coderate     Sets the coding rate (LoRa only)
      *                          FSK : N/A ( set to 0 )
-     *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8] 
-     * \param [IN] bandwidthAfc Sets the AFC Bandwidth (FSK only) 
+     *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
+     * \param [IN] bandwidthAfc Sets the AFC Bandwidth (FSK only)
      *                          FSK : >= 2600 and <= 250000 Hz
-     *                          LoRa: N/A ( set to 0 ) 
+     *                          LoRa: N/A ( set to 0 )
      * \param [IN] preambleLen  Sets the Preamble length
-     *                          FSK : Number of bytes 
+     *                          FSK : Number of bytes
      *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
-     * \param [IN] symbTimeout  Sets the RxSingle timeout value (LoRa only) 
-     *                          FSK : N/A ( set to 0 ) 
+     * \param [IN] symbTimeout  Sets the RxSingle timeout value
+     *                          FSK : timeout in number of bytes
      *                          LoRa: timeout in symbols
      * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
      * \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
+     * \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 between 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)
@@ -182,48 +183,48 @@ struct Radio_s
                               uint32_t bandwidthAfc, uint16_t preambleLen,
                               uint16_t symbTimeout, bool fixLen,
                               uint8_t payloadLen,
-                              bool crcOn, bool FreqHopOn, uint8_t HopPeriod,
+                              bool crcOn, bool freqHopOn, uint8_t hopPeriod,
                               bool iqInverted, bool rxContinuous );
     /*!
      * \brief Sets the transmission parameters
      *
-     * \param [IN] modem        Radio modem to be used [0: FSK, 1: LoRa] 
+     * \param [IN] modem        Radio modem to be used [0: FSK, 1: LoRa]
      * \param [IN] power        Sets the output power [dBm]
      * \param [IN] fdev         Sets the frequency deviation (FSK only)
      *                          FSK : [Hz]
      *                          LoRa: 0
      * \param [IN] bandwidth    Sets the bandwidth (LoRa only)
      *                          FSK : 0
      *                          LoRa: [0: 125 kHz, 1: 250 kHz,
-     *                                 2: 500 kHz, 3: Reserved] 
+     *                                 2: 500 kHz, 3: Reserved]
      * \param [IN] datarate     Sets the Datarate
      *                          FSK : 600..300000 bits/s
      *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
      *                                10: 1024, 11: 2048, 12: 4096  chips]
      * \param [IN] coderate     Sets the coding rate (LoRa only)
      *                          FSK : N/A ( set to 0 )
-     *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8] 
+     *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
      * \param [IN] preambleLen  Sets the preamble length
-     *                          FSK : Number of bytes 
+     *                          FSK : Number of bytes
      *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
      * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
      * \param [IN] crcOn        Enables disables the CRC [0: OFF, 1: ON]
-     * \param [IN] FreqHopOn    Enables disables the intra-packet frequency hopping
+     * \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 between 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)
      *                          FSK : N/A ( set to 0 )
      *                          LoRa: [0: not inverted, 1: inverted]
      * \param [IN] timeout      Transmission timeout [ms]
      */
-    void    ( *SetTxConfig )( RadioModems_t modem, int8_t power, uint32_t fdev, 
+    void    ( *SetTxConfig )( RadioModems_t modem, int8_t power, uint32_t fdev,
                               uint32_t bandwidth, uint32_t datarate,
                               uint8_t coderate, uint16_t preambleLen,
-                              bool fixLen, bool crcOn, bool FreqHopOn,
-                              uint8_t HopPeriod, bool iqInverted, uint32_t timeout );
+                              bool fixLen, bool crcOn, bool freqHopOn,
+                              uint8_t hopPeriod, bool iqInverted, uint32_t timeout );
     /*!
      * \brief Checks if the given RF frequency is supported by the hardware
      *