Refactor js interpreter to be compatible with flipper zero js

platformio.ini

@@ -57,11 +57,13 @@ build_flags =
 	-Wno-unused-label
 	-Wno-comment
 	-Wno-unused-variable
+	-Wno-pointer-arith
 	; warnings end
 	-Wl,--print-memory-usage
 	-Wl,--gc-sections
 	-DGIT_COMMIT_HASH='"Homebrew"'
 	-DSAFE_STACK_BUFFER_SIZE=4096
+	; -DARDUINO_LOOP_STACK_SIZE=8192 ; loop stack size default: 4096
 	-DFASTLED_RMT_BUILTIN_DRIVER=1 	; https://github.com/FastLED/FastLED/blob/67436be11fc3b7be611cdf9011f31c4f76817741/src/platforms/esp/32/rmt_4/idf4_clockless_rmt_esp32.h#L25-L33
 									; This setting let RF Spectrum to work with LED interface with FastLED on ESP32-S3
 	; rtl_433_ESP flags https://github.com/NorthernMan54/rtl_433_ESP/blob/main/example/OOK_Receiver/platformio.ini
@@ -71,6 +73,7 @@ build_flags =
 	;-DRF_MODULE_GDO2=14    ; CC1101 pin GDO2
 	;-DRF_MODULE_GDO2=RADIOLIB_NC    ; CC1101 pin GDO2
 	;-DRF_MODULE_INIT_STATUS=true
+; build_unflags = -Os
 
 extra_scripts = 
 	pre:patch.py

src/core/display.cpp

@@ -553,7 +553,6 @@ void drawMainBorder(bool clear) {
     #endif
     if(clear){
       tft.fillScreen(bruceConfig.bgColor);
-      tft.fillScreen(bruceConfig.bgColor);
     }
     setTftDisplay(12, 12, bruceConfig.priColor, 1, bruceConfig.bgColor);
     tft.setTextDatum(0);
@@ -1082,18 +1081,10 @@ bool Gif::openGIF(FS *fs, const char *filename) {
       GIFDraw
     )
   ) {
-    Serial.printf("Successfully opened GIF; Canvas size = %d x %d\n", gif->getCanvasWidth(), gif->getCanvasHeight());
-    GIFINFO gi;
-    if (gif->getInfo(&gi)) {
-      Serial.printf("frame count: %d\n", gi.iFrameCount);
-      Serial.printf("duration: %d ms\n", gi.iDuration);
-      Serial.printf("max delay: %d ms\n", gi.iMaxDelay);
-      Serial.printf("min delay: %d ms\n", gi.iMinDelay);
-      return true;
-    }
+    return true;
   }
 
-  Serial.printf("GIF opening error: %d\n", gif->getLastError());
+  log_d("GIF opening error: %d\n", gif->getLastError());
   return false;
 }
 
