From d1841f75b47a70092bb1dae1794ed6964edb77b1 Mon Sep 17 00:00:00 2001 From: Julien Cabillot Date: Mon, 24 Apr 2017 20:59:12 +0200 Subject: [PATCH 1/4] Ajout de remotedebug (OK) --- arduino/alarmclock/alarmclock.cpp | 72 +++++++++++++------------ arduino/alarmclock/alarmclock.exemple.h | 3 ++ 2 files changed, 42 insertions(+), 33 deletions(-) diff --git a/arduino/alarmclock/alarmclock.cpp b/arduino/alarmclock/alarmclock.cpp index e8ed841..f5e0d6c 100644 --- a/arduino/alarmclock/alarmclock.cpp +++ b/arduino/alarmclock/alarmclock.cpp @@ -15,6 +15,9 @@ #include #include +// RemoteDebug +#include + #include "alarmclock.h" void setup() @@ -28,6 +31,9 @@ void setup() // OTA setupOTA(); + // RemoteDebug + Debug.begin("alarmclock"); + // LED maxBrightness = LED_MAXBRIGHTNESS_DEFAULT; curbrightness = LED_BRIGHTNESS_DEFAULT; @@ -43,7 +49,7 @@ void setup() testConnectMQTT(); fps = 0; - Serial.println("Ready"); + Debug.println("Ready"); /* MQTT * Il est important de faire un loop avant toute chose, @@ -56,10 +62,7 @@ void setup() client.loop(); } - // OTA - - - Serial.println("End of setup"); + Debug.println("End of setup"); } // OTA @@ -96,41 +99,41 @@ void setupOTA() // WIFI void setupWifi() { - Serial.print("Connexion a "); - Serial.print(WIFI_SSID); + Debug.print("Connexion a "); + Debug.print(WIFI_SSID); WiFi.mode(WIFI_STA); WiFi.begin(WIFI_SSID, WIFI_PASSWORD); while (WiFi.status() != WL_CONNECTED) { delay(500); - Serial.print("."); + Debug.print("."); } - Serial.println(" OK"); - Serial.print("IP : "); - Serial.println(WiFi.localIP()); + Debug.println(" OK"); + Debug.print("IP : "); + Debug.println(WiFi.localIP()); } // MQTT void testConnectMQTT() { while (!client.connected()) { - Serial.print("Connexion au serveur MQTT... "); + Debug.print("Connexion au serveur MQTT... "); if (client.connect("ESP8266Client", MQTT_USER, MQTT_PASS)) { - Serial.print("OK\nSend Current State"); + Debug.print("OK\nSend Current State"); mqttSendState(); mqttSendBrightnessState(); mqttSendColorState(); - Serial.print("OK\nSubscribe"); + Debug.print("OK\nSubscribe"); client.subscribe(MQTT_LED_COMMAND); client.subscribe(MQTT_LED_BRIGHTNESS_COMMAND); client.subscribe(MQTT_LED_COLOR_COMMAND); - Serial.println(" OK"); + Debug.println(" OK"); } else { - Serial.print("KO, erreur : "); - Serial.print(client.state()); - Serial.println(", on attend 5 secondes avant de recommencer"); + Debug.print("KO, erreur : "); + Debug.print(client.state()); + Debug.println(", on attend 5 secondes avant de recommencer"); delay(5000); } } @@ -148,8 +151,8 @@ void callbackMQTT(char* topic, byte* payload, unsigned int length) message_buff[i] = '\0'; String msgString = String(message_buff); - Serial.print("Received [" + stopic + "] : "); - Serial.println(msgString); + Debug.print("Received [" + stopic + "] : "); + Debug.println(msgString); if (stopic == MQTT_LED_COMMAND) { if (msgString == "ON") { @@ -248,18 +251,18 @@ void ledDisplay() FastLED.setBrightness(breath); /* Debug EVERY_N_SECONDS(1) { - Serial.print(breath); - Serial.print(" | "); - Serial.print(curbrightness); - Serial.print("/"); - Serial.println(maxBrightness); + Debug.print(breath); + Debug.print(" | "); + Debug.print(curbrightness); + Debug.print("/"); + Debug.println(maxBrightness); } */ fps++; if (SHOW_FPS) { EVERY_N_SECONDS(1) { - Serial.print("FPS : "); - Serial.println(fps); + Debug.print("FPS : "); + Debug.println(fps); fps=0; } } @@ -267,20 +270,23 @@ void ledDisplay() } void loop() { - EVERY_N_SECONDS(10) { - if (curbrightness <= maxBrightness) { - curbrightness++; - } - } - // OTA ArduinoOTA.handle(); + // RemoteDebug + Debug.handle(); + // MQTT testConnectMQTT(); client.loop(); // LED + EVERY_N_SECONDS(10) { + if (curbrightness <= maxBrightness) { + curbrightness++; + } + } + if (!ledState) { FastLED.delay(1000); } else { diff --git a/arduino/alarmclock/alarmclock.exemple.h b/arduino/alarmclock/alarmclock.exemple.h index 48727db..6f58ad7 100644 --- a/arduino/alarmclock/alarmclock.exemple.h +++ b/arduino/alarmclock/alarmclock.exemple.h @@ -6,6 +6,9 @@ int fps; // OTA #define OTA_PASSWORD "XXX" +// DebugRemote +RemoteDebug Debug; + // LED #define LED_NUM 30 #define LED_PIN 5 // = D1 From c0f3dacdd832aecbf3d9f3b0eb30dfb8b0818631 Mon Sep 17 00:00:00 2001 From: Julien Cabillot Date: Mon, 24 Apr 2017 21:00:15 +0200 Subject: [PATCH 2/4] on ignore platformio.ini --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e9a7126..04cb948 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ lib/* .piolibdeps .clang_complete .gcc-flags.json +platformio.ini From 0911ee6d0192e4fe2be1cfd9bb16557255968e81 Mon Sep 17 00:00:00 2001 From: Julien Cabillot Date: Mon, 24 Apr 2017 21:00:36 +0200 Subject: [PATCH 3/4] exemple de conf pour platform remote --- platformio.example.ini | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 platformio.example.ini diff --git a/platformio.example.ini b/platformio.example.ini new file mode 100644 index 0000000..f95defb --- /dev/null +++ b/platformio.example.ini @@ -0,0 +1,20 @@ +; PlatformIO Project Configuration File +; +; Build options: build flags, source filter +; Upload options: custom upload port, speed and extra flags +; Library options: dependencies, extra library storages +; Advanced options: extra scripting +; +; Please visit documentation for the other options and examples +; http://docs.platformio.org/page/projectconf.html + +[env:nodemcuv2] +platform=espressif8266 +board=nodemcuv2 +framework=arduino +upload_port= +upload_flags=--auth="" + +[platformio] +src_dir=arduino/alarmclock +lib_dir=/home/jcabillot/Arduino/libraries From 2d068865738c2720a86ef86aa81da123cc5a1e34 Mon Sep 17 00:00:00 2001 From: Julien Cabillot Date: Mon, 24 Apr 2017 21:01:10 +0200 Subject: [PATCH 4/4] plus necessaire --- platformio.ini | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 platformio.ini diff --git a/platformio.ini b/platformio.ini deleted file mode 100644 index d0775cb..0000000 --- a/platformio.ini +++ /dev/null @@ -1,18 +0,0 @@ -; PlatformIO Project Configuration File -; -; Build options: build flags, source filter -; Upload options: custom upload port, speed and extra flags -; Library options: dependencies, extra library storages -; Advanced options: extra scripting -; -; Please visit documentation for the other options and examples -; http://docs.platformio.org/page/projectconf.html - -[env:nodemcuv2] -platform=espressif8266 -board=nodemcuv2 -framework=arduino - -[platformio] -src_dir=arduino/alarmclock -lib_dir=/home/jcabillot/Arduino/libraries