DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ss_oled update (now working)

Browse Source
This commit is contained in:
Verkehrsrot 2019-12-21 16:51:09 +01:00
parent c65c32275e
commit 6d7b392620
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platformio.ini
View File

@ -58,7 +58,8 @@ lib_deps_lora =
;MCCI LoRaWAN LMIC library@>=3.0.99 ; MCCI LMIC by Terrill Moore ;MCCI LoRaWAN LMIC library@>=3.0.99 ; MCCI LMIC by Terrill Moore
https://github.com/mcci-catena/arduino-lmic.git#5322dd1 https://github.com/mcci-catena/arduino-lmic.git#5322dd1
lib_deps_display = lib_deps_display =
ss_oled@=3.1.0 ;ss_oled@=3.1.0
https://github.com/bitbank2/ss_oled.git#a5fbee4
BitBang_I2C@>=1.2.0 BitBang_I2C@>=1.2.0
QRCode@>=0.0.1 QRCode@>=0.0.1
lib_deps_matrix_display = lib_deps_matrix_display =

13
src/display.cpp
View File

@ -57,6 +57,7 @@ const char *printmonth[] = {"xxx", "Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
uint8_t DisplayIsOn = 0; uint8_t DisplayIsOn = 0;
uint8_t displaybuf[DISPLAY_WIDTH * DISPLAY_HEIGHT / 8] = {0}; uint8_t displaybuf[DISPLAY_WIDTH * DISPLAY_HEIGHT / 8] = {0};
static uint8_t plotbuf[DISPLAY_WIDTH * DISPLAY_HEIGHT / 8] = {0};
QRCode qrcode; QRCode qrcode;
@ -298,7 +299,7 @@ void draw_page(time_t t, uint8_t page) {
// page 1: pax graph // page 1: pax graph
case 1: case 1:
oledDumpBuffer(displaybuf); oledDumpBuffer(plotbuf);
break; // page1 break; // page1
// page 2: GPS // page 2: GPS
@ -502,24 +503,22 @@ void oledPlotCurve(uint16_t count, bool reset) {
if (col < DISPLAY_WIDTH - 1) // matrix not full -> increment column if (col < DISPLAY_WIDTH - 1) // matrix not full -> increment column
col++; col++;
else // matrix full -> scroll left 1 dot else // matrix full -> scroll left 1 dot
oledScrollBufferHorizontal(displaybuf, DISPLAY_WIDTH, DISPLAY_HEIGHT, oledScrollBufferHorizontal(plotbuf, DISPLAY_WIDTH, DISPLAY_HEIGHT, true);
true);
} else // clear current dot } else // clear current dot
oledDrawPixel(displaybuf, col, row, 0); oledDrawPixel(plotbuf, col, row, 0);
// scroll down, if necessary // scroll down, if necessary
while ((count - v_scroll) > DISPLAY_HEIGHT - 1) while ((count - v_scroll) > DISPLAY_HEIGHT - 1)
v_scroll++; v_scroll++;
if (v_scroll) if (v_scroll)
oledScrollBufferVertical(displaybuf, DISPLAY_WIDTH, DISPLAY_HEIGHT, oledScrollBufferVertical(plotbuf, DISPLAY_WIDTH, DISPLAY_HEIGHT, v_scroll);
v_scroll);
// set new dot // set new dot
// row = DISPLAY_HEIGHT - 1 - (count - v_scroll) % DISPLAY_HEIGHT; // row = DISPLAY_HEIGHT - 1 - (count - v_scroll) % DISPLAY_HEIGHT;
row = DISPLAY_HEIGHT - 1 - count - v_scroll; row = DISPLAY_HEIGHT - 1 - count - v_scroll;
last_count = count; last_count = count;
oledDrawPixel(displaybuf, col, row, 1); oledDrawPixel(plotbuf, col, row, 1);
} }
#endif // HAS_DISPLAY #endif // HAS_DISPLAY