From 035dab75c821a35859b70f0556cfbb6b7b83667e Mon Sep 17 00:00:00 2001 From: LloydRichardsIntern <59728961+LloydRichardsIntern@users.noreply.github.com> Date: Tue, 14 Apr 2020 15:59:49 +0200 Subject: [PATCH] test: Added Font Test Added some variable tests of the font on the splash screen as well as in the display functions --- lib/MimirTesting/MimirTesting.cpp | 36 ++++++++++++++++++++++++++----- src/main.cpp | 4 ++-- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/lib/MimirTesting/MimirTesting.cpp b/lib/MimirTesting/MimirTesting.cpp index f15e957..e22e2af 100644 --- a/lib/MimirTesting/MimirTesting.cpp +++ b/lib/MimirTesting/MimirTesting.cpp @@ -71,14 +71,39 @@ MimirTesting::MimirTesting() void MimirTesting::initDisplay(int baudRate) { display.init(baudRate); - display.setFont(&Roboto_Slab_Regular_16); - display.setTextSize(0); display.setTextColor(GxEPD_BLACK); display.setRotation(0); - display.setCursor(2, 20); - display.println("I want..."); + display.setCursor(0, 20); + + display.setFont(&Lato_Regular_10); + display.print("Temp: "); + display.setFont(&Roboto_Slab_Regular_16); + display.print("21.6"); + display.println(" C"); display.println(); - display.println("PANCAKES!"); + + display.setFont(&Lato_Regular_10); + display.print("Humi: "); + display.setFont(&Roboto_Slab_Regular_16); + display.print("37"); + display.println(" %"); + display.println(); + + display.setFont(&Lato_Regular_10); + display.print("Pres: "); + display.setFont(&Roboto_Slab_Regular_16); + display.print("2199"); + display.println(" Hpa"); + display.println(); + + display.setFont(&Lato_Regular_10); + display.print("CO2: "); + display.setFont(&Roboto_Slab_Regular_16); + display.print("1200"); + display.println(" ppm"); + display.println(); + + display.setFont(&Lato_Regular_10); display.update(); delay(1000); display.updateWindow(0, 0, GxEPD_WIDTH, GxEPD_HEIGHT, true); @@ -355,6 +380,7 @@ void MimirTesting::DisplaySentData(int httpResponseCode, String response) { display.fillScreen(GxEPD_WHITE); display.setCursor(2, 20); + if (httpResponseCode > 0) { display.println("Data Sent!"); diff --git a/src/main.cpp b/src/main.cpp index e1f852f..0fd6a72 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -18,9 +18,9 @@ void setup() mimirTesting.initTimer(); mimirTesting.initDash(); mimirTesting.readBattery(); - mimirTesting.readSensors(); + mimirTesting.readSensors(true); mimirTesting.WiFi_ON(); - mimirTesting.sendData(); + mimirTesting.sendData(true); mimirTesting.WiFi_OFF(); mimirTesting.SLEEP(); }