Skip to content

Commit 736a493

Browse files
authored
Merge pull request #54 from WLANThermo-nano/develop
Develop
2 parents 8508f87 + a4783bf commit 736a493

20 files changed

Lines changed: 4181 additions & 5406 deletions

Nemesis.ino

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@
2020

2121
// EXECPTION LIST
2222
// https://links2004.github.io/Arduino/dc/deb/md_esp8266_doc_exception_causes.html
23+
// WATCHDOG
24+
// https://techtutorialsx.com/2017/01/21/esp8266-watchdog-functions/
2325

2426
// Entwicklereinstellungen
27+
//#define ASYNC_TCP_SSL_ENABLED 1
2528
#define OTA // ENABLE OTA UPDATE
2629
#define DEBUG // ENABLE SERIAL DEBUG MESSAGES
2730

@@ -44,6 +47,7 @@
4447
// INCLUDE SUBROUTINES
4548

4649
#include "c_init.h"
50+
#include "c_webhandler.h"
4751
#include "c_button.h"
4852
#include "c_median.h"
4953
#include "c_sensor.h"
@@ -56,6 +60,7 @@
5660
#include "c_wifi.h"
5761
#include "c_frames.h"
5862
#include "c_bot.h"
63+
#include "c_pmqtt.h"
5964
#include "c_ota.h"
6065
#include "c_server.h"
6166

@@ -79,14 +84,22 @@ void setup() {
7984
check_sector();
8085
setEE(); start_fs();
8186

82-
// Initalize MQTT
83-
set_mqtt();
87+
// Initalize Aktor
88+
set_piepser();
89+
90+
// GodMode aktiv
91+
if (sys.god) {
92+
piepserON(); delay(500); piepserOFF();
93+
}
94+
95+
// Initalize P_MQTT
96+
set_pmqtt();
8497

8598
// Initialize Wifi
8699
set_wifi();
87100

88101
// Update Time
89-
set_time();
102+
//set_time();
90103

91104
// Scan Network
92105
WiFi.scanNetworks(true);
@@ -105,7 +118,6 @@ void setup() {
105118
// Initialize Sensors
106119
set_sensor();
107120
set_channels(0);
108-
set_piepser();
109121

110122
// Initialize Buttons
111123
set_button();
@@ -163,7 +175,7 @@ void loop() {
163175
timer_sensor(); // Temperture
164176
timer_alarm(); // Alarm
165177
pitmaster_control(); // Pitmaster
166-
timer_charts(); // Charts
178+
timer_iot(); // Charts
167179
timer_datalog(); // Datalog
168180
flash_control(); // Flash
169181

0 commit comments

Comments
 (0)