Merge pull request #338 from adafruit/develop

finished image upload feature

Author: hathach

.travis.yml

@@ -27,7 +27,7 @@ install:
   - BSP_VERSION=`eval ls $BSP_PATH`
   - rm -r $BSP_PATH/*
   - ln -s $TRAVIS_BUILD_DIR $BSP_PATH/$BSP_VERSION
-  - arduino --install-library "Adafruit NeoPixel","Adafruit NeoMatrix","Adafruit GFX Library","Adafruit SSD1306","MIDI Library","Adafruit ILI9341"
+  - arduino --install-library "Adafruit NeoPixel","Adafruit NeoMatrix","Adafruit GFX Library","Adafruit SSD1306","MIDI Library","Adafruit ILI9341","Adafruit HX8357 Library"
 
 before_script:
 

cores/nRF5/Adafruit_TinyUSB_Core/Adafruit_TinyUSB_Core.cpp

@@ -34,7 +34,7 @@
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
 //--------------------------------------------------------------------+
 
-#define USBD_STACK_SZ   (150)
+#define USBD_STACK_SZ   (200)
 
 // tinyusb function that handles power event (detected, ready, removed)
 // We must call it within SD's SOC event handler, or set it as power event handler if SD is not enabled.

cores/nRF5/Adafruit_TinyUSB_Core/tinyusb/src/device/usbd.h

@@ -166,8 +166,6 @@ TU_ATTR_WEAK bool tud_vendor_control_complete_cb(uint8_t rhport, tusb_control_re
 
 // CDC Descriptor Template
 // Interface number, string index, EP notification address and size, EP data address (out, in) and size.
-// NOTE: This returns an list of byte (uint_8) values
-// NOTE: Unwritten & unverified assumption: _itfnum is in range [0..254] (else overflows below adding 1)
 #define TUD_CDC_DESCRIPTOR(_itfnum, _stridx, _ep_notif, _ep_notif_size, _epout, _epin, _epsize) \
   /* Interface Associate */\
   8, TUSB_DESC_INTERFACE_ASSOCIATION, _itfnum, 2, TUSB_CLASS_CDC, CDC_COMM_SUBCLASS_ABSTRACT_CONTROL_MODEL, CDC_COMM_PROTOCOL_ATCOMMAND, 0,\
