Skip to content

Commit 16fb459

Browse files
hathachhathach
authored
Merge pull request #658 from adafruit/motion-trainer
Port TensorFlow Lite Motion Kit project
2 parents e9d1ab7 + 556f36d commit 16fb459

File tree

47 files changed

+1889
-101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1889
-101
lines changed

‎cores/nRF5/common_func.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ const char* dbg_err_str(int32_t err_id); // TODO move to other place
184184
#define PRINT_HEX(x) \
185185
do {\
186186
PRINTF("%s: %d: " #x " = 0x", __PRETTY_FUNCTION__, __LINE__);\
187-
char fmt[] = "%00X\n";\
187+
char fmt[] = "%00X\r\n";\
188188
fmt[2] += 2*sizeof(x); /* Hex with correct size */\
189189
PRINTF(fmt, (x) );\
190190
}while(0)
@@ -197,14 +197,14 @@ const char* dbg_err_str(int32_t err_id); // TODO move to other place
197197
if (i%16 == 0) PRINTF("\n"); \
198198
PRINTF("%02x ", p8[i]); \
199199
}\
200-
PRINTF("\n");\
200+
PRINTF("\r\n");\
201201
}while(0)
202202

203203
#define ADALOG(tag, ...) \
204204
do { \
205205
if ( tag ) PRINTF("[%-6s] ", tag);\
206206
PRINTF(__VA_ARGS__);\
207-
PRINTF("\n");\
207+
PRINTF("\r\n");\
208208
}while(0)
209209

210210
#define ADALOG_BUFFER(_tag, _buf, _n) \

‎cores/nRF5/utility/debug.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,14 @@ static void printMemRegion(const char* name, uint32_t top, uint32_t bottom, uint
107107
sprintf(buffer, "%lu", top-bottom);
108108
}
109109

110-
PRINTF("| %-5s| 0x%04X - 0x%04X | %-19s |\n", name, (uint16_t) bottom, (uint16_t) (top-1), buffer);
110+
PRINTF("| %-5s| 0x%04X - 0x%04X | %-19s |\r\n", name, (uint16_t) bottom, (uint16_t) (top-1), buffer);
111111
}
112112

113113
void dbgMemInfo(void)
114114
{
115-
PRINTF(" ______________________________________________\n");
116-
PRINTF("| Name | Addr 0x2000xxxx | Usage |\n");
117-
PRINTF("| ---------------------------------------------|\n");
115+
PRINTF(" ______________________________________________\r\n");
116+
PRINTF("| Name | Addr 0x2000xxxx | Usage |\r\n");
117+
PRINTF("| ---------------------------------------------|\r\n");
118118

119119
// Pritn SRAM used for Stack executed by Softdevice and ISR
120120
printMemRegion("Stack", ((uint32_t) __StackTop), ((uint32_t) __StackLimit), dbgStackUsed() );
@@ -128,7 +128,7 @@ void dbgMemInfo(void)
128128
// Print SRAM Used by SoftDevice
129129
printMemRegion("SD", (uint32_t) __data_start__, 0x20000000, 0);
130130

131-
PRINTF("|______________________________________________|\n");
131+
PRINTF("|______________________________________________|\r\n");
132132
PRINTF("\n");
133133

134134
// Print Task list
@@ -137,20 +137,20 @@ void dbgMemInfo(void)
137137

138138
vTaskList(buf);
139139

140-
PRINTF("Task State Prio StackLeft Num\n");
141-
PRINTF("-----------------------------------\n");
140+
PRINTF("Task State Prio StackLeft Num\r\n");
141+
PRINTF("-----------------------------------\r\n");
142142
PRINTF(buf);
143143
PRINTF("\n");
144144
rtos_free(buf);
145145
}
146146

147147
void dbgPrintVersion(void)
148148
{
149-
PRINTF("\n");
150-
PRINTF("BSP Library : " ARDUINO_BSP_VERSION "\n");
151-
PRINTF("Bootloader : %s\n", getBootloaderVersion());
152-
PRINTF("Serial No : %s\n", getMcuUniqueID());
153-
PRINTF("\n");
149+
PRINTF("\r\n");
150+
PRINTF("BSP Library : " ARDUINO_BSP_VERSION "\r\n");
151+
PRINTF("Bootloader : %s\r\n", getBootloaderVersion());
152+
PRINTF("Serial No : %s\r\n", getMcuUniqueID());
153+
PRINTF("\r\n");
154154
}
155155

156156
/******************************************************************************/

‎cores/nRF5/verify.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ extern "C"
6767
{
6868
PRINTF("0x%lX (%ld)", _status, _status);
6969
}
70-
PRINTF("\n");
70+
PRINTF("\r\n");
7171
}
7272
#else
7373
#define VERIFY_MESS(_status, _funcstr)

‎libraries/Adafruit_nRFCrypto

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ void setup()
4242
// SRAM usage required by SoftDevice will increase with number of connections
4343
Bluefruit.begin(1, 1);
4444
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
45-
Bluefruit.setName("Bluefruit52 duo");
4645

