Merge branch 'master' into core-ble

Author: Owen L - SFE

boards.txt

@@ -222,7 +222,7 @@ edge.build.mcu=cortex-m4
 edge.build.f_cpu=48000000L
 edge.build.core=arduino
 edge.build.defs=
-edge.build.includes="-I{build.variant.path}/config" "-I{build.variant.path}/bsp"
+edge.build.includes="-I{build.variant.path}/config" "-I{build.variant.path}/bsp" "-I{build.variant.path}/include/lis2dh12" "-I{build.variant.path}/include/hm01b0"
 edge.build.libs=
 edge.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3 
 edge.build.ldscript={build.variant.path}/linker_scripts/gcc/ambiq_sbl_app.ld

bootloaders/artemis/artemis_svl.bin

@@ -28,8 +28,33 @@
 #undef abs
 #endif // abs
 
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#define max(a, b) ((a) > (b) ? (a) : (b))
+#ifdef __cplusplus
+  template<class T, class L> 
+  auto min(const T& a, const L& b) -> decltype((b < a) ? b : a)
+  {
+    return (b < a) ? b : a;
+  }
+
+  template<class T, class L> 
+  auto max(const T& a, const L& b) -> decltype((b < a) ? b : a)
+  {
+    return (a < b) ? b : a;
+  }
+#else
+#ifndef min
+#define min(a,b) \
+   ({ __typeof__ (a) _a = (a); \
+       __typeof__ (b) _b = (b); \
+     _a < _b ? _a : _b; })
+#endif
+#ifndef max
+#define max(a,b) \
+   ({ __typeof__ (a) _a = (a); \
+       __typeof__ (b) _b = (b); \
+     _a > _b ? _a : _b; })
+#endif
+#endif
+
 #define abs(x) ((x) > 0 ? (x) : -(x))
 #define constrain(amt, low, high) ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)))
 #define round(x) ((x) >= 0 ? (long)((x) + 0.5) : (long)((x)-0.5))

cores/arduino/ard_sup/Arduino_defines.h

@@ -313,7 +313,7 @@ ap3_err_t ap3_set_pin_to_analog(uint8_t pinNumber)
     ap3_err_t retval = AP3_ERR;
 
     uint8_t funcsel = 0;
-    am_hal_gpio_pincfg_t pincfg = INPUT;
+    am_hal_gpio_pincfg_t pincfg = AP3_PINCFG_INPUT;
     retval = ap3_analog_pad_funcsel(ap3_gpio_pin2pad(pinNumber), &funcsel);
 
     if (retval != AP3_OK)

cores/arduino/ard_sup/analog/ap3_analog.cpp

@@ -34,12 +34,21 @@ extern const am_hal_gpio_pincfg_t g_AM_HAL_GPIO_OUTPUT_WITH_READ_12;
 extern const am_hal_gpio_pincfg_t g_AM_HAL_GPIO_OPEN_DRAIN_WITH_READ_12;
 extern const am_hal_gpio_pincfg_t g_AM_HAL_GPIO_INPUT_PULLDOWN;
 
-#define INPUT (g_AM_HAL_GPIO_INPUT)
-#define OUTPUT (g_AM_HAL_GPIO_OUTPUT_WITH_READ_12)
-#define OPEN_DRAIN (g_AM_HAL_GPIO_OPEN_DRAIN_WITH_READ_12)
-#define TRISTATE (g_AM_HAL_GPIO_TRISTATE)
-#define INPUT_PULLUP (g_AM_HAL_GPIO_INPUT_PULLUP)
-#define INPUT_PULLDOWN (g_AM_HAL_GPIO_INPUT_PULLDOWN)
+// macros pointing to internal apollo3 GPIO pincfg structures
+#define AP3_PINCFG_INPUT            (g_AM_HAL_GPIO_INPUT)
+#define AP3_PINCFG_OUTPUT           (g_AM_HAL_GPIO_OUTPUT_WITH_READ_12)
+#define AP3_PINCFG_INPUT_PULLUP     (g_AM_HAL_GPIO_INPUT_PULLUP)
+#define AP3_PINCFG_INPUT_PULLDOWN   (g_AM_HAL_GPIO_INPUT_PULLDOWN)
+#define AP3_PINCFG_OPEN_DRAIN       (g_AM_HAL_GPIO_OPEN_DRAIN_WITH_READ_12)
+#define AP3_PINCFG_TRISTATE         (g_AM_HAL_GPIO_TRISTATE)
+
+// constants for Arduino pin modes
+#define INPUT           (0x00)
+#define OUTPUT          (0x01)
+#define INPUT_PULLUP    (0x02)
+#define INPUT_PULLDOWN  (0x03)
+#define OPEN_DRAIN      (0x04)
+#define TRISTATE        (0x05)
 
 #define AP3_GPIO_MAX_PADS (50)
 #define AP3_GPIO_IS_VALID(pad) ((pad >= 0) && (pad < AP3_GPIO_MAX_PADS))
