Merge branch 'arduino-1.6.3'

irkit · Apr 6, 2015 · 0829db3 · 0829db3
2 parents fcf2b6b + 70c224c
commit 0829db3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/firmware/src/IRKit/cert.h b/firmware/src/IRKit/cert.h
@@ -20,7 +20,7 @@
 #include "GSwifi_const.h"
 
 // deviceapi.getirkit.com
-prog_uchar der[] PROGMEM = {
+const unsigned char der[] PROGMEM = {
     ESCAPE, 'W',
     0x30, 0x82, 0x2, 0xed, 0x30, 0x82, 0x2, 0x56,
     0xa0, 0x3, 0x2, 0x1, 0x2, 0x2, 0x9, 0x0,

diff --git a/firmware/src/IRKit/pgmStrToRAM.c b/firmware/src/IRKit/pgmStrToRAM.c
@@ -26,7 +26,7 @@
 // choose different index to use simultaneously
 char to_print[2][PROGMEM_CACHE_SIZE];
 
-char *pgmStrToRAM(PROGMEM char *theString, uint8_t index) {
+char *pgmStrToRAM(const PROGMEM char *theString, uint8_t index) {
     strcpy_P( to_print[ index ], theString );
     return to_print[index];
 }
diff --git a/firmware/src/IRKit/pgmStrToRAM.h b/firmware/src/IRKit/pgmStrToRAM.h
@@ -26,7 +26,7 @@
 extern "C" {
 #endif
 
-char *pgmStrToRAM(PROGMEM char *theString, uint8_t index);
+char *pgmStrToRAM(const PROGMEM char *theString, uint8_t index);
 
 #ifdef __cplusplus
 }