pycom · Xykon · Dec 17, 2018 · Dec 13, 2018 · Dec 13, 2018 · Dec 13, 2018
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@
 # Build directory
 ######################
 build/
+build-*/
 
 # Test failure outputs
 ######################
@@ -50,3 +51,6 @@ secure-bootloader-key.bin
 flash_encryption_key.bin
 
 .DS_Store
+org.eclipse.cdt.ui.prefs
+org.eclipse.cdt.core.prefs
+language.settings.xml
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,15 +1,13 @@
 def buildVersion
 def boards_to_build = ["WiPy", "LoPy", "SiPy", "GPy", "FiPy", "LoPy4"]
-def boards_to_test = ["Pycom_Expansion3_Py00ec5f", "Pycom_Expansion3_Py9f8bf5"]
+def boards_to_test = ["1b6fa1", "00ec51"]
 
 node {
     // get pycom-esp-idf source
     stage('Checkout') {
         checkout scm
         sh 'rm -rf esp-idf'
-        sh 'git clone --recursive -b master https://github.com/pycom/pycom-esp-idf.git esp-idf'
-        sh 'git -C esp-idf checkout 4eab4e1b0e47c73b858c6b29d357f3d30a69c074'
-        sh 'git -C esp-idf submodule update'
+        sh 'git clone --depth=1 --recursive -b master https://github.com/pycom/pycom-esp-idf.git esp-idf'
     }
 
     PYCOM_VERSION=get_version()
@@ -119,11 +117,12 @@ def testBuild(short_name) {
         dir('tests') {
             timeout(30) {
                 // As some tests are randomly failing... enforce script always returns 0 (OK)
-                    sh './run-tests --target=esp32-' + board_name_u + ' --device ' + device_name + ' || exit 0'
-                }
+                sh '''export PATH=$PATH:/usr/local/bin;
+                ./run-tests --target=esp32-''' + board_name_u + ' --device ' + device_name + ' || exit 0'
             }
-            sh 'python esp32/tools/pypic.py --port ' + device_name +' --enter'
-            sh 'python esp32/tools/pypic.py --port ' + device_name +' --exit'
+        }
+        sh 'python esp32/tools/pypic.py --port ' + device_name +' --enter'
+        sh 'python esp32/tools/pypic.py --port ' + device_name +' --exit'
     }
   }
 }
@@ -150,6 +149,6 @@ def get_remote_name(short_name) {
 }
 
 def get_device_name(short_name) {
-    return "/dev/serial/by-id/usb-" +  short_name + "-if00"   
+    return "/dev/tty.usbmodemPy" +  short_name + " "
 }
 
diff --git a/README.md b/README.md
@@ -157,7 +157,7 @@ Expansion Board 2.0 users, please connect ``P2`` to ``GND`` and then reset the b
 
 ### Prerequisites
 
-    $ export $IDF_PATH=<pycom-esp-idf_PATH>
+    $ export IDF_PATH=<pycom-esp-idf_PATH>
     $ cd esp32
 
 Hold valid keys for Flash Encryption and Secure Boot; they can be generated randomly with the following commands:

diff --git a/docs/license.rst b/docs/license.rst
@@ -23,7 +23,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-Copyright (c) 2016, Pycom Limited.
+Copyright (c) 2018, Pycom Limited.
 
 This software is licensed under the GNU GPL version 3 or any
 later version, with permitted additional terms. For more information

