asaril/McLighting
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

versioning + update '/esp_status'

Browse source 
* Start of versioning v2.1, added version support
* '/esp_status' returns lot more info
This commit is contained in:
debsahu 2018-05-07 12:58:08 -04:00
parent de5f11bab8
commit d842c6293f
3 changed files with 46 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
Arduino/McLighting/McLighting.ino
View file

@ -1,5 +1,5 @@
#include "definitions.h" #include "definitions.h"
#include "version.h"
// *************************************************************************** // ***************************************************************************
// Load libraries for: WebServer / WiFiManager / WebSockets // Load libraries for: WebServer / WiFiManager / WebSockets
// *************************************************************************** // ***************************************************************************
@ -488,14 +488,46 @@ void setup() {
}, handleFileUpload); }, handleFileUpload);
//get heap status, analog input value and all GPIO statuses in one json call //get heap status, analog input value and all GPIO statuses in one json call
server.on("/esp_status", HTTP_GET, []() { server.on("/esp_status", HTTP_GET, []() {
String json = "{"; //String json = "{";
json += "\"heap\":" + String(ESP.getFreeHeap()); //json += "\"heap\":" + String(ESP.getFreeHeap());
// json += ", \"analog\":" + String(analogRead(A0)); //// json += ", \"analog\":" + String(analogRead(A0));
// json += ", \"gpio\":" + String((uint32_t)(((GPI | GPO) & 0xFFFF) | ((GP16I & 0x01) << 16))); //// json += ", \"gpio\":" + String((uint32_t)(((GPI | GPO) & 0xFFFF) | ((GP16I & 0x01) << 16)));
json += "}"; //json += "}";
DynamicJsonBuffer jsonBuffer(JSON_OBJECT_SIZE(9));
JsonObject& json = jsonBuffer.createObject();
json["HOSTNAME"] = HOSTNAME;
json["version"] = SKETCH_VERSION;
json["heap"] = ESP.getFreeHeap();
#ifndef USE_NEOANIMATIONFX
json["animation_lib"] = "WS2812FX";
json["pin"] = PIN;
#else
json["animation_lib"] = "NeoAnimationFX";
json["pin"] = "Ignored, check NEOMETHOD";
#endif
json["number_leds"] = NUMLEDS;
#ifdef ENABLE_BUTTON
json["button_mode"] = "ON";
#else
json["button_mode"] = "OFF";
#endif
#ifdef ENABLE_AMQTT
json["mqtt"] = "ON";
#else
json["mqtt"] = "OFF";
#endif
#ifdef ENABLE_HOMEASSISTANT
json["home_assistant"] = "ON";
#else
json["home_assistant"] = "OFF";
#endif
char buffer[json.measureLength() + 1];
json.printTo(buffer, sizeof(buffer));
server.sendHeader("Access-Control-Allow-Origin", "*"); server.sendHeader("Access-Control-Allow-Origin", "*");
server.send(200, "text/json", json); server.send(200, "application/json", String(buffer));
json = String(); //json = String();
}); });

1
Arduino/McLighting/version.h Normal file
View file

@ -0,0 +1 @@
#define SKETCH_VERSION "2.1.0"

5
Arduino/McLighting/version_info.ino Normal file
View file

@ -0,0 +1,5 @@
/*
* 07 May 2018
* - Start of versioning v2.1, added version support
* - '/esp_status' returns lot more info
*/