diff --git a/data/mqttConfig.json b/data/mqttConfig.json new file mode 100644 index 0000000..7b1b6e6 --- /dev/null +++ b/data/mqttConfig.json @@ -0,0 +1,7 @@ +{ + "mqttClientName" : "illucat00", + "mqttBrokerHost" : "192.168.1.2", + "mqttBrokerPort" : 1883, + "mqttInTopicRoot" : "wirelos/led-in/", + "mqttOutTopicRoot" : "wirelos/led-out/" +} \ No newline at end of file diff --git a/data/www/index.html b/data/www/index.html index 5a1f830..487180f 100644 --- a/data/www/index.html +++ b/data/www/index.html @@ -66,7 +66,9 @@

Network

NeoPixel

-
+
+

MQTT

+
diff --git a/src/var/mqcatt/main.cpp b/src/var/mqcatt/main.cpp index 55ca206..ec7d85d 100644 --- a/src/var/mqcatt/main.cpp +++ b/src/var/mqcatt/main.cpp @@ -11,7 +11,6 @@ WiFiNet *network; Sprocket *sprocket; -AsyncWebServer *server; WebServerPlugin *webServerPlugin; WebConfigPlugin *webConfigPlugin; WebApiPlugin *webApiPlugin; @@ -42,6 +41,9 @@ void setup() CONNECT_TIMEOUT); network->connect(); + webServerPlugin->server->serveStatic(PIXEL_CONFIG_FILE, SPIFFS, "pixelConfig.json"); + webServerPlugin->server->serveStatic(MQTT_CONFIG_FILE, SPIFFS, "mqttConfig.json"); + sprocket->activate(); } diff --git a/src/var/mqcatt/mqcatt_config.h b/src/var/mqcatt/mqcatt_config.h index f6e26c5..9d5b9fa 100644 --- a/src/var/mqcatt/mqcatt_config.h +++ b/src/var/mqcatt/mqcatt_config.h @@ -23,15 +23,25 @@ #define HOSTNAME "illucat" #define CONNECT_TIMEOUT 10000 -// pixel config +// config files #define PIXEL_CONFIG_FILE "/pixelConfig.json" +#define MQTT_CONFIG_FILE "/mqttConfig.json" + +// NeoPixel +#define LED_STRIP_PIN D2 +#define LED_STRIP_LENGTH 8 +#define LED_STRIP_BRIGHTNESS 48 +#define LED_STRIP_UPDATE_INTERVAL 200 +#define LED_STRIP_DEFAULT_COLOR 100 +#define COLOR_CONNECTED LED_STRIP_DEFAULT_COLOR +#define COLOR_NOT_CONNECTED 255 // mqtt config -#define MQTT_CLIENT_NAME "mqcatt" +#define MQTT_CLIENT_NAME "illucat" #define MQTT_HOST "192.168.1.2" #define MQTT_PORT 1883 -#define MQTT_TOPIC_IN "wirelos/illucat-in/" -#define MQTT_TOPIC_OUT "wirelos/illucat-out/" +#define MQTT_TOPIC_IN "wirelos/led-in/" +#define MQTT_TOPIC_OUT "wirelos/led-out/" // OTA config #define OTA_PORT 8266 @@ -43,13 +53,5 @@ #define WEB_DEFAULT_FILE "index.html" #define WEB_PORT 80 -// NeoPixel -#define LED_STRIP_PIN D2 -#define LED_STRIP_LENGTH 8 -#define LED_STRIP_BRIGHTNESS 48 -#define LED_STRIP_UPDATE_INTERVAL 200 -#define LED_STRIP_DEFAULT_COLOR 100 -#define COLOR_CONNECTED LED_STRIP_DEFAULT_COLOR -#define COLOR_NOT_CONNECTED 255 #endif \ No newline at end of file