add ESPR_FS_PREPEND_PATH, other compile fixes

Author: gfwilliams

README_BuildProcess.md

@@ -152,6 +152,7 @@ This is a partial list of definitions that can be added in a `BOARD.py` file's `
 * `ESPR_FS_MKFS` - Add support for require("fs").mkfs for formatting disks
 * `ESPR_FS_GETFREE` - Add support for require("fs").getFree in the filesystem library
 * `ESPR_TEST_ON_FIRST_RUN` - on Jolt.js/Puck.js, run the self-test the very first time the board boots up (this is not the default since 2v27)
+* `ESPR_FS_PREPEND_PATH=""` - add something to the path when accessing files using 'fs' - eg on a linux build you might add `'sdcard'` to look for files in that directory
 
 
 There are some specifically that are useful for cutting a few bytes out of the build:

boards/PIPBOY_LINUX.py

@@ -17,7 +17,7 @@
 info = {
  'name' : "Pipboy Linux Debug Compilation",
  'default_console' : "EV_USBSERIAL",
- 'variables' :  5000, # 0 = resizable variables, rather than fixed
+ 'variables' :  15000, # 0 = resizable variables, rather than fixed
  'binary_name' : 'espruino_pb',
  'build' : {
    'libraries' : [
@@ -29,12 +29,20 @@
 #     'CFLAGS+=-m32', 'LDFLAGS+=-m32', 'DEFINES+=-DUSE_CALLFUNCTION_HACK', # For testing 32 bit builds
      'DEFINES+=-DLINUX -DEMULATED',
      'DEFINES+=-DESPR_UNICODE_SUPPORT=1',
+     'DEFINES+=-DESPR_FS_PREPEND_PATH=\'"sdcard/"\'',
      'DEFINES+=-DUSE_FONT_6X8 -DGRAPHICS_PALETTED_IMAGES -DGRAPHICS_ANTIALIAS -DESPR_PBF_FONTS -DESPR_GRAPHICS_INTERNAL -DESPR_GRAPHICS_SELF_INIT',
      'DEFINES+=-DSPIFLASH_BASE=0 -DSPIFLASH_LENGTH=FLASH_SAVED_CODE_LENGTH', # For Testing Flash Strings
      'LINUX=1',
      'INCLUDE += -I$(ROOT)/libs/pipboy',
      'WRAPPERSOURCES += libs/pipboy/avi.c libs/pipboy/stm32_i2s.c',
-     'WRAPPERSOURCES += libs/pipboy/jswrap_pipboy.c'     
+     'WRAPPERSOURCES += libs/pipboy/jswrap_pipboy.c',
+     'WRAPPERSOURCES += libs/pipboy/jswrap_font_monofonto_120.c',
+     'WRAPPERSOURCES += libs/pipboy/jswrap_font_monofonto_96.c',
+     'WRAPPERSOURCES += libs/pipboy/jswrap_font_monofonto_36.c',
+     'WRAPPERSOURCES += libs/pipboy/jswrap_font_monofonto_28.c',
+     'WRAPPERSOURCES += libs/pipboy/jswrap_font_monofonto_23.c',
+     'WRAPPERSOURCES += libs/pipboy/jswrap_font_monofonto_18.c',
+     'WRAPPERSOURCES += libs/pipboy/jswrap_font_monofonto_16.c'
    ]
  }
 };

libs/filesystem/jswrap_file.c

@@ -40,6 +40,12 @@ bool jsfsGetPathString(char *pathStr, JsVar *path) {
     jsExceptionHere(JSET_ERROR, "File path too long");
     return false;
   }
+#ifdef ESPR_FS_PREPEND_PATH
+  char buf[JS_DIR_BUF_SIZE];
+  strcpy(buf, ESPR_FS_PREPEND_PATH);
+  strcat(buf, pathStr);
+  strcpy(pathStr, buf);
+#endif
   return true;
 }
 
@@ -568,7 +574,7 @@ Skip the specified number of bytes forward in the file
   "name" : "seek",
   "generate_full" : "jswrap_file_skip_or_seek(parent,nBytes,false)",
   "params" : [
-    ["nBytes","int32","is an integer specifying the number of bytes to skip forwards."]
+    ["nBytes","int32","is an integer specifying the byte position in the file to move to."]
   ]
 }
 Seek to a certain position in the file

libs/graphics/lcd_sdl.c

