lulzette/meteoFront
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated board

Browse Source
This commit is contained in:
l0sted 2018-10-30 12:45:40 +03:00
parent d6292768a9
commit f161e467bf
2 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/arduino.json vendored
View File

@ -2,6 +2,6 @@
"output": "Output", "output": "Output",
"port": "/dev/ttyUSB0", "port": "/dev/ttyUSB0",
"board": "esp8266:esp8266:generic", "board": "esp8266:esp8266:generic",
"configuration": "CpuFrequency=80,VTable=flash,ResetMethod=ck,CrystalFreq=26,FlashFreq=40,FlashMode=qio,FlashSize=4M2M,led=2,LwIPVariant=v2mss536,Debug=Disabled,DebugLevel=None____,FlashErase=none,UploadSpeed=921600", "configuration": "CpuFrequency=80,FlashFreq=40,FlashMode=qio,UploadSpeed=921600,FlashSize=4M2M,ResetMethod=ck,Debug=Disabled,DebugLevel=None____",
"sketch": "frontend.ino" "sketch": "frontend.ino"
} }

50
frontend.ino
View File

@ -14,26 +14,8 @@ const String httpAddr="http://192.168.100.101:1880";
WiFiUDP ntpUDP; WiFiUDP ntpUDP;
NTPClient timeClient(ntpUDP); NTPClient timeClient(ntpUDP);
SSD1306Brzo display(0x3C, 5, 4); //oled display w/ address 0x3C with SDA on GPIO4 and SCL on GPIO5 //address == offset SSD1306Brzo display(0x3C, 5, 4);
void wifiConnect() {
int beginMillis = millis();
WiFi.begin(ssid, password);
while (WiFi.status() != WL_CONNECTED && millis() - beginMillis < 30000) {
delay(250);
displayStatus(1);
Serial.print(".");
}
if (WiFi.status() != WL_CONNECTED) {
displayStatus(2);
delay(10000);
ESP.reset();
} else {
Serial.print("Connected to " + String(ssid) + "; IP address: ");
Serial.println(WiFi.localIP());
displayStatus(0);
}
}
void setup(){ void setup(){
Serial.begin(115200); Serial.begin(115200);
//==DISPLAY INIT== //==DISPLAY INIT==
@ -51,7 +33,7 @@ void setup(){
} }
void loop(){ void loop(){
mainScreen();//it could be cool and smooth if we could update screen independently, in some kind of separate thread or smthn similar mainScreen();
if (((timeClient.getHours()*60 + timeClient.getMinutes()) % beepDelay == 0)&&(timeClient.getSeconds() < 1)&&(!nightMode())){ if (((timeClient.getHours()*60 + timeClient.getMinutes()) % beepDelay == 0)&&(timeClient.getSeconds() < 1)&&(!nightMode())){
tone(15,1000); tone(15,1000);
delay(100); delay(100);
@ -66,7 +48,6 @@ void loop(){
delay(750); delay(750);
} }
} }
//====================IN PROGRESS===================
void netTasks() { void netTasks() {
HTTPClient http; HTTPClient http;
WiFi.forceSleepWake(); WiFi.forceSleepWake();
@ -77,13 +58,13 @@ void netTasks() {
http.begin(httpAddr+"/inTemp"); http.begin(httpAddr+"/inTemp");
if (http.GET() < 0) //IDK why the fuck i cant getString without this check if (http.GET() < 0) //IDK why the fuck i cant getString without this check
return; return;
inTemp="i:"+http.getString(); inTemp="i:"+http.getString()+"C";
http.end(); http.end();
http.begin(httpAddr+"/outTemp"); http.begin(httpAddr+"/outTemp");
if (http.GET() < 0) if (http.GET() < 0)
return; return;
outTemp="o:"+http.getString(); outTemp="o:"+http.getString()+"C";
http.end(); http.end();
http.begin(httpAddr+"/humid"); http.begin(httpAddr+"/humid");
@ -95,7 +76,7 @@ void netTasks() {
http.begin(httpAddr+"/pressure"); http.begin(httpAddr+"/pressure");
if (http.GET() < 0) if (http.GET() < 0)
return; return;
pressure="p:"+http.getString(); pressure="p:"+http.getString()+"mBar";
http.end(); http.end();
updateNtp(); updateNtp();
@ -150,14 +131,31 @@ void displayStatus(int state){
display.display(); display.display();
} }
void updateNtp() { void updateNtp() {
// if (lastNtp != timeClient.getHours()) {
while (!timeClient.update()) while (!timeClient.update())
Serial.println(timeClient.getHours()); Serial.println(timeClient.getHours());
} }
bool nightMode() { bool nightMode() {
if ((timeClient.getHours() > offTime)||(timeClient.getHours() < onTime)) { //turn off screen between loaded time if ((timeClient.getHours() > offTime)||(timeClient.getHours() < onTime)) {
return true; return true;
} }
else else
return false; return false;
} }
void wifiConnect() {
int beginMillis = millis();
WiFi.begin(ssid, password);
while (WiFi.status() != WL_CONNECTED && millis() - beginMillis < 30000) {
delay(250);
displayStatus(1);
Serial.print(".");
}
if (WiFi.status() != WL_CONNECTED) {
displayStatus(2);
delay(10000);
ESP.reset();
} else {
Serial.print("Connected to " + String(ssid) + "; IP address: ");
Serial.println(WiFi.localIP());
displayStatus(0);
}
}