Skip to content

Commit

Permalink
Create separate module for webServer
Browse files Browse the repository at this point in the history
  • Loading branch information
@steff393
steff393 committed Apr 20, 2021
1 parent 756b5bb commit 584284f
Show file tree
Hide file tree
Showing 4 changed files with 239 additions and 243 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ First simple web interface:
<img src="https://i.ibb.co/kKSkL1X/wbec-Web-Interface.png">
</p>

Get current status (here for 3 connected wallboxes):
Get current status (here for 3 configured wallboxes, but only 1 connected):
```c++
http://192.168.xx.yy/json

Expand Down
252 changes: 10 additions & 242 deletions src/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,247 +2,31 @@

#include <Arduino.h>
#include <ArduinoOTA.h>
#include "AsyncJson.h"
#include "ArduinoJson.h"
#include "ESPAsyncTCP.h"
#include "ESPAsyncWebServer.h"
#include "globalConfig.h"
#include "LittleFS.h"
#include "loadManager.h"
#include "mbComm.h"
#include "SPIFFSEditor.h"
#include "wlan_key.h"
#define WIFI_MANAGER_USE_ASYNC_WEB_SERVER
#include <WiFiManager.h>
#include "webServer.h"


AsyncWebServer server(80);

void onRequest(AsyncWebServerRequest *request){
//Handle Unknown Request
request->send(404);
}

void onBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
//Handle body
}

void onUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){
//Handle upload
}




bool _handlingOTA = false;


String processor(const String& var){
String ledState;
Serial.println(var);
if(var == "STATE"){
if(modbusResultCode[0]==0x00){
ledState = "ON";
}
else{
ledState = "OFF";
}
Serial.print(ledState);
return(ledState);
}
else if (var == "TEMPERATURE"){
float tmp = content[0][5] / 10.0;
return(String(tmp));
}
else if (var == "VOLTAGE"){
float tmp = content[0][6] / 10.0;
return(String(tmp));
}
else if (var == "CURRENT"){
float tmp = content[0][53] / 10.0;
return(String(tmp));
} else return(String("notFound"));
}




String getAscii(uint8_t id, uint8_t from, uint8_t len) {
char ch;
String ret = "";
// translate the uint16 values into a String
for (int i = from; i < (from + len) ; i++) {
ch = (char) (content[id][i] & 0x00FF);
ret += ch;
ch = (char) (content[id][i] >> 8);
ret += ch;
}
return(ret);
}

bool _handlingOTA = false;


void setup() {
Serial.begin(115200);

WiFiManager wifiManager;
wifiManager.autoConnect("wbec", "cebw1234");

/*WiFi.mode(WIFI_STA);
WiFi.begin(ssid, password);
Serial.print("Connecting\n");
while (WiFi.status() != WL_CONNECTED) {
delay(500);
Serial.print(".");
if(!LittleFS.begin()){
Serial.println("An Error has occurred while mounting LittleFS");
return;
}
Serial.print("Connected to WiFi\n");
*/

// setup the Webserver and Json
// respond to GET requests on URL /heap
server.on("/heap", HTTP_GET, [](AsyncWebServerRequest *request){
request->send(200, "text/plain", String(ESP.getFreeHeap()));
});

server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
//request->send(200, "application/json", "{\"message\":\"Welcome\"}");
request->send(LittleFS, "/index.html", String(), false, processor);
});

server.on("/style.css", HTTP_GET, [](AsyncWebServerRequest *request){
request->send(LittleFS, "/style.css", "text/css");
});

server.on("/web", HTTP_GET, [](AsyncWebServerRequest *request){
uint8_t id = 0;
if (request->hasParam("currLim")) {
uint16_t val = request->getParam("currLim")->value().toInt();
if (val == 0 || (val >= CURR_ABS_MIN && val <= CURR_ABS_MAX)) {
mb_writeReg(id, REG_CURR_LIMIT, val);
}
}
request->send(LittleFS, "/index.html", String(), false, processor);
});

server.on("/state", HTTP_GET, [](AsyncWebServerRequest *request){
if(modbusResultCode[0]==0x00) {
request->send_P(200, "text/plain", String("ON").c_str());
} else {
request->send_P(200, "text/plain", String("OFF").c_str());
}
});

server.on("/temperature", HTTP_GET, [](AsyncWebServerRequest *request){
float tmp = content[0][5] / 10.0;
request->send_P(200, "text/plain", String(tmp).c_str());
});

server.on("/voltage", HTTP_GET, [](AsyncWebServerRequest *request){
request->send_P(200, "text/plain", String(content[0][6]).c_str());
});

server.on("/current", HTTP_GET, [](AsyncWebServerRequest *request){
float tmp = content[0][53] / 10.0;
request->send_P(200, "text/plain", String(tmp).c_str());
});

server.on("/resetwifi", HTTP_GET, [](AsyncWebServerRequest *request){
request->send(200, "text/plain", String("Resetting the WiFi credentials..."));
WiFiManager wm;
wm.resetSettings();
});

server.on("/json", HTTP_GET, [](AsyncWebServerRequest *request) {
DynamicJsonDocument data(2048);
uint8_t id = 0;
// modify values
if (request->hasParam("id")) {
id = request->getParam("id")->value().toInt();
}

if (request->hasParam("wdTmOut")) {
mb_writeReg(id, REG_WD_TIME_OUT, request->getParam("wdTmOut")->value().toInt());
}
if (request->hasParam("currLim")) {
uint16_t val = request->getParam("currLim")->value().toInt();
if (val == 0 || (val >= CURR_ABS_MIN && val <= CURR_ABS_MAX)) {
mb_writeReg(id, REG_CURR_LIMIT, val);
}
}
if (request->hasParam("cycleTm")) {
uint16_t val = request->getParam("cycleTm")->value().toInt();
if (val >=500) {
modbusCycleTime = val;
}
}

// provide the complete content
data["modbus"]["cfg"]["cycleTm"] = modbusCycleTime;
//data["modbus"]["state"]["resCode"] = String(modbusResultCode[0], HEX);
data["modbus"]["state"]["lastTm"] = modbusLastTime;
data["modbus"]["state"]["millis"] = millis();

for (int i = 0; i < WB_CNT; i++) {
data["boxes"][i]["busId"] = i+1;
data["boxes"][i]["version"] = String(content[i][0], HEX);
data["boxes"][i]["chgStat"] = content[i][1];
data["boxes"][i]["currL1"] = content[i][2];
data["boxes"][i]["currL2"] = content[i][3];
data["boxes"][i]["currL3"] = content[i][4];
data["boxes"][i]["pcbTemp"] = content[i][5];
data["boxes"][i]["voltL1"] = content[i][6];
data["boxes"][i]["voltL2"] = content[i][7];
data["boxes"][i]["voltL3"] = content[i][8];
data["boxes"][i]["extLock"] = content[i][9];
data["boxes"][i]["power"] = content[i][10];
data["boxes"][i]["energyP"] = (float)((uint32_t) content[i][11] << 16 | (uint32_t)content[i][12]) / 1000.0;
data["boxes"][i]["energyI"] = (float)((uint32_t) content[i][13] << 16 | (uint32_t)content[i][14]) / 1000.0;
data["boxes"][i]["currMax"] = content[i][15];
data["boxes"][i]["currMin"] = content[i][16];
data["boxes"][i]["logStr"] = getAscii(i, 17,32);
data["boxes"][i]["wdTmOut"] = content[i][49];
data["boxes"][i]["standby"] = content[i][50];
data["boxes"][i]["remLock"] = content[i][51];
data["boxes"][i]["currLim"] = content[i][53];
data["boxes"][i]["currFs"] = content[i][54];

data["load"][i] = lm_getWbLimit(i+1);
data["resCode"][i] = String(modbusResultCode[i], HEX);
}

String response;
serializeJson(data, response);
Serial.println(response);
request->send(200, "application/json", response);
});

AsyncCallbackJsonWebHandler *handler = new AsyncCallbackJsonWebHandler("/post-message", [](AsyncWebServerRequest *request, JsonVariant &json) {
StaticJsonDocument<200> data;
if (json.is<JsonArray>())
{
data = json.as<JsonArray>();
}
else if (json.is<JsonObject>())
{
data = json.as<JsonObject>();
}
String response;
serializeJson(data, response);
request->send(200, "application/json", response);
Serial.println(response);
});
server.addHandler(handler);

// add the SPIFFSEditor, which can be opened via "/edit"
server.addHandler(new SPIFFSEditor("" ,"" ,LittleFS));//http_username,http_password));

// Catch-All Handlers
// Any request that can not find a Handler that canHandle it
// ends in the callbacks below.
server.onNotFound(onRequest);
server.onFileUpload(onUpload);
server.onRequestBody(onBody);
WiFiManager wifiManager;
wifiManager.autoConnect("wbec", "cebw1234");

// setup the Webserver
initWebserver();
server.begin();

// setup the OTA server
Expand All @@ -255,23 +39,7 @@ void setup() {
});

mb_setup();

if(!LittleFS.begin()){
Serial.println("An Error has occurred while mounting LittleFS");
return;
}
File file = LittleFS.open("/test.txt", "r");
if(!file){
Serial.println("Failed to open file for reading");
return;
}
Serial.println("File Content:");
while(file.available()){
Serial.write(file.read());
}
file.close();

Serial.println(millis());
Serial.print("Boot time: ");Serial.println(millis());
}


Expand Down
Loading

0 comments on commit 584284f

Please sign in to comment.