@@ -100,7 +100,8 @@ void lcdIdle_SDL() {
   static bool down;
   extern void nativeQuit();
   SDL_Event event;
-  bool sendEvent = false;
+  bool sendTouchEvent = false;
+  char *sendKeyEvent = NULL;
 
   if (needsFlip) {
     needsFlip = false;
@@ -113,19 +114,29 @@ void lcdIdle_SDL() {
         nativeQuit();
         break;
       case SDL_MOUSEMOTION:
-	if (down) {
-	  sendEvent = true;
-	}
+        if (down) {
+          sendTouchEvent = true;
+        }
         break;
       case SDL_MOUSEBUTTONDOWN:
       case SDL_MOUSEBUTTONUP:
         down = event.type == SDL_MOUSEBUTTONDOWN;
-        sendEvent = true;
-	break;
+        sendTouchEvent = true;
+	      break;
+      case SDL_KEYDOWN:
+        sendKeyEvent = JS_EVENT_PREFIX"keydown";
+        switch (event.key.keysym.sym) {
+          case SDLK_ESCAPE: nativeQuit(); break;
+          default:break;
+        }
+        break;
+      case SDL_KEYUP:
+        sendKeyEvent = JS_EVENT_PREFIX"keyup";
+        break;
     }
   }
 
-  if (sendEvent) {
+  if (sendTouchEvent) {
     JsVar *E = jsvObjectGetChildIfExists(execInfo.root, "E");
     if (E) {
       JsVar *o = jsvNewObject();
@@ -136,6 +147,33 @@ void lcdIdle_SDL() {
       jsvUnLock2(E,o);
     }
   }
+  if (sendKeyEvent) {
+    JsVar *E = jsvObjectGetChildIfExists(execInfo.root, "E");
+    if (E) {
+      JsVar *o = jsvNewObject();
+      jsvObjectSetChildAndUnLock(o,"keyCode", jsvNewFromInteger(event.key.keysym.scancode));
+      const char *name = NULL;
+      switch (event.key.keysym.sym) {
+        case SDLK_UP: name = "ArrowUp"; break;
+        case SDLK_DOWN: name = "ArrowDown"; break;
+        case SDLK_LEFT: name = "ArrowLeft"; break;
+        case SDLK_RIGHT: name = "ArrowRight"; break;
+        case SDLK_RETURN: name = "Enter"; break;
+        case SDLK_BACKSPACE: name = "Backspace"; break;
+        case SDLK_TAB: name = "Tab"; break;
+        case SDLK_DELETE: name = "Delete"; break;
+        case SDLK_HOME: name = "Home"; break;
+        case SDLK_END: name = "End"; break;
+        case SDLK_PAGEUP: name = "PageUp"; break;
+        case SDLK_PAGEDOWN: name = "PageDown"; break;
+        case SDLK_INSERT: name = "Insert"; break;
+        default:break;
+      }
+      if (name) jsvObjectSetChildAndUnLock(o,"key", jsvNewFromString(name));
+      jsiQueueObjectCallbacks(E, sendKeyEvent, &o, 1);
+      jsvUnLock2(E,o);
+    }
+  }
 }
 
 void lcdSetCallbacks_SDL(JsGraphics *gfx) {

libs/pipboy/avi.h

@@ -31,8 +31,8 @@ typedef struct {
   int audioBufferSize;
 } AviInfo;
 
-const uint16_t WAVFMT_RAW = 1;
-const uint16_t WAVFMT_IMA_ADPCM = 0x11; // https://wiki.multimedia.cx/index.php/Microsoft_IMA_ADPCM
+#define WAVFMT_RAW       1
+#define WAVFMT_IMA_ADPCM 0x11 // https://wiki.multimedia.cx/index.php/Microsoft_IMA_ADPCM
 
 #define AVI_STREAM_AUDIO 0x6277
 #define AVI_STREAM_VIDEO 0x6364

targets/linux/main.c

@@ -392,6 +392,13 @@ int handleErrors() {
   if (hasException) {
     jsiConsolePrintf("Uncaught %v\n", exception);
     e = 1;
+    if (jsvIsObject(exception)) {
+      JsVar *stackTrace = jsvObjectGetChildIfExists(exception, "stack");
+      if (stackTrace) {
+        jsiConsolePrintStringVar(stackTrace);
+        jsvUnLock(stackTrace);
+      }
+    }
   }
   jsvUnLock(exception);