lib/Epub/Epub/ParsedText.cpp

@@ -25,7 +25,6 @@ void ParsedText::layoutAndExtractLines(const GfxRenderer& renderer, const int fo
     return;
   }
 
-  // horizontalMargin accounts for both left and right gutters, leaving the drawable width.
   const int pageWidth = renderer.getScreenWidth() - horizontalMargin;
   if (pageWidth <= 0) {
     words.clear();
@@ -36,7 +35,6 @@ void ParsedText::layoutAndExtractLines(const GfxRenderer& renderer, const int fo
   const int spaceWidth = renderer.getSpaceWidth(fontId);
   // Maintain classic prose indenting when extra paragraph spacing is disabled.
   const bool allowIndent = !extraParagraphSpacing && (style == TextBlock::JUSTIFIED || style == TextBlock::LEFT_ALIGN);
-  const bool allowHyphenation = hyphenationEnabled;
   const int indentWidth = allowIndent ? renderer.getTextWidth(fontId, "m", REGULAR) : 0;
   const int firstLinePageWidth = allowIndent ? std::max(pageWidth - indentWidth, 0) : pageWidth;
   auto pageWidthForLine = [&](const bool isFirstLine) -> int { return isFirstLine ? firstLinePageWidth : pageWidth; };
@@ -52,7 +50,6 @@ void ParsedText::layoutAndExtractLines(const GfxRenderer& renderer, const int fo
   std::vector<uint16_t> lineWordWidths;
   lineWordWidths.reserve(16);
 
-  // Guard against malicious/invalid content generating unbounded line counts.
   size_t producedLines = 0;
   constexpr size_t MAX_LINES = 1000;
 
@@ -154,7 +151,7 @@ void ParsedText::layoutAndExtractLines(const GfxRenderer& renderer, const int fo
       continue;
     }
 
-    if (allowHyphenation && lineWordCount > 0 && availableWidth > 0) {
+    if (lineWordCount > 0 && availableWidth > 0) {
       // Try hyphenating the next word so the current line stays compact.
       HyphenationResult split;
       if (Hyphenator::splitWord(renderer, fontId, *wordIt, *styleIt, availableWidth, &split, false)) {
@@ -189,7 +186,6 @@ void ParsedText::layoutAndExtractLines(const GfxRenderer& renderer, const int fo
       continue;
     }
 
-    // No more tricks available; flush the collected words and move on.
     commitLine(false);
   }
 

lib/Epub/Epub/ParsedText.h

@@ -17,12 +17,10 @@ class ParsedText {
   std::list<EpdFontStyle> wordStyles;
   TextBlock::BLOCK_STYLE style;
   bool extraParagraphSpacing;
-  bool hyphenationEnabled;
 
  public:
-  explicit ParsedText(const TextBlock::BLOCK_STYLE style, const bool extraParagraphSpacing,
-                      const bool hyphenationEnabled)
-      : style(style), extraParagraphSpacing(extraParagraphSpacing), hyphenationEnabled(hyphenationEnabled) {}
+  explicit ParsedText(const TextBlock::BLOCK_STYLE style, const bool extraParagraphSpacing)
+      : style(style), extraParagraphSpacing(extraParagraphSpacing) {}
   ~ParsedText() = default;
 
   void addWord(std::string word, EpdFontStyle fontStyle);

lib/Epub/Epub/Section.cpp

@@ -10,7 +10,7 @@
 #include "parsers/ChapterHtmlSlimParser.h"
 
 namespace {
-constexpr uint8_t SECTION_FILE_VERSION = 6;
+constexpr uint8_t SECTION_FILE_VERSION = 5;
 }
 
 void Section::onPageComplete(std::unique_ptr<Page> page) {
@@ -27,7 +27,7 @@ void Section::onPageComplete(std::unique_ptr<Page> page) {
 
 void Section::writeCacheMetadata(const int fontId, const float lineCompression, const int marginTop,
                                  const int marginRight, const int marginBottom, const int marginLeft,
-                                 const bool extraParagraphSpacing, const bool hyphenationEnabled) const {
+                                 const bool extraParagraphSpacing) const {
   std::ofstream outputFile(("/sd" + cachePath + "/section.bin").c_str());
   serialization::writePod(outputFile, SECTION_FILE_VERSION);
   serialization::writePod(outputFile, fontId);
@@ -37,14 +37,13 @@ void Section::writeCacheMetadata(const int fontId, const float lineCompression,
   serialization::writePod(outputFile, marginBottom);
   serialization::writePod(outputFile, marginLeft);
   serialization::writePod(outputFile, extraParagraphSpacing);
-  serialization::writePod(outputFile, hyphenationEnabled);
   serialization::writePod(outputFile, pageCount);
   outputFile.close();
 }
 
 bool Section::loadCacheMetadata(const int fontId, const float lineCompression, const int marginTop,
                                 const int marginRight, const int marginBottom, const int marginLeft,
-                                const bool extraParagraphSpacing, const bool hyphenationEnabled) {
+                                const bool extraParagraphSpacing) {
   if (!SD.exists(cachePath.c_str())) {
     return false;
   }
@@ -70,7 +69,6 @@ bool Section::loadCacheMetadata(const int fontId, const float lineCompression, c
     int fileFontId, fileMarginTop, fileMarginRight, fileMarginBottom, fileMarginLeft;
     float fileLineCompression;
     bool fileExtraParagraphSpacing;
-    bool fileHyphenationEnabled;
     serialization::readPod(inputFile, fileFontId);
     serialization::readPod(inputFile, fileLineCompression);
     serialization::readPod(inputFile, fileMarginTop);
@@ -78,11 +76,10 @@ bool Section::loadCacheMetadata(const int fontId, const float lineCompression, c
     serialization::readPod(inputFile, fileMarginBottom);
     serialization::readPod(inputFile, fileMarginLeft);
     serialization::readPod(inputFile, fileExtraParagraphSpacing);
-    serialization::readPod(inputFile, fileHyphenationEnabled);
 
     if (fontId != fileFontId || lineCompression != fileLineCompression || marginTop != fileMarginTop ||
         marginRight != fileMarginRight || marginBottom != fileMarginBottom || marginLeft != fileMarginLeft ||
-        extraParagraphSpacing != fileExtraParagraphSpacing || hyphenationEnabled != fileHyphenationEnabled) {
+        extraParagraphSpacing != fileExtraParagraphSpacing) {
       inputFile.close();
       Serial.printf("[%lu] [SCT] Deserialization failed: Parameters do not match\n", millis());
       clearCache();
@@ -119,7 +116,7 @@ bool Section::clearCache() const {
 
 bool Section::persistPageDataToSD(const int fontId, const float lineCompression, const int marginTop,
                                   const int marginRight, const int marginBottom, const int marginLeft,
-                                  const bool extraParagraphSpacing, const bool hyphenationEnabled) {
+                                  const bool extraParagraphSpacing) {
   const auto localPath = epub->getSpineItem(spineIndex);
 
   // TODO: Should we get rid of this file all together?
@@ -140,7 +137,7 @@ bool Section::persistPageDataToSD(const int fontId, const float lineCompression,
   const auto sdTmpHtmlPath = "/sd" + tmpHtmlPath;
 
   ChapterHtmlSlimParser visitor(sdTmpHtmlPath.c_str(), renderer, fontId, lineCompression, marginTop, marginRight,
-                                marginBottom, marginLeft, extraParagraphSpacing, hyphenationEnabled,
+                                marginBottom, marginLeft, extraParagraphSpacing,
                                 [this](std::unique_ptr<Page> page) { this->onPageComplete(std::move(page)); });
   success = visitor.parseAndBuildPages();
 
@@ -150,8 +147,7 @@ bool Section::persistPageDataToSD(const int fontId, const float lineCompression,
     return false;
   }
 
-  writeCacheMetadata(fontId, lineCompression, marginTop, marginRight, marginBottom, marginLeft, extraParagraphSpacing,
-                     hyphenationEnabled);
+  writeCacheMetadata(fontId, lineCompression, marginTop, marginRight, marginBottom, marginLeft, extraParagraphSpacing);
 
   return true;
 }

lib/Epub/Epub/Section.h

@@ -13,7 +13,7 @@ class Section {
   std::string cachePath;
 
   void writeCacheMetadata(int fontId, float lineCompression, int marginTop, int marginRight, int marginBottom,
-                          int marginLeft, bool extraParagraphSpacing, bool hyphenationEnabled) const;
+                          int marginLeft, bool extraParagraphSpacing) const;
   void onPageComplete(std::unique_ptr<Page> page);
 
  public:
@@ -26,10 +26,10 @@ class Section {
   }
   ~Section() = default;
   bool loadCacheMetadata(int fontId, float lineCompression, int marginTop, int marginRight, int marginBottom,
-                         int marginLeft, bool extraParagraphSpacing, bool hyphenationEnabled);
+                         int marginLeft, bool extraParagraphSpacing);
   void setupCacheDir() const;
   bool clearCache() const;
   bool persistPageDataToSD(int fontId, float lineCompression, int marginTop, int marginRight, int marginBottom,
-                           int marginLeft, bool extraParagraphSpacing, bool hyphenationEnabled);
+                           int marginLeft, bool extraParagraphSpacing);
   std::unique_ptr<Page> loadPageFromSD() const;
 };

lib/Epub/Epub/hyphenation/Hyphenator.cpp

@@ -110,19 +110,16 @@ bool Hyphenator::splitWord(const GfxRenderer& renderer, const int fontId, const
     return false;
   }
 
-  // Skip mixed tokens (e.g., "v2.0") unless the caller forces a split due to overflow.
   if (!force && !hasOnlyAlphabetic(cps)) {
     return false;
   }
 
   const auto breakIndexes = collectBreakIndexes(cps);
-  // Budget for a trailing hyphen so rendered width matches the layout test.
   const int hyphenWidth = renderer.getTextWidth(fontId, "-", style);
   const int adjustedWidth = availableWidth - hyphenWidth;
 
   size_t chosenIndex = std::numeric_limits<size_t>::max();
 
-  // Prefer dictionary-style break points emitted by language hyphenators.
   if (adjustedWidth > 0) {
     for (const size_t idx : breakIndexes) {
       const size_t byteOffset = byteOffsetForIndex(cps, idx);
@@ -163,7 +160,6 @@ bool Hyphenator::splitWord(const GfxRenderer& renderer, const int fontId, const
     return false;
   }
 
-  // Append the printed hyphen to the prefix while leaving the tail untouched.
   result->head = head + "-";
   result->tail = tail;
   return true;

lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp

@@ -48,7 +48,7 @@ void ChapterHtmlSlimParser::startNewTextBlock(const TextBlock::BLOCK_STYLE style
 
     makePages();
   }
-  currentTextBlock.reset(new ParsedText(style, extraParagraphSpacing, hyphenationEnabled));
+  currentTextBlock.reset(new ParsedText(style, extraParagraphSpacing));
 }
 
 void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char* name, const XML_Char** atts) {
@@ -75,18 +75,6 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
     return;
   }
 
-  // Skip blocks with role="doc-pagebreak" and epub:type="pagebreak"
-  if (atts != nullptr) {
-    for (int i = 0; atts[i]; i += 2) {
-      if (strcmp(atts[i], "role") == 0 && strcmp(atts[i + 1], "doc-pagebreak") == 0 ||
-          strcmp(atts[i], "epub:type") == 0 && strcmp(atts[i + 1], "pagebreak") == 0) {
-        self->skipUntilDepth = self->depth;
-        self->depth += 1;
-        return;
-      }
-    }
-  }
-
   if (matches(name, HEADER_TAGS, NUM_HEADER_TAGS)) {
     self->startNewTextBlock(TextBlock::CENTER_ALIGN);
     self->boldUntilDepth = min(self->boldUntilDepth, self->depth);

lib/Epub/Epub/parsers/ChapterHtmlSlimParser.h

@@ -36,7 +36,6 @@ class ChapterHtmlSlimParser {
   int marginBottom;
   int marginLeft;
   bool extraParagraphSpacing;
-  bool hyphenationEnabled;
 
   void startNewTextBlock(TextBlock::BLOCK_STYLE style);
   void makePages();
@@ -49,7 +48,6 @@ class ChapterHtmlSlimParser {
   explicit ChapterHtmlSlimParser(const char* filepath, GfxRenderer& renderer, const int fontId,
                                  const float lineCompression, const int marginTop, const int marginRight,
                                  const int marginBottom, const int marginLeft, const bool extraParagraphSpacing,
-                                 const bool hyphenationEnabled,
                                  const std::function<void(std::unique_ptr<Page>)>& completePageFn)
       : filepath(filepath),
         renderer(renderer),
@@ -60,7 +58,6 @@ class ChapterHtmlSlimParser {
         marginBottom(marginBottom),
         marginLeft(marginLeft),
         extraParagraphSpacing(extraParagraphSpacing),
-        hyphenationEnabled(hyphenationEnabled),
         completePageFn(completePageFn) {}
   ~ChapterHtmlSlimParser() = default;
   bool parseAndBuildPages();

lib/GfxRenderer/Bitmap.cpp

@@ -1,189 +0,0 @@
-#include "Bitmap.h"
-
-#include <cstdlib>
-#include <cstring>
-
-uint16_t Bitmap::readLE16(File& f) {
-  const int c0 = f.read();
-  const int c1 = f.read();
-  const auto b0 = static_cast<uint8_t>(c0 < 0 ? 0 : c0);
-  const auto b1 = static_cast<uint8_t>(c1 < 0 ? 0 : c1);
-  return static_cast<uint16_t>(b0) | (static_cast<uint16_t>(b1) << 8);
-}
-
-uint32_t Bitmap::readLE32(File& f) {
-  const int c0 = f.read();
-  const int c1 = f.read();
-  const int c2 = f.read();
-  const int c3 = f.read();
-
-  const auto b0 = static_cast<uint8_t>(c0 < 0 ? 0 : c0);
-  const auto b1 = static_cast<uint8_t>(c1 < 0 ? 0 : c1);
-  const auto b2 = static_cast<uint8_t>(c2 < 0 ? 0 : c2);
-  const auto b3 = static_cast<uint8_t>(c3 < 0 ? 0 : c3);
-
-  return static_cast<uint32_t>(b0) | (static_cast<uint32_t>(b1) << 8) | (static_cast<uint32_t>(b2) << 16) |
-         (static_cast<uint32_t>(b3) << 24);
-}
-
-const char* Bitmap::errorToString(BmpReaderError err) {
-  switch (err) {
-    case BmpReaderError::Ok:
-      return "Ok";
-    case BmpReaderError::FileInvalid:
-      return "FileInvalid";
-    case BmpReaderError::SeekStartFailed:
-      return "SeekStartFailed";
-    case BmpReaderError::NotBMP:
-      return "NotBMP (missing 'BM')";
-    case BmpReaderError::DIBTooSmall:
-      return "DIBTooSmall (<40 bytes)";
-    case BmpReaderError::BadPlanes:
-      return "BadPlanes (!= 1)";
-    case BmpReaderError::UnsupportedBpp:
-      return "UnsupportedBpp (expected 1, 2, 8, 24, or 32)";
-    case BmpReaderError::UnsupportedCompression:
-      return "UnsupportedCompression (expected BI_RGB or BI_BITFIELDS for 32bpp)";
-    case BmpReaderError::BadDimensions:
-      return "BadDimensions";
-    case BmpReaderError::PaletteTooLarge:
-      return "PaletteTooLarge";
-
-    case BmpReaderError::SeekPixelDataFailed:
-      return "SeekPixelDataFailed";
-    case BmpReaderError::BufferTooSmall:
-      return "BufferTooSmall";
-
-    case BmpReaderError::OomRowBuffer:
-      return "OomRowBuffer";
-    case BmpReaderError::ShortReadRow:
-      return "ShortReadRow";
-  }
-  return "Unknown";
-}
-
-BmpReaderError Bitmap::parseHeaders() {
-  if (!file) return BmpReaderError::FileInvalid;
-  if (!file.seek(0)) return BmpReaderError::SeekStartFailed;
-
-  // --- BMP FILE HEADER ---
-  const uint16_t bfType = readLE16(file);
-  if (bfType != 0x4D42) return BmpReaderError::NotBMP;
-
-  file.seek(8, SeekCur);
-  bfOffBits = readLE32(file);
-
-  // --- DIB HEADER ---
-  const uint32_t biSize = readLE32(file);
-  if (biSize < 40) return BmpReaderError::DIBTooSmall;
-
-  width = static_cast<int32_t>(readLE32(file));
-  const auto rawHeight = static_cast<int32_t>(readLE32(file));
-  topDown = rawHeight < 0;
-  height = topDown ? -rawHeight : rawHeight;
-
-  const uint16_t planes = readLE16(file);
-  bpp = readLE16(file);
-  const uint32_t comp = readLE32(file);
-  const bool validBpp = bpp == 1 || bpp == 2 || bpp == 8 || bpp == 24 || bpp == 32;
-
-  if (planes != 1) return BmpReaderError::BadPlanes;
-  if (!validBpp) return BmpReaderError::UnsupportedBpp;
-  // Allow BI_RGB (0) for all, and BI_BITFIELDS (3) for 32bpp which is common for BGRA masks.
-  if (!(comp == 0 || (bpp == 32 && comp == 3))) return BmpReaderError::UnsupportedCompression;
-
-  file.seek(12, SeekCur);  // biSizeImage, biXPelsPerMeter, biYPelsPerMeter
-  const uint32_t colorsUsed = readLE32(file);
-  if (colorsUsed > 256u) return BmpReaderError::PaletteTooLarge;
-  file.seek(4, SeekCur);  // biClrImportant
-
-  if (width <= 0 || height <= 0) return BmpReaderError::BadDimensions;
-
-  // Pre-calculate Row Bytes to avoid doing this every row
-  rowBytes = (width * bpp + 31) / 32 * 4;
-
-  for (int i = 0; i < 256; i++) paletteLum[i] = static_cast<uint8_t>(i);
-  if (colorsUsed > 0) {
-    for (uint32_t i = 0; i < colorsUsed; i++) {
-      uint8_t rgb[4];
-      file.read(rgb, 4);  // Read B, G, R, Reserved in one go
-      paletteLum[i] = (77u * rgb[2] + 150u * rgb[1] + 29u * rgb[0]) >> 8;
-    }
-  }
-
-  if (!file.seek(bfOffBits)) {
-    return BmpReaderError::SeekPixelDataFailed;
-  }
-
-  return BmpReaderError::Ok;
-}
-
-// packed 2bpp output, 0 = black, 1 = dark gray, 2 = light gray, 3 = white
-BmpReaderError Bitmap::readRow(uint8_t* data, uint8_t* rowBuffer) const {
-  // Note: rowBuffer should be pre-allocated by the caller to size 'rowBytes'
-  if (file.read(rowBuffer, rowBytes) != rowBytes) return BmpReaderError::ShortReadRow;
-
-  uint8_t* outPtr = data;
-  uint8_t currentOutByte = 0;
-  int bitShift = 6;
-
-  // Helper lambda to pack 2bpp color into the output stream
-  auto packPixel = [&](uint8_t lum) {
-    uint8_t color = (lum >> 6);  // Simple 2-bit reduction: 0-255 -> 0-3
-    currentOutByte |= (color << bitShift);
-    if (bitShift == 0) {
-      *outPtr++ = currentOutByte;
-      currentOutByte = 0;
-      bitShift = 6;
-    } else {
-      bitShift -= 2;
-    }
-  };
-
-  switch (bpp) {
-    case 8: {
-      for (int x = 0; x < width; x++) {
-        packPixel(paletteLum[rowBuffer[x]]);
-      }
-      break;
-    }
-    case 24: {
-      const uint8_t* p = rowBuffer;
-      for (int x = 0; x < width; x++) {
-        uint8_t lum = (77u * p[2] + 150u * p[1] + 29u * p[0]) >> 8;
-        packPixel(lum);
-        p += 3;
-      }
-      break;
-    }
-    case 1: {
-      for (int x = 0; x < width; x++) {
-        uint8_t lum = (rowBuffer[x >> 3] & (0x80 >> (x & 7))) ? 0xFF : 0x00;
-        packPixel(lum);
-      }
-      break;
-    }
-    case 32: {
-      const uint8_t* p = rowBuffer;
-      for (int x = 0; x < width; x++) {
-        uint8_t lum = (77u * p[2] + 150u * p[1] + 29u * p[0]) >> 8;
-        packPixel(lum);
-        p += 4;
-      }
-      break;
-    }
-  }
-
-  // Flush remaining bits if width is not a multiple of 4
-  if (bitShift != 6) *outPtr = currentOutByte;
-
-  return BmpReaderError::Ok;
-}
-
-BmpReaderError Bitmap::rewindToData() const {
-  if (!file.seek(bfOffBits)) {
-    return BmpReaderError::SeekPixelDataFailed;
-  }
-
-  return BmpReaderError::Ok;
-}

lib/GfxRenderer/Bitmap.h

@@ -1,52 +0,0 @@
-#pragma once
-
-#include <FS.h>
-
-enum class BmpReaderError : uint8_t {
-  Ok = 0,
-  FileInvalid,
-  SeekStartFailed,
-
-  NotBMP,
-  DIBTooSmall,
-
-  BadPlanes,
-  UnsupportedBpp,
-  UnsupportedCompression,
-
-  BadDimensions,
-  PaletteTooLarge,
-
-  SeekPixelDataFailed,
-  BufferTooSmall,
-  OomRowBuffer,
-  ShortReadRow,
-};
-
-class Bitmap {
- public:
-  static const char* errorToString(BmpReaderError err);
-
-  explicit Bitmap(File& file) : file(file) {}
-  BmpReaderError parseHeaders();
-  BmpReaderError readRow(uint8_t* data, uint8_t* rowBuffer) const;
-  BmpReaderError rewindToData() const;
-  int getWidth() const { return width; }
-  int getHeight() const { return height; }
-  bool isTopDown() const { return topDown; }
-  bool hasGreyscale() const { return bpp > 1; }
-  int getRowBytes() const { return rowBytes; }
-
- private:
-  static uint16_t readLE16(File& f);
-  static uint32_t readLE32(File& f);
-
-  File& file;
-  int width = 0;
-  int height = 0;
-  bool topDown = false;
-  uint32_t bfOffBits = 0;
-  uint16_t bpp = 0;
-  int rowBytes = 0;
-  uint8_t paletteLum[256] = {};
-};

lib/GfxRenderer/GfxRenderer.cpp

@@ -119,66 +119,6 @@ void GfxRenderer::drawImage(const uint8_t bitmap[], const int x, const int y, co
   einkDisplay.drawImage(bitmap, y, x, height, width);
 }
 
-void GfxRenderer::drawBitmap(const Bitmap& bitmap, const int x, const int y, const int maxWidth,
-                             const int maxHeight) const {
-  float scale = 1.0f;
-  bool isScaled = false;
-  if (maxWidth > 0 && bitmap.getWidth() > maxWidth) {
-    scale = static_cast<float>(maxWidth) / static_cast<float>(bitmap.getWidth());
-    isScaled = true;
-  }
-  if (maxHeight > 0 && bitmap.getHeight() > maxHeight) {
-    scale = std::min(scale, static_cast<float>(maxHeight) / static_cast<float>(bitmap.getHeight()));
-    isScaled = true;
-  }
-
-  const uint8_t outputRowSize = (bitmap.getWidth() + 3) / 4;
-  auto* outputRow = static_cast<uint8_t*>(malloc(outputRowSize));
-  auto* rowBytes = static_cast<uint8_t*>(malloc(bitmap.getRowBytes()));
-
-  for (int bmpY = 0; bmpY < bitmap.getHeight(); bmpY++) {
-    // The BMP's (0, 0) is the bottom-left corner (if the height is positive, top-left if negative).
-    // Screen's (0, 0) is the top-left corner.
-    int screenY = y + (bitmap.isTopDown() ? bmpY : bitmap.getHeight() - 1 - bmpY);
-    if (isScaled) {
-      screenY = std::floor(screenY * scale);
-    }
-    if (screenY >= getScreenHeight()) {
-      break;
-    }
-
-    if (bitmap.readRow(outputRow, rowBytes) != BmpReaderError::Ok) {
-      Serial.printf("[%lu] [GFX] Failed to read row %d from bitmap\n", millis(), bmpY);
-      free(outputRow);
-      free(rowBytes);
-      return;
-    }
-
-    for (int bmpX = 0; bmpX < bitmap.getWidth(); bmpX++) {
-      int screenX = x + bmpX;
-      if (isScaled) {
-        screenX = std::floor(screenX * scale);
-      }
-      if (screenX >= getScreenWidth()) {
-        break;
-      }
-
-      const uint8_t val = outputRow[bmpX / 4] >> (6 - ((bmpX * 2) % 8)) & 0x3;
-
-      if (renderMode == BW && val < 3) {
-        drawPixel(screenX, screenY);
-      } else if (renderMode == GRAYSCALE_MSB && (val == 1 || val == 2)) {
-        drawPixel(screenX, screenY, false);
-      } else if (renderMode == GRAYSCALE_LSB && val == 1) {
-        drawPixel(screenX, screenY, false);
-      }
-    }
-  }
-
-  free(outputRow);
-  free(rowBytes);
-}
-
 void GfxRenderer::clearScreen(const uint8_t color) const { einkDisplay.clearScreen(color); }
 
 void GfxRenderer::invertScreen() const {

lib/GfxRenderer/GfxRenderer.h

@@ -2,12 +2,9 @@
 
 #include <EInkDisplay.h>
 #include <EpdFontFamily.h>
-#include <FS.h>
 
 #include <map>
 
-#include "Bitmap.h"
-
 class GfxRenderer {
  public:
   enum RenderMode { BW, GRAYSCALE_LSB, GRAYSCALE_MSB };
@@ -48,7 +45,6 @@ class GfxRenderer {
   void drawRect(int x, int y, int width, int height, bool state = true) const;
   void fillRect(int x, int y, int width, int height, bool state = true) const;
   void drawImage(const uint8_t bitmap[], int x, int y, int width, int height) const;
-  void drawBitmap(const Bitmap& bitmap, int x, int y, int maxWidth, int maxHeight) const;
 
   // Text
   int getTextWidth(int fontId, const char* text, EpdFontStyle style = REGULAR) const;

platformio.ini

@@ -1,5 +1,5 @@
 [platformio]
-crosspoint_version = 0.7.0
+crosspoint_version = 0.6.0
 default_envs = default
 
 [base]

src/CrossPointSettings.cpp

@@ -12,7 +12,7 @@ CrossPointSettings CrossPointSettings::instance;
 
 namespace {
 constexpr uint8_t SETTINGS_FILE_VERSION = 1;
-constexpr uint8_t SETTINGS_COUNT = 3;
+constexpr uint8_t SETTINGS_COUNT = 2;
 constexpr char SETTINGS_FILE[] = "/sd/.crosspoint/settings.bin";
 }  // namespace
 
@@ -25,7 +25,6 @@ bool CrossPointSettings::saveToFile() const {
   serialization::writePod(outputFile, SETTINGS_COUNT);
   serialization::writePod(outputFile, whiteSleepScreen);
   serialization::writePod(outputFile, extraParagraphSpacing);
-  serialization::writePod(outputFile, hyphenationEnabled);
   outputFile.close();
 
   Serial.printf("[%lu] [CPS] Settings saved to file\n", millis());
@@ -51,15 +50,15 @@ bool CrossPointSettings::loadFromFile() {
   uint8_t fileSettingsCount = 0;
   serialization::readPod(inputFile, fileSettingsCount);
 
-  // load settings that exist in the file (supports backward compatibility)
-  if (fileSettingsCount >= 1) {
-    serialization::readPod(inputFile, whiteSleepScreen);
-  }
-  if (fileSettingsCount >= 2) {
-    serialization::readPod(inputFile, extraParagraphSpacing);
-  }
-  if (fileSettingsCount >= 3) {
-    serialization::readPod(inputFile, hyphenationEnabled);
+  // load settings that exist
+  switch (fileSettingsCount) {
+    case 1:
+      serialization::readPod(inputFile, whiteSleepScreen);
+      break;
+    case 2:
+      serialization::readPod(inputFile, whiteSleepScreen);
+      serialization::readPod(inputFile, extraParagraphSpacing);
+      break;
   }
 
   inputFile.close();

src/CrossPointSettings.h

@@ -20,7 +20,6 @@ class CrossPointSettings {
 
   // Text rendering settings
   uint8_t extraParagraphSpacing = 1;
-  uint8_t hyphenationEnabled = 1;
 
   ~CrossPointSettings() = default;
 

src/activities/boot_sleep/SleepActivity.cpp

@@ -3,26 +3,10 @@
 #include <GfxRenderer.h>
 
 #include "CrossPointSettings.h"
-#include "SD.h"
 #include "config.h"
 #include "images/CrossLarge.h"
 
 void SleepActivity::onEnter() {
-  // Look for sleep.bmp on the root of the sd card to determine if we should
-  // render a custom sleep screen instead of the default.
-  auto file = SD.open("/sleep.bmp");
-  if (file) {
-    Bitmap bitmap(file);
-    if (bitmap.parseHeaders() == BmpReaderError::Ok) {
-      renderCustomSleepScreen(bitmap);
-      return;
-    }
-  }
-
-  renderDefaultSleepScreen();
-}
-
-void SleepActivity::renderDefaultSleepScreen() const {
   const auto pageWidth = GfxRenderer::getScreenWidth();
   const auto pageHeight = GfxRenderer::getScreenHeight();
 
@@ -38,50 +22,3 @@ void SleepActivity::renderDefaultSleepScreen() const {
 
   renderer.displayBuffer(EInkDisplay::HALF_REFRESH);
 }
-
-void SleepActivity::renderCustomSleepScreen(const Bitmap& bitmap) const {
-  int x, y;
-  const auto pageWidth = GfxRenderer::getScreenWidth();
-  const auto pageHeight = GfxRenderer::getScreenHeight();
-
-  if (bitmap.getWidth() > pageWidth || bitmap.getHeight() > pageHeight) {
-    // image will scale, make sure placement is right
-    const float ratio = static_cast<float>(bitmap.getWidth()) / static_cast<float>(bitmap.getHeight());
-    const float screenRatio = static_cast<float>(pageWidth) / static_cast<float>(pageHeight);
-
-    if (ratio > screenRatio) {
-      // image wider than viewport ratio, scaled down image needs to be centered vertically
-      x = 0;
-      y = (pageHeight - pageWidth / ratio) / 2;
-    } else {
-      // image taller than viewport ratio, scaled down image needs to be centered horizontally
-      x = (pageWidth - pageHeight * ratio) / 2;
-      y = 0;
-    }
-  } else {
-    // center the image
-    x = (pageWidth - bitmap.getWidth()) / 2;
-    y = (pageHeight - bitmap.getHeight()) / 2;
-  }
-
-  renderer.clearScreen();
-  renderer.drawBitmap(bitmap, x, y, pageWidth, pageHeight);
-  renderer.displayBuffer(EInkDisplay::HALF_REFRESH);
-
-  if (bitmap.hasGreyscale()) {
-    bitmap.rewindToData();
-    renderer.clearScreen(0x00);
-    renderer.setRenderMode(GfxRenderer::GRAYSCALE_LSB);
-    renderer.drawBitmap(bitmap, x, y, pageWidth, pageHeight);
-    renderer.copyGrayscaleLsbBuffers();
-
-    bitmap.rewindToData();
-    renderer.clearScreen(0x00);
-    renderer.setRenderMode(GfxRenderer::GRAYSCALE_MSB);
-    renderer.drawBitmap(bitmap, x, y, pageWidth, pageHeight);
-    renderer.copyGrayscaleMsbBuffers();
-
-    renderer.displayGrayBuffer();
-    renderer.setRenderMode(GfxRenderer::BW);
-  }
-}

src/activities/boot_sleep/SleepActivity.h

@@ -1,14 +1,8 @@
 #pragma once
 #include "../Activity.h"
 
-class Bitmap;
-
 class SleepActivity final : public Activity {
  public:
   explicit SleepActivity(GfxRenderer& renderer, InputManager& inputManager) : Activity(renderer, inputManager) {}
   void onEnter() override;
-
- private:
-  void renderDefaultSleepScreen() const;
-  void renderCustomSleepScreen(const Bitmap& bitmap) const;
 };

src/activities/reader/EpubReaderActivity.cpp

@@ -207,7 +207,7 @@ void EpubReaderActivity::renderScreen() {
     Serial.printf("[%lu] [ERS] Loading file: %s, index: %d\n", millis(), filepath.c_str(), currentSpineIndex);
     section = std::unique_ptr<Section>(new Section(epub, currentSpineIndex, renderer));
     if (!section->loadCacheMetadata(READER_FONT_ID, lineCompression, marginTop, marginRight, marginBottom, marginLeft,
-                                    SETTINGS.extraParagraphSpacing, SETTINGS.hyphenationEnabled)) {
+                                    SETTINGS.extraParagraphSpacing)) {
       Serial.printf("[%lu] [ERS] Cache not found, building...\n", millis());
 
       {
@@ -227,7 +227,7 @@ void EpubReaderActivity::renderScreen() {
 
       section->setupCacheDir();
       if (!section->persistPageDataToSD(READER_FONT_ID, lineCompression, marginTop, marginRight, marginBottom,
-                                        marginLeft, SETTINGS.extraParagraphSpacing, SETTINGS.hyphenationEnabled)) {
+                                        marginLeft, SETTINGS.extraParagraphSpacing)) {
         Serial.printf("[%lu] [ERS] Failed to persist page data to SD\n", millis());
         section.reset();
         return;

src/activities/settings/SettingsActivity.cpp

@@ -9,8 +9,7 @@
 
 const SettingInfo SettingsActivity::settingsList[settingsCount] = {
     {"White Sleep Screen", &CrossPointSettings::whiteSleepScreen},
-    {"Extra Paragraph Spacing", &CrossPointSettings::extraParagraphSpacing},
-    {"Hyphenation", &CrossPointSettings::hyphenationEnabled}};
+    {"Extra Paragraph Spacing", &CrossPointSettings::extraParagraphSpacing}};
 
 void SettingsActivity::taskTrampoline(void* param) {
   auto* self = static_cast<SettingsActivity*>(param);

src/activities/settings/SettingsActivity.h

@@ -25,7 +25,7 @@ class SettingsActivity final : public Activity {
   const std::function<void()> onGoHome;
 
   // Static settings list
-  static constexpr int settingsCount = 3;  // Number of settings
+  static constexpr int settingsCount = 2;  // Number of settings
   static const SettingInfo settingsList[settingsCount];
 
   static void taskTrampoline(void* param);