Browse Source

Integration 2.42" Display als Typ 6

pull/1139/head
dAjaY85 1 year ago
parent
commit
7c6cb35c8e
  1. 2
      src/plugins/Display/Display.h
  2. 4
      src/plugins/Display/Display_Mono_128X64.h
  3. 2
      src/web/html/setup.html

2
src/plugins/Display/Display.h

@ -35,7 +35,7 @@ class Display {
case 3: mMono = new DisplayMono84X48(); break; case 3: mMono = new DisplayMono84X48(); break;
case 4: mMono = new DisplayMono128X32(); break; case 4: mMono = new DisplayMono128X32(); break;
case 5: mMono = new DisplayMono64X48(); break; case 5: mMono = new DisplayMono64X48(); break;
case 6: mMono = new DisplayMono128X64(); break;
#if defined(ESP32) #if defined(ESP32)
case 10: case 10:
mMono = NULL; // ePaper does not use this mMono = NULL; // ePaper does not use this

4
src/plugins/Display/Display_Mono_128X64.h

@ -27,10 +27,12 @@ class DisplayMono128X64 : public DisplayMono {
case 1: case 1:
mDisplay = new U8G2_SSD1306_128X64_NONAME_F_HW_I2C(rot, reset, clock, data); mDisplay = new U8G2_SSD1306_128X64_NONAME_F_HW_I2C(rot, reset, clock, data);
break; break;
default:
case 2: case 2:
mDisplay = new U8G2_SH1106_128X64_NONAME_F_HW_I2C(rot, reset, clock, data); mDisplay = new U8G2_SH1106_128X64_NONAME_F_HW_I2C(rot, reset, clock, data);
break; break;
case 6:
mDisplay = new U8G2_SSD1309_128X64_NONAME0_F_HW_I2C(rot, reset, clock, data);
break;
} }
mUtcTs = utcTs; mUtcTs = utcTs;

2
src/web/html/setup.html

@ -839,7 +839,7 @@
} }
// keep display types grouped // keep display types grouped
var opts = [[0, "None"], [2, "SH1106 1.3\" 128X64"], [5, "SSD1306 0.66\" 64X48 (Wemos OLED Shield)"], [4, "SSD1306 0.91\" 128X32"], [1, "SSD1306 0.96\" 128X64"], [3, "Nokia5110"]]; var opts = [[0, "None"], [2, "SH1106 1.3\" 128X64"], [5, "SSD1306 0.66\" 64X48 (Wemos OLED Shield)"], [4, "SSD1306 0.91\" 128X32"], [1, "SSD1306 0.96\" 128X64"], [6, "SSD1309 2.42\" 128X64"], [3, "Nokia5110"]];
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"]);

Loading…
Cancel
Save