@@ -242,8 +240,6 @@ TU_ATTR_WEAK bool tud_vendor_control_complete_cb(uint8_t rhport, tusb_control_re
 // MIDI simple descriptor
 // - 1 Embedded Jack In connected to 1 External Jack Out
 // - 1 Embedded Jack out connected to 1 External Jack In
-// NOTE: This returns an list of byte (uint_8) values
-// NOTE: Unwritten & unverified assumption: _itfnum is in range [0..254] (else overflows below adding 1)
 #define TUD_MIDI_DESCRIPTOR(_itfnum, _stridx, _epout, _epin, _epsize) \
   /* Audio Control (AC) Interface */\
   9, TUSB_DESC_INTERFACE, _itfnum, 0, 0, TUSB_CLASS_AUDIO, AUDIO_SUBCLASS_CONTROL, AUDIO_PROTOCOL_V1, _stridx,\

cores/nRF5/common_func.h

@@ -114,12 +114,6 @@
 //--------------------------------------------------------------------+
 // DEBUG HELPER
 //--------------------------------------------------------------------+
-#if CFG_DEBUG == 2
-  #define malloc_named( name, size )            ({ PRINTF("[malloc] %s : %d\r\n", name, size); malloc(size); })
-#else
-  #define malloc_named( name, size )            malloc ( size )
-#endif
-
 const char* dbg_err_str(int32_t err_id); // TODO move to other place
 
 #if CFG_DEBUG

cores/nRF5/linker/nrf52832_s132_v6.ld

@@ -5,7 +5,7 @@ GROUP(-lgcc -lc -lnosys)
 
 MEMORY
 {
-  FLASH (rx)     : ORIGIN = 0x26000, LENGTH = 0x6D000-0x26000
+  FLASH (rx)     : ORIGIN = 0x26000, LENGTH = 0x6D000 - 0x26000
 
   /* SRAM required by S132 depend on
    * - Attribute Table Size
@@ -14,7 +14,6 @@ MEMORY
    * - Concurrent connection peripheral + central + secure links
    * - Event Len, HVN queue, Write CMD queue
    */ 
-  /* RAM (rwx) :  ORIGIN = 0x20003200, LENGTH = 0x20010000 - 0x20003200 */
   RAM (rwx) :  ORIGIN = 0x20003400, LENGTH = 0x20010000 - 0x20003400
 }
 

cores/nRF5/main.cpp

@@ -37,7 +37,8 @@ static TaskHandle_t  _loopHandle;
 void initVariant() __attribute__((weak));
 void initVariant() { }
 
-#define LOOP_STACK_SZ   (512*3)
+#define LOOP_STACK_SZ       (256*4)
+#define CALLBACK_STACK_SZ   (256*3)
 
 static void loop_task(void* arg)
 {
@@ -56,7 +57,7 @@ static void loop_task(void* arg)
   while (1)
   {
     loop();
-    yield(); // yield run usb background task
+    yield(); // yield to run other task
 
     // Serial events
     if (serialEvent && serialEventRun) serialEventRun();
@@ -81,7 +82,7 @@ int main( void )
   xTaskCreate( loop_task, "loop", LOOP_STACK_SZ, NULL, TASK_PRIO_LOW, &_loopHandle);
 
   // Initialize callback task
-  ada_callback_init();
+  ada_callback_init(CALLBACK_STACK_SZ);
 
   // Start FreeRTOS scheduler.
   vTaskStartScheduler();

cores/nRF5/new.cpp

@@ -19,6 +19,10 @@
 #include <stdlib.h>
 #include "rtos.h"
 
+#include <errno.h>
+#include <sys/stat.h>
+#include <malloc.h>
+
 void *operator new(size_t size) {
   return rtos_malloc(size);
 }
@@ -42,3 +46,46 @@ void operator delete(void * ptr, unsigned int) {
 void operator delete[](void * ptr, unsigned int) {
   rtos_free(ptr);
 }
+
+
+extern "C"
+{
+
+// defined in linker script
+extern unsigned char __HeapBase[];
+extern unsigned char __HeapLimit[];
+
+static unsigned char *sbrk_heap_top = __HeapBase;
+
+__attribute__((used))
+caddr_t _sbrk( int incr )
+{
+  unsigned char *prev_heap;
+
+  if ( sbrk_heap_top + incr > __HeapLimit )
+  {
+    /* Out of dynamic memory heap space */
+    errno = ENOMEM;
+    return (caddr_t) -1;
+  }
+
+  prev_heap = sbrk_heap_top;
+
+  sbrk_heap_top += incr;
+
+  return (caddr_t) prev_heap;
+}
+
+void __malloc_lock(struct _reent *ptr)
+{
+  (void) ptr;
+  vTaskSuspendAll();
+}
+
+void __malloc_unlock(struct _reent *ptr)
+{
+  (void) ptr;
+  xTaskResumeAll();
+}
+
+}

cores/nRF5/rtos.cpp

@@ -93,12 +93,14 @@ void yield(void)
 
 void vApplicationStackOverflowHook( TaskHandle_t xTask, char *pcTaskName )
 {
-  LOG_LV1("RTOS", "%s Stack Overflow !!!", pcTaskName);
+  LOG_LV1("RTOS", "Task %s: stack Overflow !!!", pcTaskName);
+  while(CFG_DEBUG) yield();
 }
 
 void vApplicationMallocFailedHook(void)
 {
-  LOG_LV1("RTOS", "Failed to Malloc");
+  LOG_LV1("RTOS", "Task %s: failed to Malloc", pcTaskGetName(xTaskGetCurrentTaskHandle()));
+  while(CFG_DEBUG) yield();
 }
 
 /* configSUPPORT_STATIC_ALLOCATION is set to 1, so the application must provide an

cores/nRF5/rtos.h

@@ -66,12 +66,6 @@ enum
 #define tick2us(tck)         ( ( ((uint64_t)(tck)) * 1000000) / configTICK_RATE_HZ )
 
 #define malloc_type(type)    rtos_malloc( sizeof(type) )
-
-#if 0
-#define rtos_malloc(_size)  ({ printf("[malloc] %s:%d : %d bytes\r\n", __PRETTY_FUNCTION__, __LINE__, _size); pvPortMalloc(_size); })
-#define rtos_free(ptr)      ({ printf("[free] %s:%d\r\n"    ,__PRETTY_FUNCTION__, __LINE__/*malloc_usable_size(ptr)*/); vPortFree(ptr); })
-#else
-
 #define rtos_malloc_type(_type)   (_type*) rtos_malloc(sizeof(_type))
 
 static inline void* rtos_malloc(size_t _size)
@@ -84,9 +78,8 @@ static inline void rtos_free( void *pv )
   return (xTaskGetSchedulerState() == taskSCHEDULER_NOT_STARTED) ? free(pv) : vPortFree(pv);
 }
 
-#endif
-
-#ifdef __cplusplus // Visible only with cplusplus
+// Visible only with C++
+#ifdef __cplusplus
 
 #define SCHEDULER_STACK_SIZE_DFLT   (512*2)
 
@@ -106,7 +99,6 @@ class SchedulerRTOS
 
 extern SchedulerRTOS Scheduler;
 
-#endif
-
+#endif // __cplusplus
 
 #endif /* RTOS_H_ */