Merge branch 'master' into core-ble

Author: Owen L - SFE

cores/arduino/am_sdk_ap3/mcu/apollo3/hal/am_hal_iom.h

@@ -55,6 +55,9 @@
 #include "am_hal_status.h"
 #include "am_hal_sysctrl.h"
 
+#ifdef __cplusplus // Patch
+extern "C" {
+#endif // End patch
 
 //*****************************************************************************
 //
@@ -831,4 +834,9 @@ uint32_t am_hal_iom_highprio_transfer(void *pHandle,
 //! @}
 //
 //*****************************************************************************
+
+#ifdef __cplusplus // Patch
+}
+#endif // End patch
+
 #endif // AM_HAL_IOM_H

cores/arduino/am_sdk_ap3/utils/am_util_regdump.c renamed to cores/arduino/am_sdk_ap3/utils/am_util_regdump.c.hidden

@@ -35,6 +35,8 @@ SOFTWARE.
 
 typedef RingBufferN<AP3_UART_RINGBUFF_SIZE> AP3UartRingBuffer;
 
+extern char ap3_g_prfbuf[AM_PRINTF_BUFSIZE];
+
 extern const am_hal_uart_config_t ap3_uart_config_default;
 
 extern const ap3_uart_pad_map_elem_t ap3_uart0_tx_map[AP3_UART0_NUM_TX_PADS];

cores/arduino/ard_sup/ap3_uart.h

@@ -417,10 +417,10 @@ uint32_t Uart::printf(const char *pcFmt, ...)
     //
     va_list pArgs;
     va_start(pArgs, pcFmt);
-    ui32NumChars = am_util_stdio_vsprintf(g_prfbuf, pcFmt, pArgs);
+    ui32NumChars = am_util_stdio_vsprintf(ap3_g_prfbuf, pcFmt, pArgs);
     va_end(pArgs);
 
-    write((const uint8_t *)g_prfbuf, ui32NumChars);
+    write((const uint8_t *)ap3_g_prfbuf, ui32NumChars);
 
     return ui32NumChars;
 }

cores/arduino/ard_sup/uart/ap3_uart.cpp

@@ -80,7 +80,7 @@ defines.variant={build.defs}
 
 
 ## Compiler and Toolchain
-compiler.path={runtime.tools.arm-none-eabi-gcc-8-2018-q4-major.path}/bin
+compiler.path={runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin
 compiler.cmd.cpp=arm-none-eabi-g++
 compiler.cmd.c=arm-none-eabi-gcc
 compiler.cmd.S=arm-none-eabi-gcc

platform.txt

@@ -127,7 +127,7 @@ extern int main(void);
 //
 //*****************************************************************************
 __attribute__ ((section(".stack")))
-static uint32_t g_pui32Stack[1024];
+static uint32_t g_pui32Stack[20*1024];
 
 //*****************************************************************************
 //

variants/artemis/startup/startup_gcc.c

@@ -127,7 +127,7 @@ extern int main(void);
 //
 //*****************************************************************************
 __attribute__ ((section(".stack")))
-static uint32_t g_pui32Stack[1024];
+static uint32_t g_pui32Stack[20*1024];
 
 //*****************************************************************************
 //