iot/sprocket-device-illucat
1
0
Fork 0
mirror of https://gitlab.com/zwirbel/illucat.git synced 2025-12-15 17:58:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove OTA, update deps

Browse Source
This commit is contained in:
Patrick Balsiger
2019-06-30 22:02:56 +02:00
parent e620529157
commit 9a75c0d0db
13 changed files with 37 additions and 12406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -1,6 +1,4 @@
.pioenvs .pioenvs
.piolibdeps .piolibdeps
.vscode/.browse.c_cpp.db* .vscode
.vscode/c_cpp_properties.json
.vscode/launch.json
data/config.json data/config.json

2
.vscode/settings.json vendored
View File

@@ -1,6 +1,6 @@
{ {
"terminal.integrated.env.linux": { "terminal.integrated.env.linux": {
"PATH": "/home/master/.platformio/penv/bin:/home/master/.platformio/penv:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl", "PATH": "/home/master/.platformio/penv/bin:/home/master/.platformio/penv:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl",
"PLATFORMIO_CALLER": "vscode" "PLATFORMIO_CALLER": "vscode"
}, },
"files.associations": { "files.associations": {

5
README.md
View File

@@ -1,6 +1,11 @@
# Illumination-Cat # Illumination-Cat
This is the brain of the the almighty Illumination-Cat. This is the brain of the the almighty Illumination-Cat.
## OTA
pio run -e build && \
curl -v -F file=@.pioenvs/build/firmware.bin http://illucat.lan/update && \
curl -X POST http://illucat.lan/restart
## Resources & Documentation ## Resources & Documentation
[3D Model](https://www.thingiverse.com/thing:2974862) [3D Model](https://www.thingiverse.com/thing:2974862)
[Installation](https://gitlab.com/0x1d/illucat/blob/master/installation.md) [Installation](https://gitlab.com/0x1d/illucat/blob/master/installation.md)

9
data/config/wifi.json Normal file
View File

@@ -0,0 +1,9 @@
{
"stationMode": 1,
"hostname": "illucat",
"apSSID": "illucat",
"apPassword": "illumination",
"connectTimeout": 5000,
"stationSSID": "wirelos",
"stationPassword": "th3r31sn0sp00n"
}

13
data/example.config.json
View File

@@ -1,13 +0,0 @@
{
"stationMode": 0,
"hostname": "illucat",
"apSSID": "illucat",
"apPassword": "illumination",
"connectTimeout": 20000,
"stationSSID": "MyWifi",
"stationPassword": "myWifiPassword",
"meshSSID": "illucat",
"meshPassword": "illumination",
"meshPort": 5555,
"channel": 5
}

4
data/ircConfig.json
View File

@@ -1,6 +1,6 @@
{ {
"ircServer": "chat.freenode.net", "ircServer": "chat.freenode.net",
"ircPort": 6665, "ircPort": 6665,
"ircNickname": "biermeter", "ircNickname": "illucat",
"ircUser": "biermeter" "ircUser": "illucat"
} }

4
data/mqttConfig.json
View File

@@ -1,6 +1,6 @@
{ {
"mqttClientName" : "biermeter", "mqttClientName" : "illucat1",
"mqttBrokerHost" : "192.168.1.2", "mqttBrokerHost" : "192.168.1.2",
"mqttBrokerPort" : 1883, "mqttBrokerPort" : 1883,
"mqttRootTopic" : "wirelos/led/biermeter" "mqttRootTopic" : "wirelos/illucat"
} }

6
data/www/index.html
View File

@@ -21,8 +21,8 @@
data-name="hue" data-name="hue"
data-topic="pixels/hue" data-topic="pixels/hue"
data-default="0" data-default="0"
data-external="/gradients.json" data-external="/gradients.json">
></li> </li>
<li class="form-row ParamColor" <li class="form-row ParamColor"
data-name="color" data-name="color"
data-topic="pixels/color" data-topic="pixels/color"
@@ -70,7 +70,7 @@
<span class="heading">Settings</span> <span class="heading">Settings</span>
<div class="content"> <div class="content">
<h2>Network</h2> <h2>Network</h2>
<div class="Form" data-fileName="/config.json" data-name="configForm" data-from="/config.json" data-endpoint="/config"></div> <div class="Form" data-fileName="/config/wifi.json" data-name="configForm" data-from="/config/wifi.json" data-endpoint="/config"></div>
<h2>NeoPixel</h2> <h2>NeoPixel</h2>
<div class="Form" data-fileName="/pixelConfig.json" data-name="configForm" data-from="/pixelConfig.json" data-endpoint="/config"></div> <div class="Form" data-fileName="/pixelConfig.json" data-name="configForm" data-from="/pixelConfig.json" data-endpoint="/config"></div>
<!-- <h2>MQTT</h2> <!-- <h2>MQTT</h2>

12359
data/www/script.js
View File

File diff suppressed because it is too large Load Diff

BIN
data/www/script.js.gz Normal file
View File

Binary file not shown.

29
platformio.ini
View File

@@ -13,7 +13,7 @@
[common] [common]
framework = arduino framework = arduino
platform = espressif8266 platform = espressif8266@2.0.4
board = esp12e board = esp12e
upload_speed = 921600 upload_speed = 921600
monitor_baud = 115200 monitor_baud = 115200
@@ -21,10 +21,9 @@ lib_deps =
Hash Hash
TaskScheduler TaskScheduler
SPIFFS SPIFFS
ArduinoJson ArduinoJson@5.13.4
Adafruit NeoPixel Adafruit NeoPixel
ESPAsyncTCP ESPAsyncTCP
ArduinoOTA
ESP8266mDNS ESP8266mDNS
ESP Async WebServer ESP Async WebServer
https://gitlab.com/wirelos/sprocket-lib.git#develop https://gitlab.com/wirelos/sprocket-lib.git#develop
@@ -41,8 +40,8 @@ framework = ${common.framework}
build_flags = -Wl,-Teagle.flash.4m1m.ld build_flags = -Wl,-Teagle.flash.4m1m.ld
-DSPROCKET_PRINT=1 -DSPROCKET_PRINT=1
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
https://gitlab.com/wirelos/sprocket-network-wifi.git https://gitlab.com/wirelos/sprocket-network-wifi.git#next
https://gitlab.com/wirelos/sprocket-plugin-web.git https://gitlab.com/wirelos/sprocket-plugin-web.git#next
[env:build-mesh] [env:build-mesh]
@@ -55,8 +54,8 @@ framework = ${common.framework}
build_flags = -Wl,-Teagle.flash.4m1m.ld build_flags = -Wl,-Teagle.flash.4m1m.ld
-DSPROCKET_PRINT=1 -DSPROCKET_PRINT=1
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
painlessMesh https://gitlab.com/wirelos/painlessMesh.git
https://gitlab.com/wirelos/sprocket-network-mesh.git https://gitlab.com/wirelos/sprocket-network-mesh.git#forked-mesh
[env:release] [env:release]
src_filter = +<*> -<var/> +<var/wifi/> src_filter = +<*> -<var/> +<var/wifi/>
@@ -68,8 +67,8 @@ framework = ${common.framework}
build_flags = -Wl,-Teagle.flash.4m1m.ld build_flags = -Wl,-Teagle.flash.4m1m.ld
-DSPROCKET_PRINT=0 -DSPROCKET_PRINT=0
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
https://gitlab.com/wirelos/sprocket-network-wifi.git https://gitlab.com/wirelos/sprocket-network-wifi.git#next
https://gitlab.com/wirelos/sprocket-plugin-web.git https://gitlab.com/wirelos/sprocket-plugin-web.git#next
[env:mqcatt] [env:mqcatt]
@@ -82,9 +81,9 @@ framework = ${common.framework}
build_flags = -Wl,-Teagle.flash.4m1m.ld build_flags = -Wl,-Teagle.flash.4m1m.ld
-DSPROCKET_PRINT=1 -DSPROCKET_PRINT=1
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
https://gitlab.com/wirelos/sprocket-network-wifi.git https://gitlab.com/wirelos/sprocket-network-wifi.git#next
https://gitlab.com/wirelos/sprocket-plugin-web.git https://gitlab.com/wirelos/sprocket-plugin-web.git#next
https://gitlab.com/wirelos/sprocket-plugin-mqtt.git https://gitlab.com/wirelos/sprocket-plugin-mqtt.git#next
PubSubClient PubSubClient
[env:illuchat] [env:illuchat]
@@ -97,9 +96,9 @@ framework = ${common.framework}
build_flags = -Wl,-Teagle.flash.4m1m.ld build_flags = -Wl,-Teagle.flash.4m1m.ld
-DSPROCKET_PRINT=1 -DSPROCKET_PRINT=1
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
https://gitlab.com/wirelos/sprocket-network-wifi.git https://gitlab.com/wirelos/sprocket-network-wifi.git#next
https://gitlab.com/wirelos/sprocket-plugin-web.git https://gitlab.com/wirelos/sprocket-plugin-web.git#next
https://gitlab.com/wirelos/sprocket-plugin-irc.git https://gitlab.com/wirelos/sprocket-plugin-irc.git
https://gitlab.com/wirelos/sprocket-plugin-mqtt.git https://gitlab.com/wirelos/sprocket-plugin-mqtt.git#next
PubSubClient PubSubClient
ArduinoIRC ArduinoIRC

4
src/var/illuchat/main.cpp
View File

@@ -8,7 +8,6 @@
#include <WebApiPlugin.h> #include <WebApiPlugin.h>
#include <PixelPlugin.h> #include <PixelPlugin.h>
#include <IrcPlugin.h> #include <IrcPlugin.h>
#include <OtaTcpPlugin.cpp>
#include <MqttPlugin.h> #include <MqttPlugin.h>
WiFiNet *network; WiFiNet *network;
@@ -18,7 +17,6 @@ WebConfigPlugin *webConfigPlugin;
WebApiPlugin *webApiPlugin; WebApiPlugin *webApiPlugin;
PixelPlugin *pixelPlugin; PixelPlugin *pixelPlugin;
IrcPlugin *ircPlugin; IrcPlugin *ircPlugin;
OtaTcpPlugin *otaTcp;
MqttPlugin *mqttPlugin; MqttPlugin *mqttPlugin;
void setup() void setup()
@@ -31,13 +29,11 @@ void setup()
webServerPlugin = new WebServerPlugin({WEB_CONTEXT_PATH, WEB_DOC_ROOT, WEB_DEFAULT_FILE, WEB_PORT}); webServerPlugin = new WebServerPlugin({WEB_CONTEXT_PATH, WEB_DOC_ROOT, WEB_DEFAULT_FILE, WEB_PORT});
webConfigPlugin = new WebConfigPlugin(webServerPlugin->server); webConfigPlugin = new WebConfigPlugin(webServerPlugin->server);
webApiPlugin = new WebApiPlugin(webServerPlugin->server); webApiPlugin = new WebApiPlugin(webServerPlugin->server);
otaTcp = new OtaTcpPlugin({OTA_PORT, OTA_PASSWORD});
sprocket->addPlugin(pixelPlugin); sprocket->addPlugin(pixelPlugin);
sprocket->addPlugin(webServerPlugin); sprocket->addPlugin(webServerPlugin);
sprocket->addPlugin(webConfigPlugin); sprocket->addPlugin(webConfigPlugin);
sprocket->addPlugin(webApiPlugin); sprocket->addPlugin(webApiPlugin);
sprocket->addPlugin(otaTcp);
sprocket->addPlugin(ircPlugin); sprocket->addPlugin(ircPlugin);
sprocket->addPlugin(mqttPlugin); sprocket->addPlugin(mqttPlugin);

4
src/var/mqcatt/main.cpp
View File

@@ -8,7 +8,6 @@
#include <WebApiPlugin.h> #include <WebApiPlugin.h>
#include <PixelPlugin.h> #include <PixelPlugin.h>
#include <MqttPlugin.h> #include <MqttPlugin.h>
#include <OtaTcpPlugin.cpp>
WiFiNet *network; WiFiNet *network;
Sprocket *sprocket; Sprocket *sprocket;
@@ -17,7 +16,6 @@ WebConfigPlugin *webConfigPlugin;
WebApiPlugin *webApiPlugin; WebApiPlugin *webApiPlugin;
PixelPlugin *pixelPlugin; PixelPlugin *pixelPlugin;
MqttPlugin *mqttPlugin; MqttPlugin *mqttPlugin;
OtaTcpPlugin *otaTcp;
void setup() void setup()
{ {
@@ -27,12 +25,10 @@ void setup()
webServerPlugin = new WebServerPlugin({WEB_CONTEXT_PATH, WEB_DOC_ROOT, WEB_DEFAULT_FILE, WEB_PORT}); webServerPlugin = new WebServerPlugin({WEB_CONTEXT_PATH, WEB_DOC_ROOT, WEB_DEFAULT_FILE, WEB_PORT});
webConfigPlugin = new WebConfigPlugin(webServerPlugin->server); webConfigPlugin = new WebConfigPlugin(webServerPlugin->server);
webApiPlugin = new WebApiPlugin(webServerPlugin->server); webApiPlugin = new WebApiPlugin(webServerPlugin->server);
otaTcp = new OtaTcpPlugin({OTA_PORT, OTA_PASSWORD});
sprocket->addPlugin(pixelPlugin); sprocket->addPlugin(pixelPlugin);
sprocket->addPlugin(webServerPlugin); sprocket->addPlugin(webServerPlugin);
sprocket->addPlugin(webConfigPlugin); sprocket->addPlugin(webConfigPlugin);
sprocket->addPlugin(webApiPlugin); sprocket->addPlugin(webApiPlugin);
sprocket->addPlugin(otaTcp);
sprocket->addPlugin(mqttPlugin); sprocket->addPlugin(mqttPlugin);
network = new WiFiNet( network = new WiFiNet(