@@ -59,6 +68,7 @@ uint32_t ap3_gpio_enable_interrupts(uint32_t ui32Pin, uint32_t eIntDir);
 void padMode(uint8_t pad, am_hal_gpio_pincfg_t mode);
 void padMode(uint8_t pad, am_hal_gpio_pincfg_t mode, ap3_err_t *retval);
 
+void pinMode(uint8_t pin, uint8_t mode);
 void pinMode(uint8_t pin, am_hal_gpio_pincfg_t mode);
 void pinMode(uint8_t pin, am_hal_gpio_pincfg_t mode, ap3_err_t *retval);
 void digitalWrite(uint8_t pin, uint8_t val);

cores/arduino/ard_sup/ap3_gpio.h

@@ -75,6 +75,38 @@ void padMode(uint8_t pad, am_hal_gpio_pincfg_t mode)
     padMode(pad, mode, NULL);
 }
 
+// translate Arduino style pin mode function to apollo3 implementation
+void pinMode(uint8_t pin, uint8_t mode) {
+
+    am_hal_gpio_pincfg_t pinmode = AP3_GPIO_PINCFG_NULL;
+
+    switch (mode) {
+        case INPUT:
+            pinmode = AP3_PINCFG_INPUT;
+            break;
+        case OUTPUT:
+            pinmode = AP3_PINCFG_OUTPUT;
+            break;
+        case INPUT_PULLUP:
+            pinmode = AP3_PINCFG_INPUT_PULLUP;
+            break;
+        case INPUT_PULLDOWN:
+            pinmode = AP3_PINCFG_INPUT_PULLDOWN;
+            break;
+        case OPEN_DRAIN:
+            pinmode = AP3_PINCFG_OPEN_DRAIN;
+            break;
+        case TRISTATE:
+            pinmode = AP3_PINCFG_TRISTATE;
+            break;
+        default:
+            //no match, just do nothing
+            return;
+    }
+
+    pinMode(pin, pinmode);
+}
+
 void pinMode(uint8_t pin, am_hal_gpio_pincfg_t mode, ap3_err_t *retval)
 {
     ap3_gpio_pad_t pad = ap3_gpio_pin2pad(pin);

cores/arduino/ard_sup/gpio/ap3_gpio.cpp

@@ -11,4 +11,5 @@ Contributors
 * Jim Lindblom
 * Kenny Hora
 * Owen Lyke
+* Aaron Micyus
 * Nathan Seidle

docs/ACKNOWLEDGEMENTS.md

@@ -5,9 +5,15 @@ This is a record of the major changes between versions of the SparkFun Arduino A
 
 Each log entry will use the version number of the release that contains the changes listed. Newest version at the top of the file (just below this line)
 
-1.0.23 - In Progress
+1.0.24 - In progress
 ====================
 
+1.0.23 - Dec 23 2019
+====================
+- Update SVL bootloader to v5 (increases reliability and speed). For best results make sure to re-burn the bootloader.
+- Adds compatibility for std C++ min/max functions
+- Updates variants according to latest BSP release
+
 1.0.22 - Dec 13 2019
 ====================
 - Merge #100: SVL Loader to v4 - Adds de-initialization of peripherals. Addresses [this issue](https://forum.sparkfun.com/viewtopic.php?f=168&t=51391&p=210375#p210375)

docs/CHANGELOG.md

@@ -39,7 +39,6 @@
 import sys
 import time
 import math
-import os.path
 from sys import exit
 
 # ***********************************************************************************
@@ -54,58 +53,59 @@
 SVL_CMD_RETRY   = 0x05  # request re-send frame
 SVL_CMD_DONE    = 0x06  # finished - all data sent
 
-# Global variables
-
-barWidthInCharacters = 50 # Width of progress bar, ie [###### % complete
-
-
+barWidthInCharacters = 50  # Width of progress bar, ie [###### % complete
+
+crcTable = (
+    0x0000, 0x8005, 0x800F, 0x000A, 0x801B, 0x001E, 0x0014, 0x8011,
+    0x8033, 0x0036, 0x003C, 0x8039, 0x0028, 0x802D, 0x8027, 0x0022,
+    0x8063, 0x0066, 0x006C, 0x8069, 0x0078, 0x807D, 0x8077, 0x0072,
+    0x0050, 0x8055, 0x805F, 0x005A, 0x804B, 0x004E, 0x0044, 0x8041,
+    0x80C3, 0x00C6, 0x00CC, 0x80C9, 0x00D8, 0x80DD, 0x80D7, 0x00D2,
+    0x00F0, 0x80F5, 0x80FF, 0x00FA, 0x80EB, 0x00EE, 0x00E4, 0x80E1,
+    0x00A0, 0x80A5, 0x80AF, 0x00AA, 0x80BB, 0x00BE, 0x00B4, 0x80B1,
+    0x8093, 0x0096, 0x009C, 0x8099, 0x0088, 0x808D, 0x8087, 0x0082,
+    0x8183, 0x0186, 0x018C, 0x8189, 0x0198, 0x819D, 0x8197, 0x0192,
+    0x01B0, 0x81B5, 0x81BF, 0x01BA, 0x81AB, 0x01AE, 0x01A4, 0x81A1,
+    0x01E0, 0x81E5, 0x81EF, 0x01EA, 0x81FB, 0x01FE, 0x01F4, 0x81F1,
+    0x81D3, 0x01D6, 0x01DC, 0x81D9, 0x01C8, 0x81CD, 0x81C7, 0x01C2,
+    0x0140, 0x8145, 0x814F, 0x014A, 0x815B, 0x015E, 0x0154, 0x8151,
+    0x8173, 0x0176, 0x017C, 0x8179, 0x0168, 0x816D, 0x8167, 0x0162,
+    0x8123, 0x0126, 0x012C, 0x8129, 0x0138, 0x813D, 0x8137, 0x0132,
+    0x0110, 0x8115, 0x811F, 0x011A, 0x810B, 0x010E, 0x0104, 0x8101,
+    0x8303, 0x0306, 0x030C, 0x8309, 0x0318, 0x831D, 0x8317, 0x0312,
+    0x0330, 0x8335, 0x833F, 0x033A, 0x832B, 0x032E, 0x0324, 0x8321,
+    0x0360, 0x8365, 0x836F, 0x036A, 0x837B, 0x037E, 0x0374, 0x8371,
+    0x8353, 0x0356, 0x035C, 0x8359, 0x0348, 0x834D, 0x8347, 0x0342,
+    0x03C0, 0x83C5, 0x83CF, 0x03CA, 0x83DB, 0x03DE, 0x03D4, 0x83D1,
+    0x83F3, 0x03F6, 0x03FC, 0x83F9, 0x03E8, 0x83ED, 0x83E7, 0x03E2,
+    0x83A3, 0x03A6, 0x03AC, 0x83A9, 0x03B8, 0x83BD, 0x83B7, 0x03B2,
+    0x0390, 0x8395, 0x839F, 0x039A, 0x838B, 0x038E, 0x0384, 0x8381,
+    0x0280, 0x8285, 0x828F, 0x028A, 0x829B, 0x029E, 0x0294, 0x8291,
+    0x82B3, 0x02B6, 0x02BC, 0x82B9, 0x02A8, 0x82AD, 0x82A7, 0x02A2,
+    0x82E3, 0x02E6, 0x02EC, 0x82E9, 0x02F8, 0x82FD, 0x82F7, 0x02F2,
+    0x02D0, 0x82D5, 0x82DF, 0x02DA, 0x82CB, 0x02CE, 0x02C4, 0x82C1,
+    0x8243, 0x0246, 0x024C, 0x8249, 0x0258, 0x825D, 0x8257, 0x0252,
+    0x0270, 0x8275, 0x827F, 0x027A, 0x826B, 0x026E, 0x0264, 0x8261,
+    0x0220, 0x8225, 0x822F, 0x022A, 0x823B, 0x023E, 0x0234, 0x8231,
+    0x8213, 0x0216, 0x021C, 0x8219, 0x0208, 0x820D, 0x8207, 0x0202)
 # ***********************************************************************************
 #
 # Compute CRC on a byte array
 #
 # ***********************************************************************************
-def get_crc16(data):
-    # To perform the division perform the following:
-
-    # Load the register with zero bits.
-    # Augment the message by appending W zero bits to the end of it.
-    # While (more message bits)
-    #     Begin
-    #     Shift the register left by one bit, reading the next bit of the
-    #         augmented message into register bit position 0.
-    #     If (a 1 bit popped out of the register during step 3)
-    #         Register = Register XOR Poly.
-    #     End
-    # The register now contains the remainder.
-    register    = 0x0000
-    poly        = 0x8005
-
-    data = bytearray(data)
-    data.extend(bytearray(2))
-    bits = 8*len(data)
-
-    def get_data_bit(bit):
-        byte = int(bit/8)
-        if(data[byte] & (0x80 >> (bit%8))):
-            return 1
-        return 0
 
-    for bit in range(bits):
 
-        c = 0
-        if(register & 0x8000):
-            c = 1
-
-        register <<= 1
-        register &= 0xFFFF
-
-        if(get_data_bit(bit)):
-            register |= 0x0001
-
-        if(c):
-            register = (register ^ poly)
+def get_crc16(data):
 
-    return register
+    #Table and code ported from Artemis SVL bootloader
+    crc = 0x0000
+    data = bytearray(data)
+    for ch in data:
+        tableAddr = ch ^ (crc >> 8)
+        CRCH = (crcTable[tableAddr] >> 8) ^ (crc & 0xFF)
+        CRCL = crcTable[tableAddr] & 0x00FF
+        crc = CRCH << 8 | CRCL
+    return crc
 
 
 
@@ -197,9 +197,10 @@ def phase_setup(ser):
 # ***********************************************************************************
 def phase_bootload(ser):
 
+    startTime = time.time()
     frame_size = 512*4
 
-    resend_max = 64
+    resend_max = 4
     resend_count = 0
 
     verboseprint('\nphase:\tbootload')
@@ -213,9 +214,10 @@ def phase_bootload(ser):
         progressChars = 0
 
         if (not args.verbose):
-            print("[", end = '')
+            print("[", end='')
 
-        verboseprint('\thave ' + str(total_len) + ' bytes to send in ' + str(total_frames) + ' frames')
+        verboseprint('\thave ' + str(total_len) +
+                     ' bytes to send in ' + str(total_frames) + ' frames')
 
         bl_done = False
         bl_failed = False
@@ -247,10 +249,12 @@ def phase_bootload(ser):
             if( curr_frame <= total_frames ):
                 frame_data = application[((curr_frame-1)*frame_size):((curr_frame-1+1)*frame_size)]
                 if(args.verbose):
-                    verboseprint('\tsending frame #'+str(curr_frame)+', length: '+str(len(frame_data)))
+                    verboseprint('\tsending frame #'+str(curr_frame) +
+                                 ', length: '+str(len(frame_data)))
                 else:
                     percentComplete = curr_frame * 100 / total_frames
-                    percentCompleteInChars = math.ceil(percentComplete / 100 * barWidthInCharacters)
+                    percentCompleteInChars = math.ceil(
+                        percentComplete / 100 * barWidthInCharacters)
                     while(progressChars < percentCompleteInChars):
                         progressChars = progressChars + 1
                         print('#', end='', flush=True)
@@ -264,9 +268,12 @@ def phase_bootload(ser):
                 bl_done = True
 
         if( bl_failed == False ):
-            twopartprint('\n\t', ' Upload complete')
+            twopartprint('\n\t', 'Upload complete')
+            endTime = time.time()
+            bps = total_len / (endTime - startTime)
+            verboseprint('\n\tNominal bootload bps: ' + str(round(bps, 2)))
         else:
-            twopartprint('\n\t', ' Upload failed')
+            twopartprint('\n\t', 'Upload failed')
 
         return bl_failed
 
@@ -317,9 +324,6 @@ def main():
         num_tries = 3
 
         print('\n\nArtemis SVL Bootloader')
-        if not os.path.exists(args.binfile):
-            print("Bin file {} does not exits.".format(args.binfile))
-            exit()
 
         for _ in range(num_tries):
 
@@ -335,7 +339,7 @@ def main():
             if( bl_failed == False ):
                 break
 
-    except serial.SerialException:
+    except:
         phase_serial_port_help()
 
     exit()
@@ -379,7 +383,7 @@ def verboseprint(*args):
             # Print each argument separately so caller doesn't need to
             # stuff everything to be printed into a single string
             for arg in args:
-                print(arg, end=''),
+                print(arg, end='', flush=True),
             print()
     else:
         verboseprint = lambda *a: None      # do-nothing function