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

2
include/effect_snake.h
View File

@ -32,7 +32,7 @@ private:
const uint32_t _weights[36] = {0xbd25943f, 0xbf279d81, 0x3e25d128, 0x3ec62438, 0x3f0e719c, 0x3eefbea9, 0x3e947ed4, 0xbe5323c1, 0xbf2d4796, 0xbf3f0a75, 0x3f0e45d9, 0xbf0253ca, 0xbedca2f2, 0xbd79073c, 0x3ede80ec, 0xbd4b97b6, 0x3f69a6be, 0xbe4b8bf2, 0x3eccf87d, 0xbf301113, 0xbf62b6e8, 0xbf71daf6, 0xbf204130, 0xbf222609, 0x3e26c03c, 0xbf497837, 0xbee4d175, 0x3ec601de, 0x3e4954eb, 0x3eef2619, 0xbe849370, 0xbf18fb2b, 0x3f25bbd1, 0xbf3b4e44, 0x3f484d59, 0x3edd6a8a}; const uint32_t _weights[36] = {0xbd25943f, 0xbf279d81, 0x3e25d128, 0x3ec62438, 0x3f0e719c, 0x3eefbea9, 0x3e947ed4, 0xbe5323c1, 0xbf2d4796, 0xbf3f0a75, 0x3f0e45d9, 0xbf0253ca, 0xbedca2f2, 0xbd79073c, 0x3ede80ec, 0xbd4b97b6, 0x3f69a6be, 0xbe4b8bf2, 0x3eccf87d, 0xbf301113, 0xbf62b6e8, 0xbf71daf6, 0xbf204130, 0xbf222609, 0x3e26c03c, 0xbf497837, 0xbee4d175, 0x3ec601de, 0x3e4954eb, 0x3eef2619, 0xbe849370, 0xbf18fb2b, 0x3f25bbd1, 0xbf3b4e44, 0x3f484d59, 0x3edd6a8a};
// Round 193, 164.8 points, length 36, 6% stopped, 94% died // Round 193, 164.8 points, length 36, 6% stopped, 94% died
//const uint32_t _weights[36] = {0x3e872ffb, 0xbea57262, 0xbee269bf, 0x3ed790a3, 0xbf54014f, 0x3ecde0a6, 0xbf240a93, 0xbe9e4782, 0x3f205106, 0xbf4465c2, 0xbf79579a, 0xbf07f122, 0x3ed0e1bc, 0xbf7a5a09, 0xbf0fc70b, 0xbf6d1971, 0xbe0f5585, 0xbec94b12, 0x3f51f7a9, 0x3eaac42b, 0xbe6aafa6, 0x3d3e3ce3, 0xbf7c4232, 0xbe634103, 0x3f800000, 0x3eff886c, 0x3deae1e8, 0x3eea6988, 0xbf800000, 0xbf426a20, 0x3e3a0a45, 0xbe848803, 0x3e84e8c9, 0x3ef9fabc, 0xbe7733e6, 0xbecda633}; //const uint32_t _weights[36] = {0x3e872ffb, 0xbea57262, 0xbee269bf, 0x3ed790a3, 0xbf54014f, 0x3ecde0a6, 0xbf240a93, 0xbe9e4782, 0x3f205106, 0xbf4465c2, 0xbf79579a, 0xbf07f122, 0x3ed0e1bc, 0xbf7a5a09, 0xbf0fc70b, 0xbf6d1971, 0xbe0f5585, 0xbec94b12, 0x3f51f7a9, 0x3eaac42b, 0xbe6aafa6, 0x3d3e3ce3, 0xbf7c4232, 0xbe634103, 0x3f800000, 0x3eff886c, 0x3deae1e8, 0x3eea6988, 0xbf800000, 0xbf426a20, 0x3e3a0a45, 0xbe848803, 0x3e84e8c9, 0x3ef9fabc, 0xbe7733e6, 0xbecda633};
const uint8_t _net_layout[3] = {6, 4, 3}; const uint8_t _net_layout[3] = {6, 4, 3};
const uint8_t _net_layers = 3; const uint8_t _net_layers = 3;
const uint8_t _net_total_size = 36; const uint8_t _net_total_size = 36;

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++;