mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-10-09 19:26:40 +00:00
JakubandClaude Opus 5
f8b9e1acb8
The misc-fixed font (full Latin/Greek/Cyrillic) had only ever reached SH1106Display and the e-ink driver. GAT562 30S -- like 24 other variants -- uses SSD1306Display, which stayed on the built-in 5x7 font, so every keyboard alphabet beyond ASCII and every accented contact name was transliterated (Łódź -> Lodz) or drawn as a filled block. Extract the renderer into MiscFixedRenderer.h rather than copying it: Adafruit_SH110X and Adafruit_SSD1306 both derive from Adafruit_GFX and glyph drawing is pure pixel plotting, so one implementation serves both drivers (-79 lines from SH1106Display.cpp, same flash usage as before). The header is .cpp-only by contract -- the font tables are static const, so including it from a driver header would land a copy in every translation unit. On SSD1306 the path is opt-in behind OLED_MISC_FIXED_FONT, set only in the two GAT562 30S solo envs: the font costs ~14 KB of flash and the other 24 variants' repeater/companion builds have no keyboard to type those alphabets on. Without the flag that driver is unchanged, verified by building GAT562_30S_Mesh_Kit_repeater. Drive-by consistency fix from the extraction: a newline in print() now advances the cursor by yAdvance * text_size instead of a single yAdvance, which was half a row short at setTextSize(2). The e-ink driver always scaled it. No effect at size 1, which is everywhere the UI prints '\n'. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
79 lines
3.1 KiB
C++
79 lines
3.1 KiB
C++
#pragma once
|
|
|
|
#include "DisplayDriver.h"
|
|
#include <Wire.h>
|
|
#include <Adafruit_GFX.h>
|
|
#define SH110X_NO_SPLASH
|
|
#include <Adafruit_SH110X.h>
|
|
|
|
#ifndef PIN_OLED_RESET
|
|
#define PIN_OLED_RESET -1
|
|
#endif
|
|
|
|
#ifndef DISPLAY_ADDRESS
|
|
#define DISPLAY_ADDRESS 0x3C
|
|
#endif
|
|
|
|
class SH1106Display : public DisplayDriver
|
|
{
|
|
Adafruit_SH1106G display;
|
|
bool _isOn;
|
|
uint8_t _color;
|
|
uint8_t _contrast;
|
|
uint8_t _precharge;
|
|
bool _single_font = true; // OLED is single-font (misc-fixed 6x9); the Lemon/default switch is retired here
|
|
int _text_sz;
|
|
// Frame-skip: endFrame() hashes the GFX buffer (FNV-1a, no external dep — the
|
|
// CRC32 lib is only wired into e-ink builds) and skips the I²C flush when it's
|
|
// byte-identical to the last one pushed. _force_redraw guarantees the first
|
|
// frame and the frame after turnOn()/clear() always flush.
|
|
uint32_t _last_frame_hash = 0;
|
|
bool _force_redraw = true;
|
|
|
|
bool i2c_probe(TwoWire &wire, uint8_t addr);
|
|
// Thin wrapper over the shared misc-fixed renderer (MiscFixedRenderer.h), kept
|
|
// out of this header so the font tables land in one translation unit only.
|
|
uint8_t glyphXAdvance(uint32_t cp);
|
|
|
|
public:
|
|
SH1106Display() : DisplayDriver(128, 64), display(128, 64, &Wire, PIN_OLED_RESET) {
|
|
_isOn = false; _contrast = 255; _precharge = 0x1F; _text_sz = 1;
|
|
}
|
|
bool begin();
|
|
|
|
bool isOn() override { return _isOn; }
|
|
void turnOn() override;
|
|
void turnOff() override;
|
|
void clear() override;
|
|
void startFrame(Color bkg = DARK) override;
|
|
void setTextSize(int sz) override;
|
|
void setColor(Color c) override;
|
|
void setCursor(int x, int y) override;
|
|
void print(const char *str) override;
|
|
void fillRect(int x, int y, int w, int h) override;
|
|
void drawRect(int x, int y, int w, int h) override;
|
|
void drawXbm(int x, int y, const uint8_t *bits, int w, int h) override;
|
|
uint16_t getTextWidth(const char *str) override;
|
|
uint16_t getCodepointWidth(uint32_t cp) override {
|
|
if (_single_font) return glyphXAdvance(cp);
|
|
return 6 * _text_sz; // built-in 5x7 font: 6 px advance per glyph
|
|
}
|
|
int getCharWidth() const override { return 6 * _text_sz; } // misc-fixed 6x9 is 6px wide
|
|
int getLineHeight() const override { return (_single_font ? 9 : 8) * _text_sz; } // misc-fixed 6x9 box height
|
|
// Only the built-in classic font pads every measured string by one trailing
|
|
// advance column (see DisplayDriver::textWidthTrailingGap()); the lemon
|
|
// font's width comes from its own glyph table (ink-tight, no padding).
|
|
int textWidthTrailingGap() const override { return _single_font ? 0 : 1; }
|
|
void setSingleFont(bool) override { } // single-font: ignore toggles, stay misc-fixed 6x9
|
|
bool isSingleFont() const override { return _single_font; }
|
|
void translateUTF8ToBlocks(char* dest, const char* src, size_t dest_size) override;
|
|
void setBrightness(uint8_t level) override;
|
|
void endFrame() override;
|
|
|
|
#ifdef ENABLE_SCREENSHOT
|
|
const uint8_t* getBuffer() override { return display.getBuffer(); }
|
|
uint16_t getBufferSize() override { return (uint16_t)((width() * height()) / 8); }
|
|
uint8_t getDisplayType() override { return 0; }
|
|
#endif
|
|
};
|