Merge pull request #6379 from gemu2015/display-fix

epaper display 29 fix
This commit is contained in:
Theo Arends 2019-09-08 21:00:10 +02:00 committed by GitHub
commit c0b69a6dde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions

View File

@ -148,6 +148,8 @@ void Ssd1306Time(void)
void Ssd1306Refresh(void) // Every second
{
if (!renderer) return;
if (Settings.display_mode) { // Mode 0 is User text
switch (Settings.display_mode) {
case 1: // Time

View File

@ -108,12 +108,13 @@ void EpdInitDriver29()
#define EPD_FONT_HEIGTH 12
void EpdPrintLog29(void)
{
disp_refresh--;
if (!disp_refresh) {
disp_refresh = Settings.display_refresh;
if (Settings.display_rotate) {
//if (Settings.display_rotate) {
if (!disp_screen_buffer_cols) { DisplayAllocScreenBuffer(); }
}
//}
char* txt = DisplayLogBuffer('\040');
if (txt != nullptr) {
@ -143,6 +144,8 @@ void EpdPrintLog29(void)
void EpdRefresh29(void) // Every second
{
if (Settings.display_mode) { // Mode 0 is User text
if (!renderer) return;
/*
char tftdt[Settings.display_cols[0] +1];
char date4[11]; // 24-04-2017

View File

@ -142,6 +142,7 @@ void SH1106Time(void)
void SH1106Refresh(void) // Every second
{
if (!renderer) return;
if (Settings.display_mode) { // Mode 0 is User text
switch (Settings.display_mode) {
case 1: // Time