iot/sprocket-device-illucat
1
0
Fork 0
mirror of https://gitlab.com/zwirbel/illucat.git synced 2025-12-16 10:04:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'standalone' into release/1.0.0

Browse Source
This commit is contained in:
0x1d
2018-10-03 21:59:54 +02:00
parent 9c6ec9b231 77d92155df
commit ffd76acb69
4 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/example.config.json
View File

@@ -1,6 +1,8 @@
{ {
"stationMode": 0, "stationMode": 0,
"hostname": "illucat", "hostname": "illucat",
"apSSID": "illucat",
"apPassword": "illucat",
"stationSSID": "MyWifi", "stationSSID": "MyWifi",
"stationPassword": "myWifiPassword", "stationPassword": "myWifiPassword",
"meshSSID": "illucat", "meshSSID": "illucat",

35
src/IlluCat.h
View File

@@ -1,9 +1,12 @@
#ifndef __MESH_APP__ #ifndef __MESH_APP__
#define __MESH_APP__ #define __MESH_APP__
#include <painlessMesh.h> #include <TaskScheduler.h>
#include <base/MeshSprocket.h> //#include <painlessMesh.h>
#include <MeshNet.h> //#include <MeshNet.h>
#include <Sprocket.h>
//#include <DNSServer.h>
#include "config.h" #include "config.h"
#include "NeoPattern.cpp" #include "NeoPattern.cpp"
@@ -21,8 +24,11 @@
using namespace std; using namespace std;
using namespace std::placeholders; using namespace std::placeholders;
class IlluCat : public MeshSprocket { //const byte DNS_PORT = 53;
class IlluCat : public Sprocket {
public: public:
Scheduler* ts;
NeoPattern* pixels; NeoPattern* pixels;
NeoPatternDto defaultState; NeoPatternDto defaultState;
NeoPatternDto state; NeoPatternDto state;
@@ -37,7 +43,7 @@ class IlluCat : public MeshSprocket {
SprocketMessage currentMessage; SprocketMessage currentMessage;
IlluCat(SprocketConfig cfg, OtaConfig otaCfg, WebServerConfig webCfg/* , NeoPixelConfig pixelCfg */) : MeshSprocket(cfg) { IlluCat(SprocketConfig cfg, OtaConfig otaCfg, WebServerConfig webCfg/* , NeoPixelConfig pixelCfg */) : Sprocket(cfg) {
//pixelConfig = pixelCfg; //pixelConfig = pixelCfg;
sprocketConfig = cfg; sprocketConfig = cfg;
@@ -50,6 +56,8 @@ class IlluCat : public MeshSprocket {
pixelConfig.updateInterval = 100; pixelConfig.updateInterval = 100;
pixelConfig.defaultColor = 100; pixelConfig.defaultColor = 100;
ts = new Scheduler();
} }
virtual void scanningAnimation() { virtual void scanningAnimation() {
pixels->Scanner(pixels->Wheel(COLOR_NOT_CONNECTED), pixelConfig.updateInterval); pixels->Scanner(pixels->Wheel(COLOR_NOT_CONNECTED), pixelConfig.updateInterval);
@@ -60,7 +68,7 @@ class IlluCat : public MeshSprocket {
} }
Sprocket* activate(Scheduler* scheduler, Network* network) { Sprocket* activate(Scheduler* scheduler, Network* network) {
net = static_cast<MeshNet*>(network); //net = static_cast<MeshNet*>(network);
// load config files from SPIFFS // load config files from SPIFFS
if(SPIFFS.begin()){ if(SPIFFS.begin()){
@@ -76,12 +84,16 @@ class IlluCat : public MeshSprocket {
wsStream = new AsyncWebSocket("/stream"); wsStream = new AsyncWebSocket("/stream");
// add plugins // add plugins
addPlugin(new OtaTcpPlugin(otaConfig)); //addPlugin(new OtaTcpPlugin(otaConfig));
addPlugin(new WebServerPlugin(webConfig, server)); addPlugin(new WebServerPlugin(webConfig, server));
addPlugin(new WebConfigPlugin(server)); addPlugin(new WebConfigPlugin(server));
addPlugin(new PixelPlugin(pixelConfig, pixels)); addPlugin(new PixelPlugin(pixelConfig, pixels));
defaultAnimation(); defaultAnimation();
// configure DNS
// plugin?
//dnsServer->setErrorReplyCode(DNSReplyCode::NoError);
//dnsServer->start(DNS_PORT, "*", WiFi.softAPIP());
String softApPrt = "SoftAP IP: " + WiFi.softAPIP().toString(); String softApPrt = "SoftAP IP: " + WiFi.softAPIP().toString();
PRINT_MSG(Serial, SPROCKET_TYPE, softApPrt.c_str()); PRINT_MSG(Serial, SPROCKET_TYPE, softApPrt.c_str());
@@ -94,8 +106,8 @@ class IlluCat : public MeshSprocket {
wsStream->onEvent(bind(&IlluCat::onStream, this, _1, _2, _3, _4, _5, _6)); wsStream->onEvent(bind(&IlluCat::onStream, this, _1, _2, _3, _4, _5, _6));
server->addHandler(wsStream); server->addHandler(wsStream);
return MeshSprocket::activate(scheduler, network); return Sprocket::activate(scheduler, network);
} using MeshSprocket::activate; } using Sprocket::activate;
// TODO move to utils // TODO move to utils
String getRequestParameterOrDefault(AsyncWebServerRequest *request, String param, String defaultValue, bool isPost = true){ String getRequestParameterOrDefault(AsyncWebServerRequest *request, String param, String defaultValue, bool isPost = true){
@@ -122,7 +134,7 @@ class IlluCat : public MeshSprocket {
String msg = currentMessage.toJsonString(); String msg = currentMessage.toJsonString();
publish(currentMessage.topic, currentMessage.payload); publish(currentMessage.topic, currentMessage.payload);
if(currentMessage.broadcast){ if(currentMessage.broadcast){
net->mesh.sendBroadcast(msg); network.broadcast(msg);
} }
request->send(200, "text/plain", msg); request->send(200, "text/plain", msg);
} }
@@ -144,7 +156,8 @@ class IlluCat : public MeshSprocket {
} }
void loop(){ void loop(){
MeshSprocket::loop(); Sprocket::loop();
yield();
} }
}; };

3
src/config.h
View File

@@ -14,11 +14,14 @@
#define SPROCKET_MODE 0 #define SPROCKET_MODE 0
#define WIFI_CHANNEL 11 #define WIFI_CHANNEL 11
#define MESH_PORT 5555 #define MESH_PORT 5555
#define AP_SSID "illucat"
#define AP_PASSWORD "illumination"
#define MESH_PREFIX "illucat-mesh" #define MESH_PREFIX "illucat-mesh"
#define MESH_PASSWORD "th3r31sn0sp00n" #define MESH_PASSWORD "th3r31sn0sp00n"
#define STATION_SSID "MyAP" #define STATION_SSID "MyAP"
#define STATION_PASSWORD "th3r31sn0sp00n" #define STATION_PASSWORD "th3r31sn0sp00n"
#define HOSTNAME "illucat" #define HOSTNAME "illucat"
#define CONNECT_TIMEOUT 10000
#define MESH_DEBUG_TYPES ERROR | STARTUP | CONNECTION #define MESH_DEBUG_TYPES ERROR | STARTUP | CONNECTION
//ERROR | MESH_STATUS | CONNECTION | SYNC | COMMUNICATION | GENERAL | MSG_TYPES | REMOTE //ERROR | MESH_STATUS | CONNECTION | SYNC | COMMUNICATION | GENERAL | MSG_TYPES | REMOTE

8
src/main.cpp
View File

@@ -1,13 +1,15 @@
#include "config.h" #include "config.h"
#include "MeshNet.h" //#include "MeshNet.h"
#include "WiFiNet.h"
#include "IlluCat.h" #include "IlluCat.h"
MeshNet net({ /* MeshNet net({
SPROCKET_MODE, WIFI_CHANNEL, SPROCKET_MODE, WIFI_CHANNEL,
MESH_PORT, MESH_PREFIX, MESH_PASSWORD, MESH_PORT, MESH_PREFIX, MESH_PASSWORD,
STATION_SSID, STATION_PASSWORD, HOSTNAME, STATION_SSID, STATION_PASSWORD, HOSTNAME,
MESH_DEBUG_TYPES MESH_DEBUG_TYPES
}); }); */
WiFiNet net(SPROCKET_MODE,STATION_SSID, STATION_PASSWORD,AP_SSID, AP_PASSWORD,HOSTNAME,CONNECT_TIMEOUT);
IlluCat sprocket( IlluCat sprocket(
{ STARTUP_DELAY, SERIAL_BAUD_RATE }, { STARTUP_DELAY, SERIAL_BAUD_RATE },
{ OTA_PORT, OTA_PASSWORD }, { OTA_PORT, OTA_PASSWORD },