3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-23 05:46:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add support for 128x32 display

Browse source
This commit is contained in:
Thomas Pohl 2023-04-23 11:14:13 +02:00
parent 15ec6a0608
commit df40286c04
3 changed files with 92 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

96
src/plugins/Display/Display_Mono.cpp
View file

@ -28,7 +28,7 @@ DisplayMono::DisplayMono() {
void DisplayMono::init(uint8_t type, uint8_t rotation, uint8_t cs, uint8_t dc, uint8_t reset, uint8_t clock, uint8_t data, uint32_t *utcTs, const char* version) { void DisplayMono::init(uint8_t type, uint8_t rotation, uint8_t cs, uint8_t dc, uint8_t reset, uint8_t clock, uint8_t data, uint32_t *utcTs, const char* version) {
if ((0 < type) && (type < 4)) { if ((0 < type) && (type < 5)) {
u8g2_cb_t *rot = (u8g2_cb_t *)((rotation != 0x00) ? U8G2_R2 : U8G2_R0); u8g2_cb_t *rot = (u8g2_cb_t *)((rotation != 0x00) ? U8G2_R2 : U8G2_R0);
mType = type; mType = type;
switch(type) { switch(type) {
@ -42,21 +42,25 @@ void DisplayMono::init(uint8_t type, uint8_t rotation, uint8_t cs, uint8_t dc, u
case 3: case 3:
mDisplay = new U8G2_PCD8544_84X48_F_4W_SW_SPI(rot, clock, data, cs, dc, reset); mDisplay = new U8G2_PCD8544_84X48_F_4W_SW_SPI(rot, clock, data, cs, dc, reset);
break; break;
case 4:
mDisplay = new U8G2_SSD1306_128X32_UNIVISION_F_HW_I2C(rot, reset, clock, data);
break;
} }
mUtcTs = utcTs; mUtcTs = utcTs;
mDisplay->begin(); mDisplay->begin();
mIsLarge = (mDisplay->getWidth() > 120); mIsWide = (mDisplay->getWidth() > 120);
calcLineHeights(); mIsTall = (mDisplay->getHeight() > 60);
calcLinePositions();
mDisplay->clearBuffer(); mDisplay->clearBuffer();
if (3 != mType) if (3 != mType)
mDisplay->setContrast(mLuminance); mDisplay->setContrast(mLuminance);
printText("AHOY!", 0, 35); printText("AHOY!", 0);
printText("ahoydtu.de", 2, 20); printText("ahoydtu.de", 2);
printText(version, 3, 46); printText(version, 3);
mDisplay->sendBuffer(); mDisplay->sendBuffer();
} }
} }
@ -92,7 +96,7 @@ void DisplayMono::disp(float totalPower, float totalYieldDay, float totalYieldTo
} }
printText(_fmtText, 0); printText(_fmtText, 0);
} else { } else {
printText("offline", 0, 25); printText("offline", 0);
// check if it's time to enter power saving mode // check if it's time to enter power saving mode
if (mTimeout == 0) if (mTimeout == 0)
mDisplay->setPowerSave(mEnPowerSafe); mDisplay->setPowerSave(mEnPowerSafe);
@ -111,11 +115,13 @@ void DisplayMono::disp(float totalPower, float totalYieldDay, float totalYieldTo
snprintf(_fmtText, DISP_FMT_TEXT_LEN, "%d Inverter on", isprod); snprintf(_fmtText, DISP_FMT_TEXT_LEN, "%d Inverter on", isprod);
printText(_fmtText, 3); printText(_fmtText, 3);
} else { } else {
if(mIsLarge && (NULL != mUtcTs)) if (NULL != mUtcTs){
if(mIsWide && mIsTall)
printText(ah::getDateTimeStr(gTimezone.toLocal(*mUtcTs)).c_str(), 3); printText(ah::getDateTimeStr(gTimezone.toLocal(*mUtcTs)).c_str(), 3);
else else
printText(ah::getTimeStr(gTimezone.toLocal(*mUtcTs)).c_str(), 3); printText(ah::getTimeStr(gTimezone.toLocal(*mUtcTs)).c_str(), 3);
} }
}
mDisplay->sendBuffer(); mDisplay->sendBuffer();
@ -123,35 +129,87 @@ void DisplayMono::disp(float totalPower, float totalYieldDay, float totalYieldTo
_mExtra++; _mExtra++;
} }
void DisplayMono::calcLineHeights() { void DisplayMono::calcLinePositions() {
uint8_t yOff = 0; uint8_t yOff[] = {0,0};
for (uint8_t i = 0; i < 4; i++) { for (uint8_t i = 0; i < 4; i++) {
setFont(i); setFont(i);
yOff += (mDisplay->getMaxCharHeight()); yOff[getColumn(i)] += (mDisplay->getMaxCharHeight());
mLineOffsets[i] = yOff; mLineYOffsets[i] = yOff[getColumn(i)];
if (isTwoRowLine(i)){
yOff[getColumn(i)] += mDisplay->getMaxCharHeight();
}
yOff[getColumn(i)]+= BOTTOM_MARGIN;
if (mIsTall && mIsWide){
mLineXOffsets[i] = (i == 0) ? 10 : 5 + (getColumn(i)==1? 80 : 0);
} else {
mLineXOffsets[i] = (getColumn(i)==1? 80 : 0);
}
} }
} }
inline void DisplayMono::setFont(uint8_t line) { inline void DisplayMono::setFont(uint8_t line) {
switch (line) { switch (line) {
case 0: case 0:
mDisplay->setFont((mIsLarge) ? u8g2_font_ncenB14_tr : u8g2_font_logisoso16_tr); if (mIsWide && mIsTall){
mDisplay->setFont(u8g2_font_ncenB14_tr);
} else if (mIsWide && ! mIsTall){
mDisplay->setFont(u8g2_font_9x15_tf);
} else {
mDisplay->setFont(u8g2_font_logisoso16_tr);
}
break; break;
case 3: case 3:
if (mIsWide && ! mIsTall){
mDisplay->setFont(u8g2_font_tom_thumb_4x6_tf);
} else {
mDisplay->setFont(u8g2_font_5x8_tr); mDisplay->setFont(u8g2_font_5x8_tr);
}
break; break;
default: default:
mDisplay->setFont((mIsLarge) ? u8g2_font_ncenB10_tr : u8g2_font_5x8_tr); if (mIsTall){
mDisplay->setFont(u8g2_font_ncenB10_tr);
} else if (mIsWide){
mDisplay->setFont(u8g2_font_tom_thumb_4x6_tf);
} else {
mDisplay->setFont(u8g2_font_5x8_tr);
}
break; break;
} }
} }
void DisplayMono::printText(const char* text, uint8_t line, uint8_t dispX) { inline uint8_t DisplayMono::getColumn(uint8_t line) {
if (!mIsLarge) { if (mIsTall){
dispX = (line == 0) ? 10 : 5; return 0;
} else if (line>=1 && line<=2){
return 1;
} else {
return 0;
} }
}
inline bool DisplayMono::isTwoRowLine(uint8_t line) {
if (mIsTall){
return false;
} else if (line>=1 && line<=2){
return true;
} else {
return false;
}
}
void DisplayMono::printText(const char* text, uint8_t line) {
setFont(line); setFont(line);
dispX += (mEnScreenSaver) ? (_mExtra % 7) : 0; uint8_t dispX = mLineXOffsets[line] + ((mEnScreenSaver) ? (_mExtra % 7) : 0);
mDisplay->drawStr(dispX, mLineOffsets[line], text);
if (isTwoRowLine(line)){
String stringText = String(text);
int space = stringText.indexOf(" ");
mDisplay->drawStr(dispX, mLineYOffsets[line], stringText.substring(0,space).c_str());
if (space>0)
mDisplay->drawStr(dispX, mLineYOffsets[line] + mDisplay->getMaxCharHeight(), stringText.substring(space+1).c_str());
} else {
mDisplay->drawStr(dispX, mLineYOffsets[line], text);
} }
}

