Release 1.3 fileset

slviajero · Aug 6, 2022 · 880f378 · 880f378
1 parent e9e4889
commit 880f378
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/TinybasicArduino/TinybasicArduino.ino b/TinybasicArduino/TinybasicArduino.ino
@@ -45,7 +45,7 @@
  * BASICTINYWITHFLOAT: a floating point tinybasic
  * BASICMINIMAL: minimal language
  */
-#undef  BASICFULL
+#undef   BASICFULL
 #define   BASICINTEGER
 #undef   BASICMINIMAL
 #undef   BASICTINYWITHFLOAT
@@ -2386,6 +2386,7 @@ void memwrite2(address_t a, mem_t c) {
 
 /* get a token from memory */
 void gettoken() {
+	int i;
 
 /* if we have reached the end of the program, EOL is always returned
 		we don't rely on mem having a trailing EOL */
@@ -2429,11 +2430,11 @@ void gettoken() {
  * the string constant length to the length of the input buffer
  */
 #if defined(USEMEMINTERFACE)
-			for(int i=0; i<x; i++) spistrbuf1[i]=memread(here+i);
+			for(i=0; i<x; i++) spistrbuf1[i]=memread(here+i);
 			ir=spistrbuf1;
 #else
 			if (st == SERUN) { 					
-				for(int i=0; i<x; i++) ibuffer[i]=memread(here+i);	
+				for(i=0; i<x; i++) ibuffer[i]=memread(here+i);	
 				ir=ibuffer;
 			} else {
 				ir=(char*)&mem[here]; 
@@ -2475,7 +2476,7 @@ void nextline() {
 #if defined(LINECACHESIZE) && LINECACHESIZE>0
 const unsigned char linecachedepth = LINECACHESIZE;
 typedef struct {address_t l; address_t h;} linecacheentry;
-linecacheentry linecache[linecachedepth];
+linecacheentry linecache[LINECACHESIZE];
 unsigned char linecachehere = 0;
 
 void clrlinecache() {

diff --git a/TinybasicArduino/basic.h b/TinybasicArduino/basic.h
@@ -975,7 +975,11 @@ short wireavailable();
 /* RF24 radio input */
 int radiostat(char);
 void radioset(int);
+#if defined(ARDUINO)
 uint64_t pipeaddr(char*);
+#else
+long pipeaddr(char*);
+#endif
 void iradioopen(char*);
 void oradioopen(char*);
 void radioins(char*, short);

diff --git a/TinybasicArduino/hardware-arduino.h b/TinybasicArduino/hardware-arduino.h
@@ -77,7 +77,7 @@
 #undef ARDUINORTC
 #undef ARDUINOWIRE
 #undef ARDUINOWIRESLAVE
-#define ARDUINORF24
+#undef ARDUINORF24
 #undef ARDUINOETH
 #undef ARDUINOMQTT
 #undef ARDUINOSENSORS

diff --git a/basic.h b/basic.h
@@ -975,7 +975,7 @@ short wireavailable();
 /* RF24 radio input */
 int radiostat(char);
 void radioset(int);
-#ifndef MSDOS
+#if defined(ARDUINO)
 uint64_t pipeaddr(char*);
 #else
 long pipeaddr(char*);

diff --git a/hardware-arduino.h b/hardware-arduino.h
@@ -77,7 +77,7 @@
 #undef ARDUINORTC
 #undef ARDUINOWIRE
 #undef ARDUINOWIRESLAVE
-#define ARDUINORF24
+#undef ARDUINORF24
 #undef ARDUINOETH
 #undef ARDUINOMQTT
 #undef ARDUINOSENSORS

diff --git a/hardware-posix.h b/hardware-posix.h
@@ -284,7 +284,7 @@ void pinm(number_t p, number_t m){
 void delay(number_t t) {usleep(t*1000);}
 #endif
 // ms style stuff
-#if defined(MINGW) || defined(MSDOS)
+#if defined(MINGW)
 void delay(number_t t) {Sleep(t);}
 #endif