Merge pull request #1 from dcgrigsby/master

Arduino 1.6 compatibility
robinhedwards · Sep 11, 2015 · 9356f83 · 9356f83
2 parents d987192 + 0011460
commit 9356f83
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 30 deletions.
diff --git a/PS2Keyboard.zip b/PS2Keyboard.zip
diff --git a/SSD1306ASCII.zip b/SSD1306ASCII.zip
diff --git a/arduino_BASIC.ino b/arduino_BASIC.ino
@@ -44,7 +44,7 @@ unsigned char mem[MEMORY_SIZE];
 #define TOKEN_BUF_SIZE    64
 unsigned char tokenBuf[TOKEN_BUF_SIZE];
 
-prog_char welcomeStr[] PROGMEM = "Arduino BASIC";
+const char welcomeStr[] PROGMEM = "Arduino BASIC";
 char autorun = 0;
 
 void setup() {

diff --git a/basic.cpp b/basic.cpp
@@ -61,33 +61,34 @@ int sysSTACKSTART, sysSTACKEND;
 int sysVARSTART, sysVAREND;
 int sysGOSUBSTART, sysGOSUBEND;
 
-prog_char string_0[] PROGMEM = "OK";
-prog_char string_1[] PROGMEM = "Bad number";
-prog_char string_2[] PROGMEM = "Line too long";
-prog_char string_3[] PROGMEM = "Unexpected input";
-prog_char string_4[] PROGMEM = "Unterminated string";
-prog_char string_5[] PROGMEM = "Missing bracket";
-prog_char string_6[] PROGMEM = "Error in expr";
-prog_char string_7[] PROGMEM = "Numeric expr expected";
-prog_char string_8[] PROGMEM = "String expr expected";
-prog_char string_9[] PROGMEM = "Line number too big";
-prog_char string_10[] PROGMEM = "Out of memory";
-prog_char string_11[] PROGMEM = "Div by zero";
-prog_char string_12[] PROGMEM = "Variable not found";
-prog_char string_13[] PROGMEM = "Bad command";
-prog_char string_14[] PROGMEM = "Bad line number";
-prog_char string_15[] PROGMEM = "Break pressed";
-prog_char string_16[] PROGMEM = "NEXT without FOR";
-prog_char string_17[] PROGMEM = "STOP statement";
-prog_char string_18[] PROGMEM = "Missing THEN in IF";
-prog_char string_19[] PROGMEM = "RETURN without GOSUB";
-prog_char string_20[] PROGMEM = "Wrong array dims";
-prog_char string_21[] PROGMEM = "Bad array index";
-prog_char string_22[] PROGMEM = "Bad string index";
-prog_char string_23[] PROGMEM = "Error in VAL input";
-prog_char string_24[] PROGMEM = "Bad parameter";
-
-PROGMEM const char *errorTable[] = {
+const char string_0[] PROGMEM = "OK";
+const char string_1[] PROGMEM = "Bad number";
+const char string_2[] PROGMEM = "Line too long";
+const char string_3[] PROGMEM = "Unexpected input";
+const char string_4[] PROGMEM = "Unterminated string";
+const char string_5[] PROGMEM = "Missing bracket";
+const char string_6[] PROGMEM = "Error in expr";
+const char string_7[] PROGMEM = "Numeric expr expected";
+const char string_8[] PROGMEM = "String expr expected";
+const char string_9[] PROGMEM = "Line number too big";
+const char string_10[] PROGMEM = "Out of memory";
+const char string_11[] PROGMEM = "Div by zero";
+const char string_12[] PROGMEM = "Variable not found";
+const char string_13[] PROGMEM = "Bad command";
+const char string_14[] PROGMEM = "Bad line number";
+const char string_15[] PROGMEM = "Break pressed";
+const char string_16[] PROGMEM = "NEXT without FOR";
+const char string_17[] PROGMEM = "STOP statement";
+const char string_18[] PROGMEM = "Missing THEN in IF";
+const char string_19[] PROGMEM = "RETURN without GOSUB";
+const char string_20[] PROGMEM = "Wrong array dims";
+const char string_21[] PROGMEM = "Bad array index";
+const char string_22[] PROGMEM = "Bad string index";
+const char string_23[] PROGMEM = "Error in VAL input";
+const char string_24[] PROGMEM = "Bad parameter";
+
+//PROGMEM const char *errorTable[] = {
+const char* const errorTable[] PROGMEM = {
     string_0, string_1, string_2, string_3,
     string_4, string_5, string_6, string_7,
     string_8, string_9, string_10, string_11,

diff --git a/basic.h b/basic.h
@@ -132,7 +132,9 @@ typedef struct {
 } 
 TokenTableEntry;
 
-extern const char *errorTable[];
+//extern const char *errorTable[];
+extern const char* const errorTable[];
+
 
 void reset();
 int tokenize(unsigned char *input, unsigned char *output, int outputSize);

diff --git a/host.cpp b/host.cpp
@@ -18,7 +18,7 @@ char inputMode = 0;
 char inkeyChar = 0;
 char buzPin = 0;
 
-prog_char bytesFreeStr[] PROGMEM = "bytes free";
+const char bytesFreeStr[] PROGMEM = "bytes free";
 
 void initTimer() {
     noInterrupts();           // disable all interrupts