projects/esp-weather-station
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Completing merge

Browse Source
This commit is contained in:
Daniel Eichhorn
2017-07-09 18:36:19 +02:00
parent 1e34ac63ee
commit f11de7a69e
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ArialRounded.h
View File

@@ -19,10 +19,10 @@ See more at https://blog.squix.org
*/ */
// Created by http://oleddisplay.squix.ch/ Consider a donation // Created by http://oleddisplay.squix.ch/ Consider a donation
// In case of problems make sure that you are using the font file with the correct version! // In case of problems make sure that you are using the font file with the correct version!
const char ArialRoundedMTBold_14[] PROGMEM = { const char ArialRoundedMTBold_14[] PROGMEM = {
0x0E, // Width: 14 0x0E, // Width: 14
0x11, // Height: 17 0x11, // Height: 17
0x20, // First Char: 32 0x20, // First Char: 32
0xE0, // Numbers of Chars: 224 0xE0, // Numbers of Chars: 224
// Jump Table: // Jump Table:
@@ -875,5 +875,3 @@ const char ArialRoundedMTBold_36[] PROGMEM = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFC,0xFF,0xFF,0xFF,0x01,0x00,0xFE,0xFF,0xFF,0xFF,0x03,0x00,0xFE,0xFF,0xFF,0xFF,0x03,0x00,0xFE,0xFF,0xFF,0xFF,0x03,0x00,0xFC,0xFF,0xFF,0xFF,0x01,0x00,0x00,0x78,0xF0,0x00,0x00,0x00,0x00,0x1C,0xC0,0x01,0x00,0x00,0x00,0x1E,0xC0,0x03,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x1F,0xC0,0x07,0x00,0x00,0x00,0x7F,0xF0,0x07,0x00,0x00,0x00,0xFE,0xFF,0x03,0x00,0x00,0x00,0xFE,0xFF,0x03,0x00,0x00,0x00,0xFC,0xFF,0x01,0x00,0x00,0x00,0xF0,0x7F,0x00,0x00,0x00,0x00,0xC0,0x1F, // 254 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFC,0xFF,0xFF,0xFF,0x01,0x00,0xFE,0xFF,0xFF,0xFF,0x03,0x00,0xFE,0xFF,0xFF,0xFF,0x03,0x00,0xFE,0xFF,0xFF,0xFF,0x03,0x00,0xFC,0xFF,0xFF,0xFF,0x01,0x00,0x00,0x78,0xF0,0x00,0x00,0x00,0x00,0x1C,0xC0,0x01,0x00,0x00,0x00,0x1E,0xC0,0x03,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x1F,0xC0,0x07,0x00,0x00,0x00,0x7F,0xF0,0x07,0x00,0x00,0x00,0xFE,0xFF,0x03,0x00,0x00,0x00,0xFE,0xFF,0x03,0x00,0x00,0x00,0xFC,0xFF,0x01,0x00,0x00,0x00,0xF0,0x7F,0x00,0x00,0x00,0x00,0xC0,0x1F, // 254
0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x0E,0x00,0xC0,0x03,0x00,0x00,0x3F,0x00,0xC0,0x03,0x00,0x00,0xFF,0x01,0xC0,0x03,0x00,0x18,0xFF,0x07,0xC0,0x03,0x00,0x3C,0xFC,0x3F,0xE0,0x03,0x00,0x3C,0xE0,0xFF,0xF0,0x03,0x00,0x18,0x00,0xFF,0xFF,0x03,0x00,0x00,0x00,0xF8,0xFF,0x01,0x00,0x00,0x00,0xC0,0xFF,0x00,0x00,0x18,0x00,0xF8,0x3F,0x00,0x00,0x3C,0x00,0xFF,0x0F,0x00,0x00,0x3C,0xC0,0xFF,0x01,0x00,0x00,0x18,0xF8,0x7F,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0x00,0x00,0xFF,0x01,0x00,0x00,0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x0E // 255 0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x0E,0x00,0xC0,0x03,0x00,0x00,0x3F,0x00,0xC0,0x03,0x00,0x00,0xFF,0x01,0xC0,0x03,0x00,0x18,0xFF,0x07,0xC0,0x03,0x00,0x3C,0xFC,0x3F,0xE0,0x03,0x00,0x3C,0xE0,0xFF,0xF0,0x03,0x00,0x18,0x00,0xFF,0xFF,0x03,0x00,0x00,0x00,0xF8,0xFF,0x01,0x00,0x00,0x00,0xC0,0xFF,0x00,0x00,0x18,0x00,0xF8,0x3F,0x00,0x00,0x3C,0x00,0xFF,0x0F,0x00,0x00,0x3C,0xC0,0xFF,0x01,0x00,0x00,0x18,0xF8,0x7F,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0x00,0x00,0xFF,0x01,0x00,0x00,0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x0E // 255
}; };

5
TouchController.cpp
View File

@@ -29,7 +29,7 @@ bool TouchController::loadCalibration() {
} }
f.close(); f.close();
} }
bool TouchController::saveCalibration() { bool TouchController::saveCalibration() {
@@ -68,7 +68,7 @@ void TouchController::continueCalibration() {
} else if (state == 1) { } else if (state == 1) {
(*calibrationCallback)(230, 310); (*calibrationCallback)(230, 310);
if (touchScreen->touched() && (millis() - lastStateChange > 1000)) { if (touchScreen->touched() && (millis() - lastStateChange > 1000)) {
p2 = p; p2 = p;
state++; state++;
lastStateChange = millis(); lastStateChange = millis();
@@ -103,4 +103,3 @@ TS_Point TouchController::getPoint() {
p.y = y; p.y = y;
return p; return p;
} }

1
TouchController.h
View File

@@ -33,4 +33,3 @@ class TouchController {
}; };
#endif #endif

2
esp8266-weather-station-color.ino
View File

@@ -49,7 +49,7 @@ See more at https://blog.squix.org
* Important: see settings.h to configure your settings!!! * Important: see settings.h to configure your settings!!!
* ***************************/ * ***************************/
#include "settings.h" #include "settings.h"
#define MINI_BLACK 0 #define MINI_BLACK 0
#define MINI_WHITE 1 #define MINI_WHITE 1