Merge pull request #658 from adafruit/motion-trainer

Port TensorFlow Lite Motion Kit project

Author: hathach

cores/nRF5/common_func.h

@@ -184,7 +184,7 @@ const char* dbg_err_str(int32_t err_id); // TODO move to other place
 #define PRINT_HEX(x) \
   do {\
     PRINTF("%s: %d: " #x " = 0x", __PRETTY_FUNCTION__, __LINE__);\
-    char fmt[] = "%00X\n";\
+    char fmt[] = "%00X\r\n";\
     fmt[2] += 2*sizeof(x); /* Hex with correct size */\
     PRINTF(fmt, (x) );\
   }while(0)
@@ -197,14 +197,14 @@ const char* dbg_err_str(int32_t err_id); // TODO move to other place
       if (i%16 == 0) PRINTF("\n"); \
       PRINTF("%02x ", p8[i]); \
     }\
-    PRINTF("\n");\
+    PRINTF("\r\n");\
   }while(0)
 
 #define ADALOG(tag, ...) \
   do { \
     if ( tag ) PRINTF("[%-6s] ", tag);\
     PRINTF(__VA_ARGS__);\
-    PRINTF("\n");\
+    PRINTF("\r\n");\
   }while(0)
 
 #define ADALOG_BUFFER(_tag, _buf, _n) \

cores/nRF5/utility/debug.cpp

@@ -107,14 +107,14 @@ static void printMemRegion(const char* name, uint32_t top, uint32_t bottom, uint
     sprintf(buffer, "%lu", top-bottom);
   }
 
-  PRINTF("| %-5s| 0x%04X - 0x%04X | %-19s |\n", name, (uint16_t) bottom, (uint16_t) (top-1), buffer);
+  PRINTF("| %-5s| 0x%04X - 0x%04X | %-19s |\r\n", name, (uint16_t) bottom, (uint16_t) (top-1), buffer);
 }
 
 void dbgMemInfo(void)
 {
-  PRINTF(" ______________________________________________\n");
-  PRINTF("| Name | Addr 0x2000xxxx | Usage               |\n");
-  PRINTF("| ---------------------------------------------|\n");
+  PRINTF(" ______________________________________________\r\n");
+  PRINTF("| Name | Addr 0x2000xxxx | Usage               |\r\n");
+  PRINTF("| ---------------------------------------------|\r\n");
 
   // Pritn SRAM used for Stack executed by Softdevice and ISR
   printMemRegion("Stack", ((uint32_t) __StackTop), ((uint32_t) __StackLimit), dbgStackUsed() );
@@ -128,7 +128,7 @@ void dbgMemInfo(void)
   // Print SRAM Used by SoftDevice
   printMemRegion("SD", (uint32_t) __data_start__, 0x20000000, 0);
 
-  PRINTF("|______________________________________________|\n");
+  PRINTF("|______________________________________________|\r\n");
   PRINTF("\n");
 
   // Print Task list
@@ -137,20 +137,20 @@ void dbgMemInfo(void)
 
   vTaskList(buf);
 
-  PRINTF("Task    State   Prio  StackLeft Num\n");
-  PRINTF("-----------------------------------\n");
+  PRINTF("Task    State   Prio  StackLeft Num\r\n");
+  PRINTF("-----------------------------------\r\n");
   PRINTF(buf);
   PRINTF("\n");
   rtos_free(buf);
 }
 
 void dbgPrintVersion(void)
 {
-  PRINTF("\n");
-  PRINTF("BSP Library : " ARDUINO_BSP_VERSION "\n");
-  PRINTF("Bootloader  : %s\n", getBootloaderVersion());
-  PRINTF("Serial No   : %s\n", getMcuUniqueID());
-  PRINTF("\n");
+  PRINTF("\r\n");
+  PRINTF("BSP Library : " ARDUINO_BSP_VERSION "\r\n");
+  PRINTF("Bootloader  : %s\r\n", getBootloaderVersion());
+  PRINTF("Serial No   : %s\r\n", getMcuUniqueID());
+  PRINTF("\r\n");
 }
 
 /******************************************************************************/

cores/nRF5/verify.h

@@ -67,7 +67,7 @@ extern "C"
       {
         PRINTF("0x%lX (%ld)", _status, _status);
       }
-      PRINTF("\n");
+      PRINTF("\r\n");
   }
 #else
   #define VERIFY_MESS(_status, _funcstr)

libraries/Adafruit_nRFCrypto

@@ -42,7 +42,6 @@ void setup()
   // SRAM usage required by SoftDevice will increase with number of connections
   Bluefruit.begin(1, 1);
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52 duo");
 
   // Callbacks for Peripheral
   Bluefruit.Periph.setConnectCallback(prph_connect_callback);

libraries/Bluefruit52Lib/examples/DualRoles/dual_bleuart/dual_bleuart.ino

@@ -790,7 +790,6 @@ void setup()
   Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
 
   Bluefruit.begin();
-  Bluefruit.setName("Bluefruit52");
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
 
   // try to go as fast as possible, could be rejected by some central, increase it if needed

libraries/Bluefruit52Lib/examples/Peripheral/StandardFirmataBLE/StandardFirmataBLE.ino

@@ -40,8 +40,8 @@ char nibble_to_hex(uint8_t nibble) {  // convert a 4-bit nibble to a hexadecimal
 
 void setup() 
 {
-  Serial.begin(115200);
-  while ( !Serial ) delay(10);   // for nrf52840 with native usb
+//  Serial.begin(115200);
+//  while ( !Serial ) delay(10);
 
   Serial.println("Bluefruit52 Color Advertising Example");
   Serial.println("----------------------------------------\n");

libraries/Bluefruit52Lib/examples/Peripheral/adv_AdafruitColor/adv_AdafruitColor.ino

@@ -36,7 +36,6 @@ void setup()
 
   Bluefruit.begin();
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
 
   // Set up and start advertising
   startAdv();

libraries/Bluefruit52Lib/examples/Peripheral/adv_advanced/adv_advanced.ino

@@ -48,7 +48,6 @@ void setup()
   // off Blue LED for lowest power consumption
   Bluefruit.autoConnLed(false);
   Bluefruit.setTxPower(0);    // Check bluefruit.h for supported values
-  Bluefruit.setName("Bluefruit52");
 
   // Manufacturer ID is required for Manufacturer Specific Data
   beacon.setManufacturer(MANUFACTURER_ID);

libraries/Bluefruit52Lib/examples/Peripheral/beacon/beacon.ino

@@ -50,7 +50,6 @@ void setup()
   Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);  
 
   Bluefruit.begin();
-  Bluefruit.setName("Bluefruit52 MIDI");
   Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
 
   // Setup the on board blue LED to be enabled on CONNECT