word count display on rev.4

Author: unkyulee

micro-journal-rev-4-esp32/src/display/ST7735/WordProcessor/WordProcessor.cpp

@@ -253,9 +253,9 @@ void WP_render_status(TFT_eSPI *ptft, U8g2_for_TFT_eSPI *pu8f)
     pu8f->setCursor(screen_width - font_width / 2, font_width * 2 / 3);
     pu8f->print(String(file_index));
 
-#ifdef DEBUG
+    // Word count print
     int small_font_width = 10;
-    int bufferSize = Editor::getInstance().getBufferSize();
+    int bufferSize = Editor::getInstance().wordCountFile + Editor::getInstance().wordCountBuffer; ;
     String bufferStr = String(bufferSize);
     // Calculate x position so it's right-aligned
     int textWidth = bufferStr.length() * small_font_width;
@@ -268,7 +268,6 @@ void WP_render_status(TFT_eSPI *ptft, U8g2_for_TFT_eSPI *pu8f)
     // Draw buffer size
     pu8f->setCursor(x, y);
     pu8f->print(bufferStr);
-#endif
 
     // height 100% 80
     float batteryPercent = app["battery"].as<float>();

micro-journal-rev-4-esp32/src/service/Editor/Editor.cpp

@@ -217,7 +217,7 @@ void Editor::saveFile()
         // If file doesn't exist, create it
         file = gfs()->open(fileName.c_str(), "w+"); // create + read/write
     }
-    
+
     if (!file)
     {
         //
@@ -288,6 +288,10 @@ void Editor::saveFile()
 
     //
     savingInProgress = false;
+
+#if defined(DEBUG) && defined(BOARD_PICO)
+    printMemoryUsage();
+#endif
 }
 
 // Make the current file empty

micro-journal-rev-4-esp32/src/service/Editor/Editor.h

@@ -4,7 +4,7 @@
 #include <Arduino.h>
 
 #ifdef BOARD_PICO
-#define BUFFER_SIZE 1000
+#define BUFFER_SIZE 2000
 #endif
 
 #ifdef BOARD_ESP32_S3

micro-journal-rev-4-esp32/src/service/Tools/Tools.cpp

@@ -32,7 +32,6 @@ String formatNumber(int num)
     return formattedNumber;
 }
 
-
 // Get the size of a file in bytes
 size_t fileSize(String fileName)
 {
@@ -41,14 +40,14 @@ size_t fileSize(String fileName)
     {
         File file = SD.open(fileName, FILE_READ);
         if (!file)
-        {   //something bad happened
-            char buffer [32];
+        { // something bad happened
+            char buffer[32];
             sprintf(buffer, "Failed to open a file. %s\n", fileName);
             _log(buffer);
             file_size = -1;
         }
-        else 
-        {   //file exists
+        else
+        { // file exists
             file_size = file.size();
         }
         //
@@ -58,7 +57,6 @@ size_t fileSize(String fileName)
     return file_size;
 }
 
-
 // Create an array of String objects
 // Many of these ascii codes can be tracked back to:
 // https://en.wikipedia.org/wiki/ISO/IEC_8859 column 1 of the table
@@ -195,15 +193,13 @@ static const String extended_ascii[128] = {
 
 String asciiToUnicode(uint8_t value)
 {
-  if (value < 128)
-    return "";
+    if (value < 128)
+        return "";
 
-  uint8_t code = value - 128;
-  return extended_ascii[code];
+    uint8_t code = value - 128;
+    return extended_ascii[code];
 }
 
-
-
 String format(const char *format, ...)
 {
     char buffer[256]; // Adjust the size according to your needs
@@ -212,4 +208,16 @@ String format(const char *format, ...)
     vsnprintf(buffer, sizeof(buffer), format, args);
     va_end(args);
     return String(buffer);
-}
+}
+
+#if defined(DEBUG) && defined(BOARD_PICO)
+extern "C" char* sbrk(int incr);
+
+
+void printMemoryUsage()
+{
+    char top;
+    ptrdiff_t free_memory = &top - reinterpret_cast<char*>(sbrk(0));
+    Serial.printf("Stack Free: %td bytes\n", abs(free_memory));
+}
+#endif

micro-journal-rev-4-esp32/src/service/Tools/Tools.h

@@ -1,5 +1,4 @@
-#ifndef Tools_h
-#define Tools_h
+#pragma once
 
 #include <Arduino.h>
 
@@ -8,4 +7,7 @@ size_t fileSize(String fileName);
 String asciiToUnicode(uint8_t value);
 String format(const char *format, ...);
 
-#endif
+
+#if defined(DEBUG) && defined(BOARD_PICO)
+void printMemoryUsage();
+#endif