13
src/plugins/Display/Display_Mono.h
View file

@ -4,6 +4,7 @@
#include <U8g2lib.h> #include <U8g2lib.h>
#define DISP_DEFAULT_TIMEOUT 60 // in seconds #define DISP_DEFAULT_TIMEOUT 60 // in seconds
#define DISP_FMT_TEXT_LEN 32 #define DISP_FMT_TEXT_LEN 32
#define BOTTOM_MARGIN 5
class DisplayMono { class DisplayMono {
public: public:
@ -15,9 +16,11 @@ class DisplayMono {
void disp(float totalPower, float totalYieldDay, float totalYieldTotal, uint8_t isprod); void disp(float totalPower, float totalYieldDay, float totalYieldTotal, uint8_t isprod);
private: private:
void calcLineHeights(); void calcLinePositions();
void setFont(uint8_t line); void setFont(uint8_t line);
void printText(const char* text, uint8_t line, uint8_t dispX = 5); uint8_t getColumn(uint8_t line);
bool isTwoRowLine(uint8_t line);
void printText(const char* text, uint8_t line);
U8G2* mDisplay; U8G2* mDisplay;
@ -25,10 +28,12 @@ class DisplayMono {
bool mEnPowerSafe, mEnScreenSaver; bool mEnPowerSafe, mEnScreenSaver;
uint8_t mLuminance; uint8_t mLuminance;
bool mIsLarge = false; bool mIsTall = false;
bool mIsWide = false;
uint8_t mLoopCnt; uint8_t mLoopCnt;
uint32_t* mUtcTs; uint32_t* mUtcTs;
uint8_t mLineOffsets[5]; uint8_t mLineXOffsets[5];
uint8_t mLineYOffsets[5];
uint16_t _dispY; uint16_t _dispY;

4
src/web/html/setup.html
View file

@ -733,7 +733,7 @@
); );
} }
var opts = [[0, "None"], [1, "SSD1306 0.96\""], [2, "SH1106 1.3\""], [3, "Nokia5110"]]; var opts = [[0, "None"], [1, "SSD1306 0.96\" 128X64"], [2, "SH1106 1.3\""], [3, "Nokia5110"], [4, "SSD1306 0.96\" 128X32"]];
if("ESP32" == type) if("ESP32" == type)
opts.push([10, "ePaper"]); opts.push([10, "ePaper"]);
var dispType = sel("disp_typ", opts, obj["disp_typ"]); var dispType = sel("disp_typ", opts, obj["disp_typ"]);
@ -769,7 +769,7 @@
if(0 == dispType) if(0 == dispType)
cl.add("hide"); cl.add("hide");
else if(dispType <= 2) { // OLED else if(dispType <= 2 || dispType == 4) { // OLED
if(i < 2) if(i < 2)
cl.remove("hide"); cl.remove("hide");
else else