4746
// Callbacks for Peripheral
4847
Bluefruit.Periph.setConnectCallback(prph_connect_callback);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,6 @@ void setup()
790790
Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
791791

792792
Bluefruit.begin();
793-
Bluefruit.setName("Bluefruit52");
794793
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
795794

796795
// try to go as fast as possible, could be rejected by some central, increase it if needed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ char nibble_to_hex(uint8_t nibble) { // convert a 4-bit nibble to a hexadecimal
4040

4141
void setup()
4242
{
43-
Serial.begin(115200);
44-
while ( !Serial ) delay(10); // for nrf52840 with native usb
43+
// Serial.begin(115200);
44+
// while ( !Serial ) delay(10);
4545

4646
Serial.println("Bluefruit52 Color Advertising Example");
4747
Serial.println("----------------------------------------\n");

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ void setup()
3636

3737
Bluefruit.begin();
3838
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
39-
Bluefruit.setName("Bluefruit52");
4039

4140
// Set up and start advertising
4241
startAdv();

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ void setup()
4848
// off Blue LED for lowest power consumption
4949
Bluefruit.autoConnLed(false);
5050
Bluefruit.setTxPower(0); // Check bluefruit.h for supported values
51-
Bluefruit.setName("Bluefruit52");
5251

5352
// Manufacturer ID is required for Manufacturer Specific Data
5453
beacon.setManufacturer(MANUFACTURER_ID);

‎libraries/Bluefruit52Lib/examples/Peripheral/blemidi/blemidi.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ void setup()
5050
Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
5151

5252
Bluefruit.begin();
53-
Bluefruit.setName("Bluefruit52 MIDI");
5453
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
5554

5655
// Setup the on board blue LED to be enabled on CONNECT

‎libraries/Bluefruit52Lib/examples/Peripheral/bleuart/bleuart.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ void setup()
4545

4646
Bluefruit.begin();
4747
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
48-
Bluefruit.setName("Bluefruit52");
4948
//Bluefruit.setName(getMcuUniqueID()); // useful testing with multiple central connections
5049
Bluefruit.Periph.setConnectCallback(connect_callback);
5150
Bluefruit.Periph.setDisconnectCallback(disconnect_callback);

‎libraries/Bluefruit52Lib/examples/Peripheral/bleuart_multi/bleuart_multi.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void setup()
3737
// Initialize Bluefruit with max concurrent connections as Peripheral = 2, Central = 0
3838
Bluefruit.begin(MAX_PRPH_CONNECTION, 0);
3939
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
40-
Bluefruit.setName("Bluefruit52");
40+
4141
Bluefruit.Periph.setConnectCallback(connect_callback);
4242
Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
4343

‎libraries/Bluefruit52Lib/examples/Peripheral/blinky_ota/blinky_ota.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ void setup()
2727

2828
Bluefruit.begin();
2929
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
30-
Bluefruit.setName("Bluefruit52");
3130

3231
// To be consistent OTA DFU should be added first if it exists
3332
bledfu.begin();

‎libraries/Bluefruit52Lib/examples/Peripheral/bluefruit_playground/bluefruit_playground.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ void setup()
331331
Bluefruit.begin();
332332
Bluefruit.setTxPower(8); // Check bluefruit.h for supported values
333333
Bluefruit.setName(DEVICE_NAME);
334-
//Bluefruit.setName(getMcuUniqueID()); // useful testing with multiple central connections
335334
Bluefruit.Periph.setConnectCallback(connect_callback);
336335
Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
337336

‎libraries/Bluefruit52Lib/examples/Peripheral/controller/controller.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ void setup(void)
3838

3939
Bluefruit.begin();
4040
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
41-
Bluefruit.setName("Bluefruit52");
4241

4342
// To be consistent OTA DFU should be added first if it exists
4443
bledfu.begin();

‎libraries/Bluefruit52Lib/examples/Peripheral/custom_hrm/custom_hrm.ino

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ void setup()
3939
Serial.println("Initialise the Bluefruit nRF52 module");
4040
Bluefruit.begin();
4141

42-
// Set the advertised device name (keep it short!)
43-
Serial.println("Setting Device Name to 'Feather52 HRM'");
44-
Bluefruit.setName("Bluefruit52 HRM");
45-
4642
// Set the connect/disconnect callback handlers
4743
Bluefruit.Periph.setConnectCallback(connect_callback);
4844
Bluefruit.Periph.setDisconnectCallback(disconnect_callback);

‎libraries/Bluefruit52Lib/examples/Peripheral/custom_htm/custom_htm.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ void setup()
4242
// Initialise the Bluefruit module
4343
Serial.println("Initialise the Bluefruit nRF52 module");
4444
Bluefruit.begin();
45-
Bluefruit.setName("Bluefruit52");
4645

4746
// Set the connect/disconnect callback handlers
4847
Bluefruit.Periph.setConnectCallback(connect_callback);

‎libraries/Bluefruit52Lib/examples/Peripheral/eddystone_url/eddystone_url.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ void setup()
2828

2929
Bluefruit.begin();
3030
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
31-
Bluefruit.setName("Bluefruit52");
3231

3332
// Setup the advertising packet
3433
startAdv();

‎libraries/Bluefruit52Lib/examples/Peripheral/hid_camerashutter/hid_camerashutter.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ void setup()
4949

5050
Bluefruit.begin();
5151
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
52-
Bluefruit.setName("Bluefruit52");
5352

5453
// Configure and start DIS (Device Information Service)
5554
bledis.setManufacturer("Adafruit Industries");

‎libraries/Bluefruit52Lib/examples/Peripheral/hid_keyboard/hid_keyboard.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ void setup()
3636

3737
Bluefruit.begin();
3838
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
39-
Bluefruit.setName("Bluefruit52");
4039

4140
// Configure and Start Device Information Service
4241
bledis.setManufacturer("Adafruit Industries");

‎libraries/Bluefruit52Lib/examples/Peripheral/hid_keyscan/hid_keyscan.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ void setup()
5454

5555
Bluefruit.begin();
5656
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
57-
Bluefruit.setName("Bluefruit52");
5857

5958
// Configure and Start Device Information Service
6059
bledis.setManufacturer("Adafruit Industries");

‎libraries/Bluefruit52Lib/examples/Peripheral/hid_mouse/hid_mouse.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ void setup()
3838
// HID Device can have a min connection interval of 9*1.25 = 11.25 ms
3939
Bluefruit.Periph.setConnInterval(9, 16); // min = 9*1.25=11.25 ms, max = 16*1.25=20ms
4040
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
41-
Bluefruit.setName("Bluefruit52");
4241

4342
// Configure and Start Device Information Service
4443
bledis.setManufacturer("Adafruit Industries");

‎libraries/Bluefruit52Lib/examples/Peripheral/image_eink_transfer/image_eink_transfer.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void setup()
8585

8686
Bluefruit.begin();
8787
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
88-
Bluefruit.setName("Bluefruit52");
88+
8989
Bluefruit.Periph.setConnectCallback(connect_callback);
9090
Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
9191
Bluefruit.Periph.setConnInterval(6, 12); // 7.5 - 15 ms

‎libraries/Bluefruit52Lib/examples/Peripheral/image_transfer/image_transfer.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ void setup()
152152

153153
Bluefruit.begin();
154154
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
155-
Bluefruit.setName("Bluefruit52");
155+
156156
Bluefruit.Periph.setConnectCallback(connect_callback);
157157
Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
158158
Bluefruit.Periph.setConnInterval(6, 12); // 7.5 - 15 ms

‎libraries/Bluefruit52Lib/examples/Peripheral/neomatrix/neomatrix.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void setup()
8787
// Init Bluefruit
8888
Bluefruit.begin();
8989
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
90-
Bluefruit.setName("Bluefruit52");
90+
9191
Bluefruit.Periph.setConnectCallback(connect_callback);
9292

9393
// Configure and Start Device Information Service

‎libraries/Bluefruit52Lib/examples/Peripheral/neopixel/neopixel.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void setup()
7272
// Init Bluefruit
7373
Bluefruit.begin();
7474
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
75-
Bluefruit.setName("Bluefruit52");
75+
7676
Bluefruit.Periph.setConnectCallback(connect_callback);
7777

7878
// To be consistent OTA DFU should be added first if it exists

‎libraries/Bluefruit52Lib/examples/Peripheral/pairing_pin/pairing_pin.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ void setup()
4848

4949
Bluefruit.begin();
5050
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
51-
Bluefruit.setName("Bluefruit52");
5251

5352
Serial.println("Setting pairing PIN to: " PAIRING_PIN);
5453
Bluefruit.Security.setPIN(PAIRING_PIN);

‎libraries/Bluefruit52Lib/examples/Peripheral/rssi_callback/rssi_callback.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ void setup()
3535

3636
Bluefruit.begin();
3737
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
38-
Bluefruit.setName("Bluefruit52");
3938
Bluefruit.Periph.setConnectCallback(connect_callback);
4039
Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
4140

‎libraries/Bluefruit52Lib/examples/Peripheral/rssi_poll/rssi_poll.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ void setup()
3535

3636
Bluefruit.begin();
3737
Bluefruit.setTxPower(4); // Check bluefruit.h for supported values
38-
Bluefruit.setName("Bluefruit52");
3938
Bluefruit.Periph.setConnectCallback(connect_callback);
4039
Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
4140

‎libraries/Bluefruit52Lib/examples/Peripheral/tf4micro-motion-kit/.cluenrf52840.test.only

Whitespace-only changes.

‎libraries/Bluefruit52Lib/examples/Peripheral/tf4micro-motion-kit/.feather52840sense.test.only

Whitespace-only changes.

0 commit comments

Comments
 (0)