Skip to content
This repository was archived by the owner on Feb 4, 2023. It is now read-only.

Commit 9b46277

Browse files
authored
Update Packages_Patches
1 parent 39c57a1 commit 9b46277

File tree

48 files changed

+3369
-1375
lines changed

Some content is hidden

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

48 files changed

+3369
-1375
lines changed

Packages_Patches/adafruit/hardware/samd/1.5.14/cores/arduino/Print.cpp

Lines changed: 105 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,15 @@
3636
size_t Print::write(const uint8_t *buffer, size_t size)
3737
{
3838
size_t n = 0;
39-
while (size--) {
40-
if (write(*buffer++)) n++;
41-
else break;
39+
40+
while (size--)
41+
{
42+
if (write(*buffer++))
43+
n++;
44+
else
45+
break;
4246
}
47+
4348
return n;
4449
}
4550

@@ -80,46 +85,64 @@ size_t Print::print(unsigned int n, int base)
8085

8186
size_t Print::print(long n, int base)
8287
{
83-
if (base == 0) {
88+
if (base == 0)
89+
{
8490
return write(n);
85-
} else if (base == 10) {
86-
if (n < 0) {
91+
}
92+
else if (base == 10)
93+
{
94+
if (n < 0)
95+
{
8796
int t = print('-');
8897
n = -n;
8998
return printNumber(n, 10) + t;
9099
}
100+
91101
return printNumber(n, 10);
92-
} else {
102+
}
103+
else
104+
{
93105
return printNumber(n, base);
94106
}
95107
}
96108

97109
size_t Print::print(unsigned long n, int base)
98110
{
99-
if (base == 0) return write(n);
100-
else return printNumber(n, base);
111+
if (base == 0)
112+
return write(n);
113+
else
114+
return printNumber(n, base);
101115
}
102116

103117
size_t Print::print(long long n, int base)
104118
{
105-
if (base == 0) {
119+
if (base == 0)
120+
{
106121
return write(n);
107-
} else if (base == 10) {
108-
if (n < 0) {
122+
}
123+
else if (base == 10)
124+
{
125+
if (n < 0)
126+
{
109127
int t = print('-');
110128
n = -n;
111129
return printULLNumber(n, 10) + t;
112130
}
131+
113132
return printULLNumber(n, 10);
114-
} else {
133+
}
134+
else
135+
{
115136
return printULLNumber(n, base);
116137
}
117138
}
118139

119140
size_t Print::print(unsigned long long n, int base)
120141
{
121-
if (base == 0) return write(n);
122-
else return printULLNumber(n, base);
142+
if (base == 0)
143+
return write(n);
144+
else
145+
return printULLNumber(n, base);
123146
}
124147

125148
size_t Print::print(double n, int digits)
@@ -253,38 +276,40 @@ size_t Print::printNumber(unsigned long n, uint8_t base)
253276
*str = '\0';
254277

255278
// prevent crash if called with base == 1
256-
if (base < 2) base = 10;
279+
if (base < 2)
280+
base = 10;
257281

258-
do {
282+
do
283+
{
259284
char c = n % base;
260285
n /= base;
261286

262287
*--str = c < 10 ? c + '0' : c + 'A' - 10;
263-
} while(n);
288+
} while (n);
264289

265290
return write(str);
266291
}
267292

268293
// REFERENCE IMPLEMENTATION FOR ULL
269294
// size_t Print::printULLNumber(unsigned long long n, uint8_t base)
270295
// {
271-
// // if limited to base 10 and 16 the bufsize can be smaller
272-
// char buf[65];
273-
// char *str = &buf[64];
296+
// // if limited to base 10 and 16 the bufsize can be smaller
297+
// char buf[65];
298+
// char *str = &buf[64];
274299

275-
// *str = '\0';
300+
// *str = '\0';
276301

277-
// // prevent crash if called with base == 1
278-
// if (base < 2) base = 10;
302+
// // prevent crash if called with base == 1
303+
// if (base < 2) base = 10;
279304

280-
// do {
281-
// unsigned long long t = n / base;
282-
// char c = n - t * base; // faster than c = n%base;
283-
// n = t;
284-
// *--str = c < 10 ? c + '0' : c + 'A' - 10;
285-
// } while(n);
305+
// do {
306+
// unsigned long long t = n / base;
307+
// char c = n - t * base; // faster than c = n%base;
308+
// n = t;
309+
// *--str = c < 10 ? c + '0' : c + 'A' - 10;
310+
// } while(n);
286311

287-
// return write(str);
312+
// return write(str);
288313
// }
289314

290315
// FAST IMPLEMENTATION FOR ULL
@@ -296,11 +321,13 @@ size_t Print::printULLNumber(unsigned long long n64, uint8_t base)
296321
uint8_t innerLoops = 0;
297322

298323
// prevent crash if called with base == 1
299-
if (base < 2) base = 10;
324+
if (base < 2)
325+
base = 10;
300326

301327
// process chunks that fit in "16 bit math".
302328
uint16_t top = 0xFFFF / base;
303329
uint16_t th16 = 1;
330+
304331
while (th16 < top)
305332
{
306333
th16 *= base;
@@ -311,31 +338,33 @@ size_t Print::printULLNumber(unsigned long long n64, uint8_t base)
311338
{
312339
// 64 bit math part
313340
uint64_t q = n64 / th16;
314-
uint16_t r = n64 - q*th16;
341+
uint16_t r = n64 - q * th16;
315342
n64 = q;
316343

317344
// 16 bit math loop to do remainder. (note buffer is filled reverse)
318-
for (uint8_t j=0; j < innerLoops; j++)
345+
for (uint8_t j = 0; j < innerLoops; j++)
319346
{
320-
uint16_t qq = r/base;
321-
buf[i++] = r - qq*base;
347+
uint16_t qq = r / base;
348+
buf[i++] = r - qq * base;
322349
r = qq;
323350
}
324351
}
325352

326353
uint16_t n16 = n64;
354+
327355
while (n16 > 0)
328356
{
329-
uint16_t qq = n16/base;
330-
buf[i++] = n16 - qq*base;
357+
uint16_t qq = n16 / base;
358+
buf[i++] = n16 - qq * base;
331359
n16 = qq;
332360
}
333361

334362
size_t bytes = i;
363+
335364
for (; i > 0; i--)
336365
write((char) (buf[i - 1] < 10 ?
337-
'0' + buf[i - 1] :
338-
'A' + buf[i - 1] - 10));
366+
'0' + buf[i - 1] :
367+
'A' + buf[i - 1] - 10));
339368

340369
return bytes;
341370
}
@@ -347,21 +376,29 @@ size_t Print::printFloat(double number, int digits)
347376

348377
size_t n = 0;
349378

350-
if (isnan(number)) return print("nan");
351-
if (isinf(number)) return print("inf");
352-
if (number > 4294967040.0) return print ("ovf"); // constant determined empirically
353-
if (number <-4294967040.0) return print ("ovf"); // constant determined empirically
379+
if (isnan(number))
380+
return print("nan");
381+
382+
if (isinf(number))
383+
return print("inf");
384+
385+
if (number > 4294967040.0)
386+
return print ("ovf"); // constant determined empirically
387+
388+
if (number < -4294967040.0)
389+
return print ("ovf"); // constant determined empirically
354390

355391
// Handle negative numbers
356392
if (number < 0.0)
357393
{
358-
n += print('-');
359-
number = -number;
394+
n += print('-');
395+
number = -number;
360396
}
361397

362398
// Round correctly so that print(1.999, 2) prints as "2.00"
363399
double rounding = 0.5;
364-
for (uint8_t i=0; i<digits; ++i)
400+
401+
for (uint8_t i = 0; i < digits; ++i)
365402
rounding /= 10.0;
366403

367404
number += rounding;
@@ -372,7 +409,8 @@ size_t Print::printFloat(double number, int digits)
372409
n += print(int_part);
373410

374411
// Print the decimal point, but only if there are digits beyond
375-
if (digits > 0) {
412+
if (digits > 0)
413+
{
376414
n += print(".");
377415
}
378416

@@ -390,31 +428,39 @@ size_t Print::printFloat(double number, int digits)
390428

391429
size_t Print::printBuffer(uint8_t const buffer[], int len, char delim, int byteline)
392430
{
393-
if (buffer == NULL || len == 0) return 0;
431+
if (buffer == NULL || len == 0)
432+
return 0;
394433

395-
for(int i=0; i<len; i++)
434+
for (int i = 0; i < len; i++)
396435
{
397-
if ( i != 0 ) print(delim);
398-
if ( byteline && (i%byteline == 0) ) println();
436+
if ( i != 0 )
437+
print(delim);
438+
439+
if ( byteline && (i % byteline == 0) )
440+
println();
399441

400442
this->printf("%02X", buffer[i]);
401443
}
402444

403-
return (len*3 - 1);
445+
return (len * 3 - 1);
404446
}
405447

406448
size_t Print::printBufferReverse(uint8_t const buffer[], int len, char delim, int byteline)
407449
{
408-
if (buffer == NULL || len == 0) return 0;
450+
if (buffer == NULL || len == 0)
451+
return 0;
409452

410-
for(int i=0; i<len; i++)
453+
for (int i = 0; i < len; i++)
411454
{
412-
if (i != 0) print(delim);
413-
if ( byteline && (i%byteline == 0) ) println();
455+
if (i != 0)
456+
print(delim);
457+
458+
if ( byteline && (i % byteline == 0) )
459+
println();
414460

415-
this->printf("%02X", buffer[len-1-i]);
461+
this->printf("%02X", buffer[len - 1 - i]);
416462
}
417463

418-
return (len*3 - 1);
464+
return (len * 3 - 1);
419465
}
420466

Packages_Patches/adafruit/hardware/samd/1.5.14/cores/arduino/Print.h

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,42 @@ class Print
3737
size_t printULLNumber(unsigned long long, uint8_t);
3838
size_t printFloat(double, int);
3939
protected:
40-
void setWriteError(int err = 1) { write_error = err; }
40+
void setWriteError(int err = 1)
41+
{
42+
write_error = err;
43+
}
4144
public:
4245
Print() : write_error(0) {}
4346

44-
int getWriteError() { return write_error; }
45-
void clearWriteError() { setWriteError(0); }
47+
int getWriteError()
48+
{
49+
return write_error;
50+
}
51+
void clearWriteError()
52+
{
53+
setWriteError(0);
54+
}
4655

4756
virtual size_t write(uint8_t) = 0;
48-
size_t write(const char *str) {
49-
if (str == NULL) return 0;
57+
size_t write(const char *str)
58+
{
59+
if (str == NULL)
60+
return 0;
61+
5062
return write((const uint8_t *)str, strlen(str));
5163
}
5264
virtual size_t write(const uint8_t *buffer, size_t size);
53-
size_t write(const char *buffer, size_t size) {
65+
size_t write(const char *buffer, size_t size)
66+
{
5467
return write((const uint8_t *)buffer, size);
5568
}
5669

5770
// default to zero, meaning "a single write may block"
5871
// should be overridden by subclasses with buffering
59-
virtual int availableForWrite() { return 0; }
72+
virtual int availableForWrite()
73+
{
74+
return 0;
75+
}
6076

6177
size_t print(const __FlashStringHelper *);
6278
size_t print(const String &);
@@ -86,17 +102,17 @@ class Print
86102
size_t println(double, int = 2);
87103
size_t println(const Printable&);
88104
size_t println(void);
89-
105+
90106
size_t printf(const char * format, ...);
91-
92-
size_t printBuffer(uint8_t const buffer[], int len, char delim=' ', int byteline = 0);
93-
size_t printBuffer(char const buffer[], int size, char delim=' ', int byteline = 0)
107+
108+
size_t printBuffer(uint8_t const buffer[], int len, char delim = ' ', int byteline = 0);
109+
size_t printBuffer(char const buffer[], int size, char delim = ' ', int byteline = 0)
94110
{
95111
return printBuffer((uint8_t const*) buffer, size, delim, byteline);
96112
}
97113

98-
size_t printBufferReverse(uint8_t const buffer[], int len, char delim=' ', int byteline = 0);
99-
size_t printBufferReverse(char const buffer[], int size, char delim=' ', int byteline = 0)
114+
size_t printBufferReverse(uint8_t const buffer[], int len, char delim = ' ', int byteline = 0);
115+
size_t printBufferReverse(char const buffer[], int size, char delim = ' ', int byteline = 0)
100116
{
101117
return printBufferReverse((uint8_t const*) buffer, size, delim, byteline);
102118
}

0 commit comments

Comments
 (0)