From ea04117562b028100fc493b77565551d58dae1bc Mon Sep 17 00:00:00 2001 From: Patrick Balsiger Date: Mon, 20 May 2019 19:15:37 +0200 Subject: [PATCH] Use new config folder --- .gitlab-ci.yml | 2 +- platformio.ini | 4 ++-- src/MqttPlugin.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00f20b5..4f36709 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,4 +11,4 @@ examples: image: python:2.7-stretch script: - pio run -t clean - - pio run -e basic \ No newline at end of file + - pio run \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index 023ef2b..d24884b 100755 --- a/platformio.ini +++ b/platformio.ini @@ -1,5 +1,5 @@ [platformio] -env_default = basic, chat +env_default = basic, chat, chat-esp01 [common] framework = arduino @@ -13,7 +13,7 @@ lib_deps = SPIFFS ArduinoJson@5.13.4 https://gitlab.com/wirelos/sprocket-lib.git#develop - https://gitlab.com/wirelos/sprocket-network-wifi.git + https://gitlab.com/wirelos/sprocket-network-wifi.git#next [env:basic] src_filter = +<*> - + diff --git a/src/MqttPlugin.cpp b/src/MqttPlugin.cpp index 7753773..c9c3076 100755 --- a/src/MqttPlugin.cpp +++ b/src/MqttPlugin.cpp @@ -27,7 +27,7 @@ void MqttPlugin::applyConfigFromFile(const char* fileName) { void MqttPlugin::activate(Scheduler *scheduler) { - applyConfigFromFile("/mqttConfig.json"); + applyConfigFromFile("/config/mqtt.json"); client = new PubSubClient(brokerHost.c_str(), brokerPort, bind(&MqttPlugin::downstreamHandler, this, _1, _2, _3), wifiClient); enableConnectTask(scheduler); enableProcessTask(scheduler);