btclock_v3/src/fonts/fonts.hpp
Djuri Baars 13c8e67b4c
All checks were successful
BTClock CI / build (push) Successful in 12m16s
BTClock CI / merge (map[name:btclock_rev_b version:esp32s3], 213epd) (push) Successful in 31s
BTClock CI / merge (map[name:btclock_v8 version:esp32s3], 213epd) (push) Successful in 21s
BTClock CI / merge (map[name:lolin_s3_mini version:esp32s3], 213epd) (push) Successful in 29s
BTClock CI / merge (map[name:lolin_s3_mini version:esp32s3], 29epd) (push) Successful in 19s
BTClock CI / release (push) Successful in 39s
More efficient handling of multiple fonts, restore data bugfix
2024-12-30 00:53:50 +01:00

97 lines
2.6 KiB
C++

#pragma once
#include <Adafruit_GFX.h>
#include <Arduino.h>
#include <rom/miniz.h>
// Font metadata structure
struct FontData {
const uint8_t* compressedData;
const GFXglyph* glyphs;
const size_t compressedSize;
const size_t originalSize;
const uint16_t first;
const uint16_t last;
const uint8_t yAdvance;
};
// Font name constants
namespace FontNames {
static const String ANTONIO = "antonio";
static const String OSWALD = "oswald";
static const std::array<String, 2> AVAILABLE_FONTS = {
ANTONIO,
OSWALD
};
static const std::array<String, 2>& getAvailableFonts() {
return AVAILABLE_FONTS;
}
}
class FontLoader {
public:
static GFXfont* loadCompressedFont(const FontData& fontData) {
return loadCompressedFont(
fontData.compressedData,
fontData.glyphs,
fontData.compressedSize,
fontData.originalSize,
fontData.first,
fontData.last,
fontData.yAdvance
);
}
static GFXfont* loadCompressedFont(
const uint8_t* compressedData,
const GFXglyph* glyphs,
const size_t compressedSize,
const size_t originalSize,
const uint16_t first,
const uint16_t last,
const uint8_t yAdvance)
{
uint8_t* decompressedData = (uint8_t*)malloc(originalSize);
if (!decompressedData) {
Serial.println(F("Failed to allocate memory for font decompression"));
return nullptr;
}
size_t decompressedSize = originalSize;
if (GzipDecompressor::decompressData(compressedData,
compressedSize,
decompressedData,
&decompressedSize))
{
GFXfont* font = (GFXfont*)malloc(sizeof(GFXfont));
if (!font) {
free(decompressedData);
Serial.println(F("Failed to allocate memory for font structure"));
return nullptr;
}
font->bitmap = decompressedData;
font->glyph = (GFXglyph*)glyphs;
font->first = first;
font->last = last;
font->yAdvance = yAdvance;
return font;
}
Serial.println(F("Font decompression failed"));
free(decompressedData);
return nullptr;
}
static void unloadFont(GFXfont* font) {
if (font) {
if (font->bitmap) {
free((void*)font->bitmap);
}
free(font);
}
}
};