From d451bcbab2b7cac484811fcdf281f1a51db7f286 Mon Sep 17 00:00:00 2001 From: l0sted Date: Mon, 7 May 2018 23:13:41 +0300 Subject: [PATCH] commit2 --- .vscode/arduino.json | 7 +++++++ .vscode/settings.json | 3 +++ frontend.ino | 7 +++---- 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 .vscode/arduino.json create mode 100644 .vscode/settings.json diff --git a/.vscode/arduino.json b/.vscode/arduino.json new file mode 100644 index 0000000..126c748 --- /dev/null +++ b/.vscode/arduino.json @@ -0,0 +1,7 @@ +{ + "board": "esp8266:esp8266:generic", + "configuration": "CpuFrequency=80,FlashFreq=40,FlashMode=dio,UploadSpeed=115200,FlashSize=1M512,ResetMethod=ck,Debug=Disabled,DebugLevel=None____", + "port": "/dev/ttyUSB0", + "sketch": "frontend.ino", + "output": "../ArduinoOutput" +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..a5c9050 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "C_Cpp.intelliSenseEngineFallback": "Enabled" +} \ No newline at end of file diff --git a/frontend.ino b/frontend.ino index a0d500c..763be98 100644 --- a/frontend.ino +++ b/frontend.ino @@ -6,7 +6,7 @@ #include "SSD1306Brzo.h" // #include // #include -#include "wifi.h" +#include "../wifi.h" #include "Adafruit_MQTT.h" #include "Adafruit_MQTT_Client.h" @@ -74,8 +74,7 @@ void setup(){ mqtt.subscribe(&outFeed); mqtt.subscribe(&inFeed); mqtt.subscribe(&humidFeed); - //debug - Serial.println(ESP.getVcc()); + Serial.println(ESP.getFlashChipRealSize()); } @@ -89,7 +88,7 @@ void loop(){ if(! mqtt.ping()) { mqtt.disconnect(); } - mainScreen(); + mainScreen();//it could be cool and smooth if we could update screen independently, in some kind of separate thread or smthn similar if (timeClient.getMinutes() == 0 && timeClient.getSeconds() < 5 && !nightMode() && lastBeep != timeClient.getHours()) { //beep tone(15,1000); delay(100);