fabian/pitrix
1
0
Fork 0
Code Issues 8 Releases Activity

Small fixes.

Browse Source
This commit is contained in:
Fabian Schlenz 2019-10-23 05:41:39 +02:00
parent 3c0e4af325
commit dfe99408c9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pitrix.cpp
View File

@ -1,4 +1,5 @@
#include <Arduino.h> #include <Arduino.h>
#include <FS.h>
#include "ntp.h" #include "ntp.h"
#include "config.h" #include "config.h"
@ -9,8 +10,8 @@
#include "functions.h" #include "functions.h"
#include "effects.h" #include "effects.h"
#include "http_server.h" #include "http_server.h"
#include "recorder.h"
#include "settings.h" #include "settings.h"
#include "websockets.h"
uint8_t starting_up = OTA_STARTUP_DELAY; uint8_t starting_up = OTA_STARTUP_DELAY;
int loop_timeouts = 0; int loop_timeouts = 0;
@ -43,6 +44,7 @@ void setup() {
ntp_setup(); ntp_setup();
ota_setup(); ota_setup();
fastled_setup(); fastled_setup();
websocket_setup();
ntpClient.begin(); ntpClient.begin();
#ifdef HTTP_SERVER_ENABLE #ifdef HTTP_SERVER_ENABLE
http_server_setup(); http_server_setup();
@ -50,9 +52,6 @@ void setup() {
#ifdef MQTT_ENABLE #ifdef MQTT_ENABLE
mqtt_setup(); mqtt_setup();
#endif #endif
#ifdef RECORDER_ENABLE
recorder = new Recorder();
#endif
SPIFFS.begin(); SPIFFS.begin();
load_settings(); load_settings();
LOGln("Core * Setup complete"); LOGln("Core * Setup complete");
@ -84,6 +83,7 @@ void loop() {
#ifdef HTTP_SERVER_ENABLE #ifdef HTTP_SERVER_ENABLE
http_server_loop(); http_server_loop();
#endif #endif
websocket_loop();
EVERY_N_MILLISECONDS(100) { EVERY_N_MILLISECONDS(100) {
baseHue++; baseHue++;