diff --git a/drivers/sx127x/sx1272/sx1272.c b/drivers/sx127x/sx1272/sx1272.c
@@ -1,7 +1,7 @@
 /*
  * This file is derived from the MicroPython project, http://micropython.org/
  *
- * Copyright (c) 2016, Pycom Limited and its licensors.
+ * Copyright (c) 2018, Pycom Limited and its licensors.
  *
  * This software is licensed under the GNU GPL version 3 or any later version,
  * with permitted additional terms. For more information see the Pycom Licence
@@ -234,17 +234,14 @@ bool SX1272IsChannelFree( RadioModems_t modem, uint32_t freq, int16_t rssiThresh
 {
     bool status = true;
     int16_t rssi = 0;
-    uint32_t carrierSenseTime = 0;
 
     SX1272SetModem( modem );
 
     SX1272SetChannel( freq );
 
     SX1272SetOpMode( RF_OPMODE_RECEIVER );
 
-    DelayMs( 2 );
-
-    carrierSenseTime = TimerGetCurrentTime( );
+    DelayMs( 1 );
 
     // Perform carrier sense for maxCarrierSenseTime
     do {
@@ -254,7 +251,9 @@ bool SX1272IsChannelFree( RadioModems_t modem, uint32_t freq, int16_t rssiThresh
             status = false;
             break;
         }
-    } while( TimerGetElapsedTime( carrierSenseTime ) < maxCarrierSenseTime );
+        DelayMs( 1 );
+        maxCarrierSenseTime -= 1;
+    } while( maxCarrierSenseTime > 0 );
     SX1272SetSleep( );
     return status;
 }

diff --git a/drivers/sx127x/sx1276/sx1276.c b/drivers/sx127x/sx1276/sx1276.c
@@ -1,7 +1,7 @@
 /*
  * This file is derived from the MicroPython project, http://micropython.org/
  *
- * Copyright (c) 2016, Pycom Limited and its licensors.
+ * Copyright (c) 2018, Pycom Limited and its licensors.
  *
  * This software is licensed under the GNU GPL version 3 or any later version,
  * with permitted additional terms. For more information see the Pycom Licence
@@ -255,17 +255,14 @@ bool SX1276IsChannelFree( RadioModems_t modem, uint32_t freq, int16_t rssiThresh
 {
     bool status = true;
     int16_t rssi = 0;
-    uint32_t carrierSenseTime = 0;
 
     SX1276SetModem( modem );
 
     SX1276SetChannel( freq );
 
     SX1276SetOpMode( RF_OPMODE_RECEIVER );
 
-    DelayMs( 2 );
-
-    carrierSenseTime = TimerGetCurrentTime( );
+    DelayMs( 1 );
 
     // Perform carrier sense for maxCarrierSenseTime
     do {
@@ -275,7 +272,9 @@ bool SX1276IsChannelFree( RadioModems_t modem, uint32_t freq, int16_t rssiThresh
             status = false;
             break;
         }
-    } while( TimerGetElapsedTime( carrierSenseTime ) < maxCarrierSenseTime );
+        DelayMs( 1 );
+        maxCarrierSenseTime -= 1;
+    } while( maxCarrierSenseTime > 0 );
     SX1276SetSleep( );
     return status;
 }

diff --git a/esp32/application.mk b/esp32/application.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, Pycom Limited.
+# Copyright (c) 2018, Pycom Limited.
 #
 # This software is licensed under the GNU GPL version 3 or any
 # later version, with permitted additional terms. For more information

diff --git a/esp32/boards/FIPY/mpconfigboard.h b/esp32/boards/FIPY/mpconfigboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Pycom Limited.
+ * Copyright (c) 2018, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/boards/GPY/mpconfigboard.h b/esp32/boards/GPY/mpconfigboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Pycom Limited.
+ * Copyright (c) 2018, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/boards/LOPY/mpconfigboard.h b/esp32/boards/LOPY/mpconfigboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Pycom Limited.
+ * Copyright (c) 2018, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/boards/LOPY4/mpconfigboard.h b/esp32/boards/LOPY4/mpconfigboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Pycom Limited.
+ * Copyright (c) 2018, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/boards/SIPY/mpconfigboard.h b/esp32/boards/SIPY/mpconfigboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Pycom Limited.
+ * Copyright (c) 2018, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/boards/SIPY/pins.csv b/esp32/boards/SIPY/pins.csv
@@ -11,8 +11,8 @@ G16,GPIO12,P9
 G17,GPIO13,P10
 G22,GPIO22,P11
 G28,GPIO21,P12
-G5,GPI37,P13
-G4,GPI36,P14
+G5,GPI36,P13
+G4,GPI37,P14
 G0,GPI38,P15
 G3,GPI39,P16
 G31,GPI35,P17

diff --git a/esp32/boards/WIPY/mpconfigboard.h b/esp32/boards/WIPY/mpconfigboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Pycom Limited.
+ * Copyright (c) 2018, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/boards/esp32_prefix.c b/esp32/boards/esp32_prefix.c
@@ -1,7 +1,7 @@
 /*
  * This file is derived from the MicroPython project, http://micropython.org/
  *
- * Copyright (c) 2016, Pycom Limited and its licensors.
+ * Copyright (c) 2018, Pycom Limited and its licensors.
  *
  * This software is licensed under the GNU GPL version 3 or any later version,
  * with permitted additional terms. For more information see the Pycom Licence

diff --git a/esp32/boards/make-pins.py b/esp32/boards/make-pins.py
@@ -2,7 +2,7 @@
 
 # This file is derived from the MicroPython project, http://micropython.org/
 #
-# Copyright (c) 2016, Pycom Limited and its licensors.
+# Copyright (c) 2018, Pycom Limited and its licensors.
 #
 # This software is licensed under the GNU GPL version 3 or any later version,
 # with permitted additional terms. For more information see the Pycom Licence

diff --git a/esp32/bootloader/bootmgr.c b/esp32/bootloader/bootmgr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Pycom Limited.
+ * Copyright (c) 2018, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/bootloader/bootmgr.h b/esp32/bootloader/bootmgr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Pycom Limited.
+ * Copyright (c) 2018, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/bootloader/mperror.c b/esp32/bootloader/mperror.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Pycom Limited.
+ * Copyright (c) 2018, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information
@@ -60,6 +60,8 @@ void mperror_init0 (void) {
     gpio_config(&gpioconf);
 
     mperror_heart_beat.enabled = true;
+    //delay introduced to separate last falling edge of signal and next color code
+    ets_delay_us(300);
     mperror_heartbeat_switch_off();
 }
 

diff --git a/esp32/fatfs/src/drivers/sd_diskio.c b/esp32/fatfs/src/drivers/sd_diskio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Pycom Limited.
+ * Copyright (c) 2018, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/fatfs/src/drivers/sd_diskio.h b/esp32/fatfs/src/drivers/sd_diskio.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Pycom Limited.
+ * Copyright (c) 2018, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/frozen/LTE/sqnsbr.py b/esp32/frozen/LTE/sqnsbr.py
@@ -1,3 +1,10 @@
+# Copyright (c) 2018, Pycom Limited.
+#
+# This software is licensed under the GNU GPL version 3 or any
+# later version, with permitted additional terms. For more information
+# see the Pycom Licence v1.0 document supplied with this file, or
+# available at https://www.pycom.io/opensource/licensing
+
 class bootrom(object):
     import binascii
 

diff --git a/esp32/frozen/LTE/sqnstp.py b/esp32/frozen/LTE/sqnstp.py
@@ -1,5 +1,22 @@
 #!/usr/bin/env python
-
+#################################################################
+#
+#  Copyright (c) 2011 SEQUANS Communications.
+#  All rights reserved.
+#
+#  This is confidential and proprietary source code of SEQUANS
+#  Communications. The use of the present source code and all
+#  its derived forms is exclusively governed by the restricted
+#  terms and conditions set forth in the SEQUANS
+#  Communications' EARLY ADOPTER AGREEMENT and/or LICENCE
+#  AGREEMENT. The present source code and all its derived
+#  forms can ONLY and EXCLUSIVELY be used with SEQUANS
+#  Communications' products. The distribution/sale of the
+#  present source code and all its derived forms is EXCLUSIVELY
+#  RESERVED to regular LICENCE holder and otherwise STRICTLY
+#  PROHIBITED.
+#
+#################################################################
 import struct
 import time
 import os
@@ -59,9 +76,9 @@ def hexdump(src, length=32):
     lines = []
     for c in range(0, len(src), length):
         chars = src[c:c+length]
-    hex = ' '.join(['%02x' % x for x in chars])
-    printable = ''.join(['%s' % ((x <= 127 and FILTER[x]) or '.') for x in chars])
-    lines.append('%04x %-*s %s\n' % (c, length*3, hex, printable))
+    hex = ' '.join(["%02x" % ord(x) for x in chars])
+    printable = ''.join(["%s" % ((ord(x) <= 127 and FILTER[ord(x)]) or '.') for x in chars])
+    lines.append("%04x %-*s %s\n" % (c, length*3, hex, printable))
     print(''.join(lines))