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

Versuch die WebOberfläche an zu passen

Browse source
This commit is contained in:
dAjaY85 2023-03-05 16:21:06 +01:00
parent 3a2e2fa286
commit 18ea8b5925
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/plugins/Display/Display_ePaper.cpp
View file

@ -11,7 +11,7 @@ SPIClass hspi(HSPI);
std::map<uint8_t, std::function<GxEPD2_GFX*(uint8_t, uint8_t, uint8_t, uint8_t)>> _ePaperTypes = { std::map<uint8_t, std::function<GxEPD2_GFX*(uint8_t, uint8_t, uint8_t, uint8_t)>> _ePaperTypes = {
// DEPG0150BN 200x200, SSD1681, TTGO T5 V2.4.1 // DEPG0150BN 200x200, SSD1681, TTGO T5 V2.4.1
{4, [](uint8_t _CS, uint8_t _DC, uint8_t _RST, uint8_t _BUSY) { return new GxEPD2_BW<GxEPD2_150_BN, GxEPD2_150_BN::HEIGHT>(GxEPD2_150_BN(_CS, _DC, _RST, _BUSY)); }}, {11, [](uint8_t _CS, uint8_t _DC, uint8_t _RST, uint8_t _BUSY) { return new GxEPD2_BW<GxEPD2_150_BN, GxEPD2_150_BN::HEIGHT>(GxEPD2_150_BN(_CS, _DC, _RST, _BUSY)); }},
// GDEW027C44 2.7 " b/w/r 176x264, IL91874 // GDEW027C44 2.7 " b/w/r 176x264, IL91874
//{DisplayType_t::ePaper270, [](uint8_t _CS, uint8_t _DC, uint8_t _RST, uint8_t _BUSY) //{DisplayType_t::ePaper270, [](uint8_t _CS, uint8_t _DC, uint8_t _RST, uint8_t _BUSY)
// F { return new GxEPD2_3C<GxEPD2_270c, GxEPD2_270c::HEIGHT>(GxEPD2_270c(_CS, _DC, _RST, _BUSY)); }}, // F { return new GxEPD2_3C<GxEPD2_270c, GxEPD2_270c::HEIGHT>(GxEPD2_270c(_CS, _DC, _RST, _BUSY)); }},
@ -66,7 +66,8 @@ void DisplayEPaperClass::fullRefresh() {
delay(2000); delay(2000);
// screen complete white // screen complete white
_display->fillScreen(GxEPD_WHITE); _display->fillScreen(GxEPD_WHITE);
while (_display->nextPage()); while (_display->nextPage())
;
} }
//*************************************************************************** //***************************************************************************
void DisplayEPaperClass::headlineIP() { void DisplayEPaperClass::headlineIP() {

4
src/plugins/Display/MonochromeDisplay.h
View file

@ -26,7 +26,7 @@ class MonochromeDisplay {
if (mCfg->type == 0) { if (mCfg->type == 0) {
return; return;
} else if (1 < mCfg->type < 4) { } else if (1 < mCfg->type < 10) {
switch (mCfg->rot) { switch (mCfg->rot) {
case 0: case 0:
DisplayMono.disp_rotation = U8G2_R0; DisplayMono.disp_rotation = U8G2_R0;
@ -47,7 +47,7 @@ class MonochromeDisplay {
DisplayMono.contrast = mCfg->contrast; DisplayMono.contrast = mCfg->contrast;
DisplayMono.init(mCfg->type, mCfg->disp_cs, mCfg->disp_dc, mCfg->disp_reset, mCfg->disp_busy, mCfg->disp_clk, mCfg->disp_data); DisplayMono.init(mCfg->type, mCfg->disp_cs, mCfg->disp_dc, mCfg->disp_reset, mCfg->disp_busy, mCfg->disp_clk, mCfg->disp_data);
} else if (mCfg->type == 4) { } else if (mCfg->type > 10) {
DisplayEPaper.displayRotation = mCfg->rot; DisplayEPaper.displayRotation = mCfg->rot;
counterEPaper = 0; counterEPaper = 0;

1
src/web/RestApi.h
View file

@ -431,7 +431,6 @@ class RestApi {
void getDisplay(JsonObject obj) { void getDisplay(JsonObject obj) {
obj[F("disp_type")] = (uint8_t)mConfig->plugin.display.type; obj[F("disp_type")] = (uint8_t)mConfig->plugin.display.type;
obj[F("disp_pwr")] = (bool)mConfig->plugin.display.pwrSaveAtIvOffline; obj[F("disp_pwr")] = (bool)mConfig->plugin.display.pwrSaveAtIvOffline;
obj[F("logo_en")] = (bool)mConfig->plugin.display.logoEn;
obj[F("px_shift")] = (bool)mConfig->plugin.display.pxShift; obj[F("px_shift")] = (bool)mConfig->plugin.display.pxShift;
obj[F("rotation")] = (uint8_t)mConfig->plugin.display.rot; obj[F("rotation")] = (uint8_t)mConfig->plugin.display.rot;
obj[F("contrast")] = (uint8_t)mConfig->plugin.display.contrast; obj[F("contrast")] = (uint8_t)mConfig->plugin.display.contrast;

1
src/web/web.h
View file

@ -602,7 +602,6 @@ class Web {
// display // display
mConfig->plugin.display.pwrSaveAtIvOffline = (request->arg("dispPwr") == "on"); mConfig->plugin.display.pwrSaveAtIvOffline = (request->arg("dispPwr") == "on");
mConfig->plugin.display.logoEn = (request->arg("logoEn") == "on");
mConfig->plugin.display.pxShift = (request->arg("dispPxSh") == "on"); mConfig->plugin.display.pxShift = (request->arg("dispPxSh") == "on");
mConfig->plugin.display.rot = request->arg("rotation").toInt(); mConfig->plugin.display.rot = request->arg("rotation").toInt();
mConfig->plugin.display.type = request->arg("dispType").toInt(); mConfig->plugin.display.type = request->arg("dispType").toInt();