Skip to content

Commit f71ed97

Browse files
committed
Made Time, LiquidCrystal and RealTimeClockDisplaySensor example work in Arduino IDE 1.5.7.
1 parent 82dda0f commit f71ed97

File tree

5 files changed

+31
-31
lines changed

5 files changed

+31
-31
lines changed

libraries/LiquidCrystal/LCD.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ void LCD::createChar(uint8_t location, uint8_t charmap[])
304304
}
305305

306306
#ifdef __AVR__
307-
void LCD::createChar(uint8_t location, const prog_uchar charmap[])
307+
void LCD::createChar(uint8_t location, const unsigned char charmap[])
308308
{
309309
location &= 0x7; // we only have 8 memory locations 0-7
310310

libraries/LiquidCrystal/LCD.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ class LCD : public Print
418418
(0 to 7)
419419
@param charmap[in] the bitmap array representing each row of the character.
420420
*/
421-
void createChar(uint8_t location, const prog_uchar charmap[]);
421+
void createChar(uint8_t location, const unsigned char charmap[]);
422422
#endif // __AVR__
423423

424424
/*!

libraries/MySensors/MyConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
/***
1919
* Enable/Disable debug logging
2020
*/
21-
//#define DEBUG
21+
#define DEBUG
2222

2323
#endif

libraries/MySensors/examples/EthernetGateway/EthernetGateway.ino

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
* 7 Radio error LED (optional) +5V -> LED -> 270-330 Ohm resistor -> pin 7.
4343
* 6 Radio SPI Slave Select
4444
* 5 Radio Chip Enable
45-
* 3 Inclusion mode button (optional), 10K pull down to GND, button to VCC)
46-
* 2 Radio IRQ pin (optional), W5100 Int, if linked to pin 2)
45+
* 3 Inclusion mode button (optional) GND-> Button -> Pin3
46+
* 2 Radio IRQ pin (optional)
4747
* -----------------------------------------------------------------------------------------------------------
4848
* Powering: both NRF24l01 radio and Ethernet(ENC28J60) uses 3.3V
4949
*/
@@ -58,10 +58,10 @@
5858

5959

6060
// Use this if you have attached a Ethernet ENC28J60 shields
61-
#include <UIPEthernet.h>
61+
//#include <UIPEthernet.h>
6262

6363
// Use this fo WizNET module and Arduino Ethernet Shield
64-
//#include <Ethernet.h>
64+
#include <Ethernet.h>
6565

6666

6767
#define INCLUSION_MODE_TIME 1 // Number of minutes inclusion mode is enabled

libraries/Time/DateStrings.cpp

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,38 @@
1515

1616
static char buffer[dt_MAX_STRING_LEN+1]; // must be big enough for longest string and the terminating null
1717

18-
char monthStr1[] PROGMEM = "January";
19-
char monthStr2[] PROGMEM = "February";
20-
char monthStr3[] PROGMEM = "March";
21-
char monthStr4[] PROGMEM = "April";
22-
char monthStr5[] PROGMEM = "May";
23-
char monthStr6[] PROGMEM = "June";
24-
char monthStr7[] PROGMEM = "July";
25-
char monthStr8[] PROGMEM = "August";
26-
char monthStr9[] PROGMEM = "September";
27-
char monthStr10[] PROGMEM = "October";
28-
char monthStr11[] PROGMEM = "November";
29-
char monthStr12[] PROGMEM = "December";
18+
const char monthStr1[] PROGMEM = "January";
19+
const char monthStr2[] PROGMEM = "February";
20+
const char monthStr3[] PROGMEM = "March";
21+
const char monthStr4[] PROGMEM = "April";
22+
const char monthStr5[] PROGMEM = "May";
23+
const char monthStr6[] PROGMEM = "June";
24+
const char monthStr7[] PROGMEM = "July";
25+
const char monthStr8[] PROGMEM = "August";
26+
const char monthStr9[] PROGMEM = "September";
27+
const char monthStr10[] PROGMEM = "October";
28+
const char monthStr11[] PROGMEM = "November";
29+
const char monthStr12[] PROGMEM = "December";
3030

31-
PGM_P monthNames_P[] PROGMEM =
31+
PGM_P const monthNames_P[] PROGMEM =
3232
{
3333
"",monthStr1,monthStr2,monthStr3,monthStr4,monthStr5,monthStr6,
3434
monthStr7,monthStr8,monthStr9,monthStr10,monthStr11,monthStr12
3535
};
3636

37-
char monthShortNames_P[] PROGMEM = "ErrJanFebMarAprMayJunJulAugSepOctNovDec";
37+
const char monthShortNames_P[] PROGMEM = "ErrJanFebMarAprMayJunJulAugSepOctNovDec";
3838

39-
char dayStr0[] PROGMEM = "Err";
40-
char dayStr1[] PROGMEM = "Sunday";
41-
char dayStr2[] PROGMEM = "Monday";
42-
char dayStr3[] PROGMEM = "Tuesday";
43-
char dayStr4[] PROGMEM = "Wednesday";
44-
char dayStr5[] PROGMEM = "Thursday";
45-
char dayStr6[] PROGMEM = "Friday";
46-
char dayStr7[] PROGMEM = "Saturday";
39+
const char dayStr0[] PROGMEM = "Err";
40+
const char dayStr1[] PROGMEM = "Sunday";
41+
const char dayStr2[] PROGMEM = "Monday";
42+
const char dayStr3[] PROGMEM = "Tuesday";
43+
const char dayStr4[] PROGMEM = "Wednesday";
44+
const char dayStr5[] PROGMEM = "Thursday";
45+
const char dayStr6[] PROGMEM = "Friday";
46+
const char dayStr7[] PROGMEM = "Saturday";
4747

48-
PGM_P dayNames_P[] PROGMEM = { dayStr0,dayStr1,dayStr2,dayStr3,dayStr4,dayStr5,dayStr6,dayStr7};
49-
char dayShortNames_P[] PROGMEM = "ErrSunMonTueWedThrFriSat";
48+
PGM_P const dayNames_P[] PROGMEM = { dayStr0,dayStr1,dayStr2,dayStr3,dayStr4,dayStr5,dayStr6,dayStr7};
49+
const char dayShortNames_P[] PROGMEM = "ErrSunMonTueWedThrFriSat";
5050

5151
/* functions to return date strings */
5252

0 commit comments

Comments
 (0)