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

Author: Daniel Campora

.gitignore

@@ -38,3 +38,7 @@ __pycache__/
 ######################
 GNUmakefile
 user.props
+.cproject
+.project
+.pydevproject
+.settings/language.settings.xml

Jenkinsfile

@@ -1,134 +1,147 @@
 def buildVersion
-def boards_to_build_1 = ["LOPY_868", "WIPY"]
-def boards_to_build_2 = ["LOPY_915", "SIPY"]
-def boards_to_test = ["LOPY_868", "WIPY"]
+def boards_to_build_1 = ["LoPy_868", "WiPy"]
+def boards_to_build_2 = ["LopY_915", "SiPy"]
+def boards_to_build_3 = ["FiPy_868", "GPy"]
+def boards_to_build_4 = ["FiPy_915"]
+def boards_to_test = ["GPy"]
+def remote_node = "UDOO"
 
 node {
-    stage('Checkout') { // get source
+    // get pycom-esp-idf source
+    stage('Checkout') {
         checkout scm
         sh 'rm -rf esp-idf'
         sh 'git clone --depth=1 --recursive -b master https://github.com/pycom/pycom-esp-idf.git esp-idf'
     }
 
-    // build the primary boards that we test
-    stage('Build1') {
+    stage('mpy-cross') {
         // build the cross compiler first
         sh '''cd mpy-cross;
+        make clean;
         make all'''
+    }
+
+    // build the boards in four cycles
+    // Todo: run in a loop if possible
 
+    stage('Build1') {
         def parallelSteps = [:]
         for (x in boards_to_build_1) {
-            def name = x
-            def name_short = "LOPY"
-            def lora_band = ""
-            if (name == "LOPY_868") {
-                lora_band = " LORA_BAND=USE_BAND_868"
-            } else if (name == "LOPY_915") {
-                lora_band = " LORA_BAND=USE_BAND_915"
-            } else {
-                name_short = name
-            }
-            parallelSteps[name] = boardBuild(name, name_short, lora_band)
+          def name = x
+          parallelSteps[name] = boardBuild(name)
         }
         parallel parallelSteps
-
-        stash includes: '**/*.bin', name: 'binary'
-        stash includes: 'tests/**', name: 'tests'
-        stash includes: 'esp-idf/components/esptool_py/**', name: 'esp-idfTools'
-        stash includes: 'tools/**', name: 'tools'
-        stash includes: 'esp32/tools/**', name: 'esp32Tools'
     }
 
-    // build the secondary boards just used for the release
     stage('Build2') {
-
         def parallelSteps = [:]
         for (x in boards_to_build_2) {
-            def name = x
-            def name_short = "LOPY"
-            def lora_band = ""
-            if (name == "LOPY_868") {
-                lora_band = " LORA_BAND=USE_BAND_868"
-            } else if (name == "LOPY_915") {
-                lora_band = " LORA_BAND=USE_BAND_915"
-            } else {
-                name_short = name
-            }
-            parallelSteps[name] = boardBuild(name, name_short, lora_band)
+          def name = x
+          parallelSteps[name] = boardBuild(name)
         }
         parallel parallelSteps
+    }
 
-        stash includes: '**/*.bin', name: 'binary'
-        stash includes: 'tests/**', name: 'tests'
-        stash includes: 'esp-idf/components/esptool_py/**', name: 'esp-idfTools'
-        stash includes: 'tools/**', name: 'tools'
-        stash includes: 'esp32/tools/**', name: 'esp32Tools'
+    stage('Build3') {
+        def parallelSteps = [:]
+        for (x in boards_to_build_3) {
+          def name = x
+          parallelSteps[name] = boardBuild(name)
+        }
+        parallel parallelSteps
     }
+
+    stage('Build4') {
+        def parallelSteps = [:]
+        for (x in boards_to_build_4) {
+          def name = x
+          parallelSteps[name] = boardBuild(name)
+        }
+        parallel parallelSteps
+    }
+
+    stash includes: '**/*.bin', name: 'binary'
+    stash includes: 'tests/**', name: 'tests'
+    stash includes: 'esp-idf/components/esptool_py/**', name: 'esp-idfTools'
+    stash includes: 'tools/**', name: 'tools'
+    stash includes: 'esp32/tools/**', name: 'esp32Tools'
 }
 
-stage ('Flash') {
-    def parallelFlash = [:]
-    for (x in boards_to_test) {
-        def name = x
+    stage ('Flash') {
+      def parallelFlash = [:]
+      for (x in boards_to_test) {
+        def name = x.toUpperCase()
         parallelFlash[name] = flashBuild(name)
-    }
+      }
     parallel parallelFlash
-}
+    }
 
-stage ('Test'){
-    def parallelTests = [:]
-    for (x in boards_to_test) {
+    stage ('Test'){
+      def parallelTests = [:]
+      for (x in boards_to_test) {
         def name = x
-        def board_name = name
-        if (name == "LOPY_868" || name == "LOPY_915") {
+        def board_name = name.toUpperCase()
+        if (board_name == "LOPY_868" || board_name == "LOPY_915") {
             board_name = "LOPY"
         }
+        if (board_name == "FIPY_868" || board_name == "FIPY_915") {
+            board_name = "FIPY"
+        }
         parallelTests[board_name] = testBuild(board_name)
-    }
+      }
     parallel parallelTests
-}
+    }
 
-def testBuild(name) {
-    return {
-        node(name) {
-            sleep(5) //Delay to skip all bootlog
-            dir('tests') {
-                timeout(30) {
-                    sh '''./run-tests --target=esp32-''' + name +''' --device /dev/ttyUSB0'''
-                }
+    def testBuild(name) {
+      return {
+        node("UDOO") {
+          sleep(5) //Delay to skip all bootlog
+          dir('tests') {
+            timeout(30) {
+              sh '''./run-tests --target=esp32-''' + name + ''' --device /dev/ttyACM1'''
             }
-            sh 'python esp32/tools/resetBoard.py reset'
-            sh 'python esp32/tools/resetBoard.py releasePins'
+          }
+          sh 'python esp32/tools/pypic.py --port /dev/ttyACM1 --enter'
+          sh 'python esp32/tools/pypic.py --port /dev/ttyACM1 --exit'
         }
+      }
     }
-}
 
 def flashBuild(name) {
-    def node_name = name
-    if (name != "WIPY") {
-        node_name = "LOPY"
-    }
-    return {
-        node(node_name) {
-            sh 'rm -rf *'
-            unstash 'binary'
-            unstash 'esp-idfTools'
-            unstash 'esp32Tools'
-            unstash 'tests'
-            unstash 'tools'
-            sh 'python esp32/tools/resetBoard.py bootloader'
-            sh 'esp-idf/components/esptool_py/esptool/esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 921600 erase_flash'
-            sh 'python esp32/tools/resetBoard.py bootloader'
-            sh 'esp-idf/components/esptool_py/esptool/esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 esp32/build/'+ name +'/release/bootloader/bootloader.bin 0x8000 esp32/build/'+ name +'/release/lib/partitions.bin 0x10000 esp32/build/'+ name +'/release/appimg.bin'
-            sh 'python esp32/tools/resetBoard.py reset'
-            sh 'python esp32/tools/resetBoard.py releasePins'
-        }
+  return {
+    node("UDOO") {
+      sh 'rm -rf *'
+      unstash 'binary'
+      unstash 'esp-idfTools'
+      unstash 'esp32Tools'
+      unstash 'tests'
+      unstash 'tools'
+      sh 'python esp32/tools/pypic.py --port /dev/ttyACM1 --enter'
+      sh 'esp-idf/components/esptool_py/esptool/esptool.py --chip esp32 --port /dev/ttyACM1 --baud 921600 erase_flash'
+      sh 'python esp32/tools/pypic.py --port /dev/ttyACM1 --enter'
+      sh 'esp-idf/components/esptool_py/esptool/esptool.py --chip esp32 --port /dev/ttyACM1 --baud 921600 --before no_reset --after no_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect 0x1000 esp32/build/'+ name +'/release/bootloader/bootloader.bin 0x8000 esp32/build/'+ name +'/release/lib/partitions.bin 0x10000 esp32/build/'+ name +'/release/appimg.bin'
+      sh 'python esp32/tools/pypic.py --port /dev/ttyACM1 --exit'
     }
+  }
 }
 
-def boardBuild(name, name_short, lora_band) {
+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") {
+        lora_band = " LORA_BAND=USE_BAND_868"
+    }
+    else if (name_u == "LOPY_915" || name_u == "FIPY_915") {
+        lora_band = " LORA_BAND=USE_BAND_915"
+    }
     def app_bin = name.toLowerCase() + '.bin'
     return {
+        sh '''export PATH=$PATH:/opt/xtensa-esp32-elf/bin;
+        export IDF_PATH=${WORKSPACE}/esp-idf;
+        cd esp32;
+        make clean BOARD=''' + name_short + lora_band
+
         sh '''export PATH=$PATH:/opt/xtensa-esp32-elf/bin;
         export IDF_PATH=${WORKSPACE}/esp-idf;
         cd esp32;
@@ -139,15 +152,16 @@ def boardBuild(name, name_short, lora_band) {
         cd esp32;
         make TARGET=app -j2 BOARD=''' + name_short + lora_band
 
-        sh '''cd esp32/build/'''+ name +'''/release;
-        rm -rf firmware_package;
-	mkdir -p firmware_package;
+        sh '''cd esp32/build/'''+ name_u +'''/release;
+	      mkdir -p firmware_package;
         cd firmware_package;
         cp ../bootloader/bootloader.bin .;
+        mv ../application.elf /var/lib/jenkins/release/''' + name + '''-$(cat ../../../../pycom_version.h |grep SW_VERSION_NUMBER|cut -d\\" -f2)-application.elf;
+        cp ../appimg.bin .;
         cp ../lib/partitions.bin .;
-        cp ../../../../boards/''' + name_short + '''/''' + name + '''/script .;
+        cp ../../../../boards/''' + name_short + '''/''' + name_u + '''/script .;
         cp ../''' + app_bin + ''' .;
-        tar -cvzf ''' + name + '''.tar.gz   bootloader.bin   partitions.bin   script ''' + app_bin
+        tar -cvzf /var/lib/jenkins/release/''' + name + '''-$(cat ../../../../pycom_version.h |grep SW_VERSION_NUMBER|cut -d\\" -f2).tar.gz  appimg.bin  bootloader.bin   partitions.bin   script ''' + app_bin
     }
 }
 

README.md

@@ -92,33 +92,45 @@ After cloning, make sure to checkout all the submodules:
 Finally, before building, export the IDF_PATH variable
 
     $ export IDF_PATH=~/pycom-esp-idf
-	
+
 Prior to building the main firmware, you need to build mpy-cross
 
-	$ cd mpy-cross && make clean && make
+	$ cd mpy-cross && make clean && make && cd ..
 
-To build and flash your LoPy for 868MHz regions:
+By default the firmware is built for the WIPY2:
 
     $ cd esp32
-    $ make BOARD=LOPY TARGET=boot clean
-    $ make BOARD=LOPY TARGET=boot
-    $ make BOARD=LOPY LORA_BAND=USE_BAND_868 TARGET=app
-    $ make BOARD=LOPY LORA_BAND=USE_BAND_868 flash
+    $ make clean
+    $ make TARGET=boot
+    $ make TARGET=app
+    $ make flash
 
-or for 915MHz regions:
+To specify a serial port other than /dev/ttyUSB0, use ESPPORT variable:
 
+    $ # On MacOS
+    $ make ESPPORT=/dev/tty.usbserial-DQ008HQY flash
+    $ # On Windows
+    $ make ESPPORT=COM3 flash
+    $ # On linux
+    $ # make ESPPORT=/dev/ttyUSB1 flash
+
+To build and flash your LoPy for the default region (868 MHz):
+
+    $ # LORA_BAND defaults to USE_BAND_868
     $ cd esp32
-    $ make BOARD=LOPY TARGET=boot clean
+    $ make BOARD=LOPY clean
     $ make BOARD=LOPY TARGET=boot
-    $ make BOARD=LOPY LORA_BAND=USE_BAND_915 TARGET=app
-    $ make BOARD=LOPY LORA_BAND=USE_BAND_915 flash
+    $ make BOARD=LOPY TARGET=app
+    $ make BOARD=LOPY flash
 
-or the WiPy 2.0:
+
+or for 915MHz regions:
 
     $ cd esp32
-    $ make BOARD=WIPY TARGET=boot
-    $ make BOARD=WIPY TARGET=app
-    $ make BOARD=WIPY flash
+    $ 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
 
 or the SiPy:
 
@@ -129,7 +141,3 @@ or the SiPy:
 
 Make sure that your board is placed into programming mode, otherwise flahing will fail.
 To do this, connect ``P2`` to ``GND`` and then reset the board.
-
-To specify a serial port other than /dev/ttyUSB0, use ESPPORT variable:
-
-    $ make BOARD=WIPY ESPPORT=/dev/tty.usbserial-DQ008HQY flash

drivers/sx127x/sx1272/sx1272.c

@@ -81,13 +81,6 @@ void SX1272WriteFifo( uint8_t *buffer, uint8_t size );
  */
 void SX1272ReadFifo( uint8_t *buffer, uint8_t size );
 
-/*!
- * \brief Sets the SX1272 operating mode
- *
- * \param [IN] opMode New operating mode
- */
-void SX1272SetOpMode( uint8_t opMode );
-
 /*
  * SX1272 DIO IRQ callback functions prototype
  */

drivers/sx127x/sx1272/sx1272.h

@@ -379,4 +379,11 @@ void SX1272ReadBuffer( uint8_t addr, uint8_t *buffer, uint8_t size );
  */
 void SX1272SetMaxPayloadLength( RadioModems_t modem, uint8_t max );
 
+/*!
+ * \brief Sets the SX1272 operating mode
+ *
+ * \param [IN] opMode New operating mode
+ */
+void SX1272SetOpMode( uint8_t opMode );
+
 #endif // __SX1272_H__