esp32: Manual merge of Jenkinsfile and REAMDE.md

Author: Daniel Campora

Jenkinsfile

@@ -67,26 +67,34 @@ 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
+        make clean BOARD=''' + name_short + lora_band
 
         sh '''export PATH=$PATH:/opt/xtensa-esp32-elf/bin;
         export IDF_PATH=${WORKSPACE}/esp-idf;
         cd esp32;
-        make TARGET=boot -j2 BOARD=''' + name_short
+        make TARGET=boot -j2 BOARD=''' + name_short + lora_band
 
         sh '''export PATH=$PATH:/opt/xtensa-esp32-elf/bin;
         export IDF_PATH=${WORKSPACE}/esp-idf;
         cd esp32;
-        make TARGET=app -j2 BOARD=''' + name_short
+        make TARGET=app -j2 BOARD=''' + name_short + lora_band
 
         sh '''cd esp32/build/'''+ name_u +'''/release;
         mkdir -p firmware_package;
@@ -164,4 +172,3 @@ def get_remote_name(short_name) {
 def get_device_name(short_name) {
     return "/dev/serial/by-id/usb-" +  short_name + "-if00"   
 }
-

README.md

@@ -103,15 +103,14 @@ 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,9 +131,6 @@ To flash at full speed, use ESPSPEED variable:
 
 	$ make ESPSPEED=921600 flash
 
-To build and flash your LoPy for the default region (868 MHz):
-	$ make ESPSPEED=921600 flash
-
 To build and flash a LoPy:
 
     $ cd esp32
@@ -144,11 +140,7 @@ To build and flash a LoPy:
     $ make BOARD=LOPY flash
 
 The above also applies to the FiPy and LoPy4
-or for 915MHz regions:
 
 Make sure that your board is placed into programming mode, otherwise flashing will fail.<br>
-
-
-
-Make sure that your board is placed into programming mode, otherwise flahing will fail.
+PyTrack and PySense boards will automatically switch into programming mode (currently supported on MacOS and Linux only!)<br>
 Expansion Board 2.0 users, please connect ``P2`` to ``GND`` and then reset the board.