Skip to content

Commit fffaedf

Browse files
committed
Fix build errors
1 parent e56821b commit fffaedf

File tree

4 files changed

+16
-18
lines changed

4 files changed

+16
-18
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ env:
2222

2323
install:
2424
- pip install -U platformio
25-
- platformio lib -g install "JsonStreamingParser" "ESP8266_SSD1306@4.0.0" 567@0.12 "simpleDSTadjust" "DHT sensor library"
25+
- platformio lib -g install "JsonStreamingParser" "ESP8266_SSD1306@4.0.0" 567@0.12 "simpleDSTadjust" "Adafruit Unified Sensor" "DHT sensor library"
2626
- platformio lib update
2727

2828
script:
29-
- platformio ci --lib="." --project-option="lib_deps=JsonStreamingParser" --board=nodemcuv2
29+
- platformio ci --lib="." --project-option="lib_deps=JsonStreamingParser" --board=nodemcuv2

examples/WeatherStationDemoExtended/WeatherStationDemoExtended.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ See more at http://blog.squix.org
2424
*/
2525

2626
#include <ESPWiFi.h>
27+
#include <ESPHTTPClient.h>
2728
#if defined(ESP8266)
2829
#include <Ticker.h>
2930
#endif
@@ -225,7 +226,7 @@ void setup() {
225226
ArduinoOTA.begin();
226227

227228
updateData(&display);
228-
229+
229230
#if defined(ESP8266)
230231
ticker.attach(UPDATE_INTERVAL_SECS, setReadyForWeatherUpdate);
231232
#endif
@@ -418,4 +419,3 @@ void setReadyForWeatherUpdate() {
418419
Serial.println("Setting readyForUpdate to true");
419420
readyForWeatherUpdate = true;
420421
}
421-

examples/WeatherStationDemoExtendedDST/DSEG7Classic-BoldFont.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// Converted by FontConverterV3.java written by Squix78 http://oleddisplay.squix.ch/ Consider a donation
1010
// In case of problems make sure that you are using the font file with the correct version!
11-
const char DSEG7_Classic_Bold_21[] PROGMEM = {
11+
const uint8_t DSEG7_Classic_Bold_21[] PROGMEM = {
1212
0x11, // Width: 17
1313
0x17, // Height: 23
1414
0x20, // First Char: 32
@@ -135,6 +135,3 @@ const char DSEG7_Classic_Regular_21[] PROGMEM = {
135135
0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x0F,0x00,0xF4,0x17,0x40,0x0C,0x10,0x60,0x0C,0x10,0x60,0x0C,0x10,0x60,0x0C,0x10,0x60,0x0C,0x10,0x60,0x0C,0x10,0x60,0x0C,0x10,0x60,0x0C,0x10,0x60,0x0C,0x10,0x60,0xF4,0xD7,0x5F,0xF8,0xEF,0x3F, // 57
136136
0x00,0x00,0x00,0x80,0x03,0x03,0x80,0x03,0x03 // 58
137137
};
138-
139-
140-

examples/WeatherStationDemoExtendedDST/WeatherStationDemoExtendedDST.ino

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ See more at http://blog.squix.ch
2424
*/
2525

2626
/* Customizations by Neptune (NeptuneEng on Twitter, Neptune2 on Github)
27-
*
27+
*
2828
* Added Wifi Splash screen and credit to Squix78
2929
* Modified progress bar to a thicker and symmetrical shape
3030
* Replaced TimeClient with built-in lwip sntp client (no need for external ntp client library)
@@ -42,7 +42,8 @@ See more at http://blog.squix.ch
4242
* Slight adjustment to overlay
4343
*/
4444

45-
#include <ESP8266WiFi.h>
45+
#include <ESPWiFi.h>
46+
#include <ESPHTTPClient.h>
4647
#include <Ticker.h>
4748
#include "settings.h"
4849
#include <JsonListener.h>
@@ -115,7 +116,7 @@ void setup() {
115116
display.init();
116117
display.clear();
117118
display.display();
118-
119+
119120
display.flipScreenVertically(); // Comment out to flip display 180deg
120121
display.setFont(ArialMT_Plain_10);
121122
display.setTextAlignment(TEXT_ALIGN_CENTER);
@@ -129,7 +130,7 @@ void setup() {
129130
//WiFiManager
130131
//Local intialization. Once its business is done, there is no need to keep it around
131132
WiFiManager wifiManager;
132-
133+
133134
// Uncomment for testing wifi manager
134135
// wifiManager.resetSettings();
135136
wifiManager.setAPCallback(configModeCallback);
@@ -160,7 +161,7 @@ void setup() {
160161

161162
ui.setTargetFPS(30);
162163
ui.setTimePerFrame(10*1000); // Setup frame display time to 10 sec
163-
164+
164165
//Hack until disableIndicator works:
165166
//Set an empty symbol
166167
ui.setActiveSymbol(emptySymbol);
@@ -196,7 +197,7 @@ void loop() {
196197

197198
if (readyForDHTUpdate && ui.getUiState()->frameState == FIXED)
198199
updateDHT();
199-
200+
200201
int remainingTimeBudget = ui.update();
201202

202203
if (remainingTimeBudget > 0) {
@@ -255,7 +256,7 @@ void updateData(OLEDDisplay *display) {
255256
drawProgress(display, 80, "Updating DHT Sensor");
256257
temperature = dht.readTemperature(!IS_METRIC);
257258
delay(500);
258-
259+
259260
drawProgress(display, 90, "Updating thingspeak...");
260261
thingspeak.getLastChannelItem(THINGSPEAK_CHANNEL_ID, THINGSPEAK_API_READ_KEY);
261262
readyForWeatherUpdate = false;
@@ -276,7 +277,7 @@ void drawDateTime(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, in
276277
char time_str[11];
277278
time_t now = dstAdjusted.time(&dstAbbrev);
278279
struct tm * timeinfo = localtime (&now);
279-
280+
280281
display->setTextAlignment(TEXT_ALIGN_CENTER);
281282
display->setFont(ArialMT_Plain_10);
282283
String date = ctime(&now);
@@ -285,7 +286,7 @@ void drawDateTime(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, in
285286
display->drawString(64 + x, 5 + y, date);
286287
display->setFont(DSEG7_Classic_Bold_21);
287288
display->setTextAlignment(TEXT_ALIGN_RIGHT);
288-
289+
289290
#ifdef STYLE_24HR
290291
sprintf(time_str, "%02d:%02d:%02d\n",timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
291292
display->drawString(108 + x, 19 + y, time_str);
@@ -314,7 +315,7 @@ void drawCurrentWeather(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t
314315

315316
display->setFont(ArialMT_Plain_24);
316317
String temp = wunderground.getCurrentTemp() + (IS_METRIC ? "°C": "°F");
317-
318+
318319
display->drawString(60 + x, 15 + y, temp);
319320
int tempWidth = display->getStringWidth(temp);
320321

0 commit comments

Comments
 (0)