resolve FLASH_STR ifdef snafu

tve · tve · commit 1c6ab8dbe6c6 · 2016-04-17T10:24:44.000-07:00
diff --git a/Makefile b/Makefile
@@ -1841,7 +1841,7 @@ wiflash: all $(USER1_BIN) $(USER2_BIN)
 ifndef ESPHOSTNAME
 	$(error "In order to flash over wifi, we need to have the ESPHOSTNAME variable defined")
 endif
-	./scripts/wiflash $(ESPHOSTNAME) $(USER1_BIN) $(USER2_BIN)
+	./scripts/wiflash.sh $(ESPHOSTNAME) $(USER1_BIN) $(USER2_BIN)
 
 #else ifdef WICED
 #
diff --git a/src/jsinteractive.c b/src/jsinteractive.c
@@ -185,7 +185,7 @@ NO_INLINE void jsiConsolePrintString(const char *str) {
   }
 }
 
-#ifdef FLASH_STR
+#ifdef USE_FLASH_MEMORY
 // internal version that copies str from flash to an internal buffer
 NO_INLINE void jsiConsolePrintString_int(const char *str) {
   size_t len = flash_strlen(str);
@@ -199,7 +199,7 @@ NO_INLINE void jsiConsolePrintString_int(const char *str) {
  * Perform a printf to the console.
  * Execute a printf command to the current JS console.
  */
-#ifndef FLASH_STR
+#ifndef USE_FLASH_MEMORY
 void jsiConsolePrintf(const char *fmt, ...) {
   va_list argp;
   va_start(argp, fmt);
diff --git a/src/jsinteractive.h b/src/jsinteractive.h
@@ -67,7 +67,7 @@ IOEventFlags jsiGetConsoleDevice();
 void jsiConsolePrintChar(char data);
 /// Transmit a string (may be any string)
 void jsiConsolePrintString(const char *str);
-#ifndef FLASH_STR
+#ifndef USE_FLASH_MEMORY
 #define jsiConsolePrint jsiConsolePrintString
 /// Write the formatted string to the console (see vcbprintf)
 void jsiConsolePrintf(const char *fmt, ...);
diff --git a/src/jsutils.c b/src/jsutils.c
@@ -162,7 +162,7 @@ long long stringToInt(const char *s) {
   return stringToIntWithRadix(s,0,0);
 }
 
-#ifndef FLASH_STR
+#ifndef USE_FLASH_MEMORY
 
 // JsError, jsWarn, jsExceptionHere implementations that expect the format string to be in normal
 // RAM where is can be accessed normally.
@@ -313,7 +313,7 @@ NO_INLINE void jsAssertFail(const char *file, int line, const char *expr) {
   inAssertFail = true;
   jsiConsoleRemoveInputLine();
   if (expr) {
-#ifndef FLASH_STR
+#ifndef USE_FLASH_MEMORY
     jsiConsolePrintf("ASSERT(%s) FAILED AT ", expr);
 #else
     jsiConsolePrintString("ASSERT(");
@@ -350,7 +350,7 @@ NO_INLINE void jsAssertFail(const char *file, int line, const char *expr) {
   inAssertFail = false;
 }
 
-#ifdef FLASH_STR
+#ifdef USE_FLASH_MEMORY
 // Helpers to deal with constant strings stored in flash that have to be accessed using word-aligned
 // and word-sized reads
 
diff --git a/src/jsutils.h b/src/jsutils.h
@@ -43,6 +43,9 @@
 
 #if defined(ESP8266)
 
+// Use this in #ifdef to select flash/non-flash code
+#define USE_FLASH_MEMORY
+
 // For the esp8266 we need the posibility to store arrays in flash, because mem is so small
 #define IN_FLASH_MEMORY   __attribute__((section(".irom.literal"))) __attribute__((aligned(4)))
 
@@ -70,9 +73,13 @@ int flash_strcmp(const char *mem, const char *flash);
 
 #else
 
+#undef USE_FLASH_MEMORY
+
 // On non-ESP8266, const stuff goes in flash memory anyway
 #define IN_FLASH_MEMORY
 
+#define FLASH_STR(name, x) static const char name[] = x
+
 /** Read a uint8_t from this pointer, which could be in RAM or Flash.
     On ARM this is just a standard read, it's different on ESP8266 */
 #define READ_FLASH_UINT8(ptr) (*(uint8_t*)(ptr))
@@ -232,7 +239,7 @@ typedef int64_t JsSysTime;
 #define JSPARSE_MODULE_CACHE_NAME "modules"
 
 #if !defined(NO_ASSERT)
- #ifdef FLASH_STR
+ #ifdef USE_FLASH_MEMORY
    // Place assert strings into flash to save RAM
    #define assert(X) do { \
      FLASH_STR(flash_X, __STRING(X)); \
@@ -361,7 +368,7 @@ typedef enum {
 
 void jsAssertFail(const char *file, int line, const char *expr);
 
-#ifndef FLASH_STR
+#ifndef USE_FLASH_MEMORY
 // Normal functions thet place format string in ram
 void jsExceptionHere(JsExceptionType type, const char *fmt, ...);
 void jsError(const char *fmt, ...);

Original file line number	Diff line number	Diff line change
`@@ -1841,7 +1841,7 @@ wiflash: all $(USER1_BIN) $(USER2_BIN)`
`1841`	`1841`	`ifndef ESPHOSTNAME`
`1842`	`1842`	`$(error "In order to flash over wifi, we need to have the ESPHOSTNAME variable defined")`
`1843`	`1843`	`endif`
`1844`		`- ./scripts/wiflash $(ESPHOSTNAME) $(USER1_BIN) $(USER2_BIN)`
	`1844`	`+ ./scripts/wiflash.sh $(ESPHOSTNAME) $(USER1_BIN) $(USER2_BIN)`
`1845`	`1845`
`1846`	`1846`	`#else ifdef WICED`
`1847`	`1847`	`#`