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

Small fixes for candy merge

Browse Source
This commit is contained in:
Daniel Eichhorn
2017-07-22 16:02:14 +02:00
parent 3ee59a720e
commit 45069f8471
4 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,13 +18,19 @@ SOFTWARE.
See more at https://blog.squix.org
*/
/*****************************
* Important: see settings.h to configure your settings!!!
* ***************************/
#include "settings.h"
#include <Arduino.h>
#include <SPI.h>
#include <ESP8266WiFi.h>
#ifdef HAVE_TOUCHPAD
#include <XPT2046_Touchscreen.h>
#include "TouchController.h"
#include "TouchControllerWS.h"
#endif
/***
@@ -49,10 +55,7 @@ See more at https://blog.squix.org
#include "moonphases.h"
#include "weathericons.h"
/*****************************
* Important: see settings.h to configure your settings!!!
* ***************************/
#include "settings.h"
#define MINI_BLACK 0
@@ -85,7 +88,7 @@ Carousel carousel(&gfx, 0, 0, 240, 100);
#ifdef HAVE_TOUCHPAD
XPT2046_Touchscreen ts(TOUCH_CS, TOUCH_IRQ);
TouchController touchController(&ts);
TouchControllerWS touchController(&ts);
void calibrationCallback(int16_t x, int16_t y);
CalibrationCallback calibration = &calibrationCallback;