@@ -1103,8 +1094,8 @@ bool Gif::openGIF(FS *fs, const char *filename) {
 // 1 = good result and more frames exist
 // 0 = no more frames exist, a frame may or may not have been played: use getLastError() and look for GIF_SUCCESS to know if a frame was played
 // -1 = error
-int Gif::playFrame(int x, int y) {
-  if ((millis() - lTime) >= *delayMilliseconds) {
+int Gif::playFrame(int x, int y, bool bSync) {
+  if (bSync && ((millis() - lTime) >= *delayMilliseconds)) {
     lTime = millis();
     gifPosition.x = x;
     gifPosition.y = y;
@@ -1144,7 +1135,7 @@ bool showGif(FS *fs, const char *filename, int x, int y, bool center, int playDu
   long timeStart = millis();
   do {
     result = gif.playFrame(x, y);
-    if (result == -1) Serial.printf("GIF playFrame error: %d\n", gif.getLastError());
+    if (result == -1) log_d("GIF playFrame error: %d\n", gif.getLastError());
 
     if(check(AnyKeyPress)) break;
 

src/core/display.h

@@ -35,7 +35,7 @@ class Gif {
 
     bool openGIF(FS *fs, const char *filename);
 
-    int playFrame(int x, int y);
+    int playFrame(int x = 0, int y = 0, bool bSync = true);
 
     int getInfo(GIFINFO *pInfo) {
       return gif->getInfo(pInfo);

src/core/scrollableTextArea.cpp

@@ -1,7 +1,7 @@
 #include "scrollableTextArea.h"
 
 ScrollableTextArea::ScrollableTextArea(const String& title) :
-    _startLine{0},
+    firstVisibleLine{0},
     _redraw{true},
     _title(title),
     _fontSize(FP),
@@ -25,8 +25,8 @@ ScrollableTextArea::ScrollableTextArea(const String& title) :
 }
 
 ScrollableTextArea::ScrollableTextArea(
-    uint8_t fontSize, int16_t startX, int16_t startY, int32_t width, int32_t height
-) : _startLine{0},
+    uint8_t fontSize, int16_t startX, int16_t startY, int32_t width, int32_t height, bool drawBorders
+) : firstVisibleLine{0},
         _redraw{true},
     _title(""),
         _fontSize(fontSize),
@@ -38,7 +38,9 @@ ScrollableTextArea::ScrollableTextArea(
             ,_scrollBuffer(&tft)
         #endif
 {
-    drawMainBorder();
+    if (drawBorders) {
+        drawMainBorder();
+    }
     setup();
 }
 
@@ -55,27 +57,59 @@ void ScrollableTextArea::setup() {
         _scrollBuffer.setTextSize(_fontSize);
     _scrollBuffer.fillSprite(bruceConfig.bgColor);
 
-    _maxCharsInLine = floor(_width / _scrollBuffer.textWidth("w", _fontSize));
-        _pxlsPerLine = _scrollBuffer.fontHeight() + 2;
-        _maxLinesInArea = floor(_height / _pxlsPerLine);
+    _maxCharactersPerLine = floor(_width / _scrollBuffer.textWidth("w", _fontSize));
+        _pixelsPerLine = _scrollBuffer.fontHeight() + 2;
+        _maxVisibleLines = floor(_height / _pixelsPerLine);
     #endif
 }
 
 void ScrollableTextArea::scrollUp() {
-    if (_startLine) {
-        _startLine--;
+    if (firstVisibleLine) {
+        firstVisibleLine--;
         _redraw = true;
     }
 }
 
 void ScrollableTextArea::scrollDown() {
-    if (_startLine + _maxLinesInArea <= _lines.size()) {
-        if (_startLine == 0) _startLine++;
-        _startLine++;
+    if (firstVisibleLine + _maxVisibleLines <= linesBuffer.size()) {
+        if (firstVisibleLine == 0) firstVisibleLine++;
+        firstVisibleLine++;
         _redraw = true;
     }
 }
 
+void ScrollableTextArea::scrollToLine(size_t lineNumber) {
+    if (linesBuffer.empty()) return;  // Ensure there's content to scroll
+
+    if (lineNumber > linesBuffer.size() - _maxVisibleLines) {
+        firstVisibleLine = (linesBuffer.size() > _maxVisibleLines) 
+                         ? linesBuffer.size() - _maxVisibleLines 
+                         : 0;
+    } else {
+        firstVisibleLine = lineNumber;
+    }
+}
+
+void ScrollableTextArea::scrollToLine(size_t lineNumber) {
+    if (linesBuffer.empty()) return;  // Ensure there's content to scroll
+
+    if (lineNumber > linesBuffer.size() - _maxVisibleLines) {
+        firstVisibleLine = (linesBuffer.size() > _maxVisibleLines) 
+                         ? linesBuffer.size() - _maxVisibleLines 
+                         : 0;
+    } else {
+        firstVisibleLine = lineNumber;
+    }
+}
+
+String ScrollableTextArea::getLine(size_t lineNumber) {
+    return linesBuffer[((lineNumber >= linesBuffer.size()) || (lineNumber < 0)) ? linesBuffer.size() : lineNumber];
+}
+
+size_t ScrollableTextArea::getMaxLines(size_t lineNumber) {
+    return linesBuffer.size();
+}
+
 void ScrollableTextArea::show(bool force) {
     draw(force);
 
@@ -85,6 +119,10 @@ void ScrollableTextArea::show(bool force) {
     while(!check(SelPress)) { update(force); yield(); }
 }
 
+uint32_t ScrollableTextArea::getMaxVisibleTextLength() {
+    return _maxVisibleLines * _maxCharactersPerLine;
+}
+
 void ScrollableTextArea::update(bool force) {
     if (check(PrevPress)) scrollUp();
     else if (check(NextPress)) scrollDown();
@@ -94,6 +132,7 @@ void ScrollableTextArea::update(bool force) {
 }
 
 void ScrollableTextArea::fromFile(File file) {
+    linesBuffer.clear();
     while (file.available()) addLine(file.readStringUntil('\n'));
 
     draw(true);
@@ -102,6 +141,7 @@ void ScrollableTextArea::fromFile(File file) {
 }
 
 void ScrollableTextArea::fromString(const String& text) {
+    linesBuffer.clear();
     int startIdx = 0;
     int endIdx = 0;
 
@@ -119,16 +159,16 @@ void ScrollableTextArea::fromString(const String& text) {
 #ifdef HAS_SCREEN
 void ScrollableTextArea::addLine(const String& text) {
     if (text.isEmpty()) {
-        _lines.emplace_back("");
+        linesBuffer.emplace_back("");
         return;
     }
 
     String buff;
     size_t start{0};
 
     // automatically split into multiple lines
-    while( !(buff = text.substring(start, start + _maxCharsInLine)).isEmpty() ){
-        _lines.emplace_back(buff);
+    while( !(buff = text.substring(start, start + _maxCharactersPerLine)).isEmpty() ){
+        linesBuffer.emplace_back(buff);
         start += buff.length();
     }
 
@@ -141,44 +181,46 @@ void ScrollableTextArea::draw(bool force) {
     _scrollBuffer.fillSprite(bruceConfig.bgColor);
 
     uint16_t yOffset = 0;
-    uint16_t lines = 0;
+    size_t lines = 0;
 
     // if there is text above
-    if (_startLine) {
+    if (firstVisibleLine) {
         _scrollBuffer.drawString("...", 0, yOffset);
-        yOffset += _pxlsPerLine;
+        yOffset += _pixelsPerLine;
         lines++;
     }
 
     int32_t tmpHeight = _height;
     // if there is text below
-    if (_lines.size() - _startLine >= _maxLinesInArea) {
-        _scrollBuffer.drawString("...", 0, _height - _pxlsPerLine);
-        tmpHeight -= _pxlsPerLine;
+    if (linesBuffer.size() - firstVisibleLine >= _maxVisibleLines) {
+        _scrollBuffer.drawString("...", 0, _height - _pixelsPerLine);
+        tmpHeight -= _pixelsPerLine;
         lines++;
     }
 
-    size_t idx{_startLine};
-    while( yOffset < tmpHeight && lines < _maxLinesInArea && idx < _lines.size() ){
-        _scrollBuffer.drawString(_lines[idx], 0, yOffset);
-        yOffset += _pxlsPerLine;
+    size_t idx{firstVisibleLine};
+    while( yOffset < tmpHeight && lines < _maxVisibleLines && idx < linesBuffer.size() ){
+        _scrollBuffer.drawString(linesBuffer[idx], 0, yOffset);
+        yOffset += _pixelsPerLine;
         lines++;
         idx++;
     }
 
+    lastVisibleLine = firstVisibleLine + lines;
+
     _scrollBuffer.pushSprite(_startX, _startY);
     _redraw = false;
 }
 
 // for webui as a regular text area
 #else
 void ScrollableTextArea::addLine(const String& text){
-    if( !text.isEmpty() ) _lines.emplace_back(text);
+    if( !text.isEmpty() ) linesBuffer.emplace_back(text);
 }
 
 void ScrollableTextArea::draw(bool force){
     uint16_t yOffset = 0;
-    for( const auto& str : _lines ){
+    for( const auto& str : linesBuffer ){
         _scrollBuffer.drawString(str, 0, yOffset);
         yOffset += 12;
     }

src/core/scrollableTextArea.h

@@ -9,7 +9,8 @@ class ScrollableTextArea {
         int16_t startX, 
         int16_t startY, 
         int32_t width, 
-        int32_t height
+        int32_t height,
+        bool drawBorders = true
     );
 
     ~ScrollableTextArea();
@@ -18,6 +19,11 @@ class ScrollableTextArea {
 
     void scrollDown();
 
+    void scrollToLine(size_t lineNumber);
+
+    String getLine(size_t lineNumber);
+    size_t getMaxLines(size_t lineNumber);
+
     void addLine(const String& text);
 
     void fromString(const String& text);
@@ -28,17 +34,22 @@ class ScrollableTextArea {
 
     void show(bool force = false);
 
+    uint32_t getMaxVisibleTextLength();
+
+    size_t firstVisibleLine;
+    size_t lastVisibleLine;
+    /// TODO: Change to std::vector<char *> and alloc to PSRAM if possible
+    std::vector<String> linesBuffer;
+
 private:
-    uint16_t _startLine;
     bool _redraw;
     String _title;
     uint8_t _fontSize;
     int16_t _startX, _startY;
     int32_t _width, _height;
-    int32_t _pxlsPerLine;
-    int32_t _maxLinesInArea;
-    uint16_t _maxCharsInLine;
-    std::vector<String> _lines;
+    int32_t _pixelsPerLine;
+    size_t _maxVisibleLines;
+    uint16_t _maxCharactersPerLine;
 
     #if defined(HAS_SCREEN)
         TFT_eSprite _scrollBuffer;

src/core/sd_functions.cpp

@@ -309,6 +309,44 @@ String readSmallFile(FS &fs, String filepath) {
   return fileContent;
 }
 
+/***************************************************************************************
+** Function name: readFile
+** Description:   read file and return its contents as a char*
+**                caller needs to call free()
+***************************************************************************************/
+char *readBigFile(FS &fs, String filepath, bool binary, size_t *fileSize) {
+  File file = fs.open(filepath);
+  if (!file) {
+    Serial.printf("Could not open file: %s\n", filepath.c_str());
+    return NULL;
+  }
+
+  size_t fileLen = file.size();
+  char *buf = (char *)(psramFound() ? ps_malloc(fileLen + 1) : malloc(fileLen + 1));
+  if (fileSize != NULL) {
+    *fileSize = file.size();
+  }
+
+  if (!buf) {
+    Serial.printf("Could not allocate memory for file: %s\n", filepath.c_str());
+    return NULL;
+  }
+
+  size_t bytesRead = 0;
+  while (bytesRead < fileLen && file.available()) {
+    size_t toRead = fileLen - bytesRead;
+    if (toRead > 512) {
+      toRead = 512;
+    }
+    file.read((uint8_t *)(buf + bytesRead), toRead);
+    bytesRead += toRead;
+  }
+  buf[bytesRead] = '\0';
+  file.close();
+
+  return buf;
+}
+
 /***************************************************************************************
 ** Function name: getFileSize
 ** Description:   get a file size without opening

src/core/sd_functions.h

@@ -36,6 +36,8 @@ String readLineFromFile(File myFile);
 
 String readSmallFile(FS &fs, String filepath);
 
+char *readBigFile(FS &fs, String filepath, bool binary = false, size_t *fileSize = NULL);
+
 String md5File(FS &fs, String filepath);
 
 String crc32File(FS &fs, String filepath);

src/core/serialcmds.cpp

@@ -84,7 +84,7 @@ char *readFileFromSerial(size_t fileSizeChar = SAFE_STACK_BUFFER_SIZE) {
     buf[bufSize++] = '\n';
   }
   buf[bufSize] = '\0';
-  Serial.println(buf);
+  Serial.println("JS file received");
   return buf;
 }
 /*