Skip to content

Commit ba707f5

Browse files
authored
Merge pull request chipKIT32#341 from chipKIT32/lrs_1.4.1_20170412
Lrs 1.4.1 20170412
2 parents 751fedb + b00d1d9 commit ba707f5

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

pic32/cores/pic32/Print.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ size_t Print::print(const String &s)
4545
}
4646

4747
size_t Print::print(const __FlashStringHelper *s) {
48-
print((const char *)s);
48+
return print((const char *)s);
4949
}
5050

5151
size_t Print::print(const char str[])
@@ -120,7 +120,7 @@ size_t Print::println(const String &s)
120120
}
121121

122122
size_t Print::println(const __FlashStringHelper *s) {
123-
println((const char *)s);
123+
return println((const char *)s);
124124
}
125125

126126
size_t Print::println(const char c[])

pic32/cores/pic32/Printable.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
#ifndef Printable_h
2121
#define Printable_h
2222

23+
#include <string.h>
24+
2325
class Print;
2426

2527
/** The Printable class provides a way for new classes to allow themselves to be printed.

pic32/variants/ChipKIT_Pi/Board_Data.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ const uint8_t external_int_to_digital_pin_PGM[] = {
378378
** reset and before the user sketch is run.
379379
*/
380380
#if (OPT_BOARD_INIT != 0)
381-
381+
extern void _disableSeconaryOscillator(void);
382382
void _board_init(void) {
383383
_disableSeconaryOscillator();
384384
}

pic32/variants/Clicker2/Board_Defs.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,10 @@
196196
** the default SPI port as it's pin numbers stay constant on all
197197
** devices.
198198
*/
199-
const static uint8_t SS = 71;
200-
const static uint8_t MOSI = 74;
201-
const static uint8_t MISO = 73;
202-
const static uint8_t SCK = 72;
199+
static const uint8_t SS = 71;
200+
static const uint8_t MOSI = 74;
201+
static const uint8_t MISO = 73;
202+
static const uint8_t SCK = 72;
203203

204204
/* The Digilent DSPI library uses these ports.
205205
*/

pic32/variants/openbci/Board_Data.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ const uint16_t digital_pin_to_bit_mask_PGM[] = {
165165
** compare number, input capture number, and timer external clock
166166
** input associated with that pin.
167167
*/
168-
const uint8_t digital_pin_to_timer_PGM[] = {
168+
const uint16_t digital_pin_to_timer_PGM[] = {
169169
// Pins 0 through 18
170170
NOT_ON_TIMER, // 0 J4-1 RB5 USB TMS/RPB5/USBID/RB5
171171
NOT_ON_TIMER, // 1 J4-2 RB7 INT0 TDI/RPB7/CTED3/PMD5/INT0/RB7
@@ -374,7 +374,7 @@ const uint8_t external_int_to_digital_pin_PGM[] = {
374374
** reset and before the user sketch is run.
375375
*/
376376
#if (OPT_BOARD_INIT != 0)
377-
377+
extern void _disableSeconaryOscillator(void);
378378
void _board_init(void) {
379379
_disableSeconaryOscillator();
380380
}

0 commit comments

Comments
 (0)