3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-06-01 18:21:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix sync time from browser issue

Browse source
This commit is contained in:
lumapu 2022-10-31 23:01:47 +01:00
parent 2e08ee04bd
commit ef72fe9a40
3 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/esp8266/defines.h
View file

@ -13,7 +13,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 5 #define VERSION_MINOR 5
#define VERSION_PATCH 28 #define VERSION_PATCH 29
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {

15
tools/esp8266/webApi.cpp
View file

@ -80,14 +80,15 @@ void webApi::onApiPostBody(AsyncWebServerRequest *request, uint8_t *data, size_t
AsyncJsonResponse* response = new AsyncJsonResponse(false, 200); AsyncJsonResponse* response = new AsyncJsonResponse(false, 200);
JsonObject root = response->getRoot(); JsonObject root = response->getRoot();
DeserializationError err = deserializeJson(json, (const char *)data); DeserializationError err = deserializeJson(json, (const char *)data, len);
JsonObject obj = json.as<JsonObject>();
root[F("success")] = (err) ? false : true; root[F("success")] = (err) ? false : true;
if(!err) { if(!err) {
String path = request->url().substring(5); String path = request->url().substring(5);
if(path == "ctrl") if(path == "ctrl")
root[F("success")] = setCtrl(json, root); root[F("success")] = setCtrl(obj, root);
else if(path == "setup") else if(path == "setup")
root[F("success")] = setSetup(json, root); root[F("success")] = setSetup(obj, root);
else { else {
root[F("success")] = false; root[F("success")] = false;
root[F("error")] = "Path not found: " + path; root[F("error")] = "Path not found: " + path;
@ -400,7 +401,7 @@ void webApi::getRecord(JsonObject obj, record_t<> *rec) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool webApi::setCtrl(DynamicJsonDocument jsonIn, JsonObject jsonOut) { bool webApi::setCtrl(JsonObject jsonIn, JsonObject jsonOut) {
uint8_t cmd = jsonIn[F("cmd")]; uint8_t cmd = jsonIn[F("cmd")];
// Todo: num is the inverter number 0-3. For better display in DPRINTLN // Todo: num is the inverter number 0-3. For better display in DPRINTLN
@ -458,8 +459,8 @@ bool webApi::setCtrl(DynamicJsonDocument jsonIn, JsonObject jsonOut) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool webApi::setSetup(DynamicJsonDocument jsonIn, JsonObject jsonOut) { bool webApi::setSetup(JsonObject jsonIn, JsonObject jsonOut) {
if(F("scan_wifi")) if(F("scan_wifi") == jsonIn[F("cmd")])
mApp->scanAvailNetworks(); mApp->scanAvailNetworks();
else if(F("set_time") == jsonIn[F("cmd")]) else if(F("set_time") == jsonIn[F("cmd")])
mApp->setTimestamp(jsonIn[F("ts")]); mApp->setTimestamp(jsonIn[F("ts")]);
@ -479,7 +480,7 @@ bool webApi::setSetup(DynamicJsonDocument jsonIn, JsonObject jsonOut) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
Inverter<> *webApi::getInverter(DynamicJsonDocument jsonIn, JsonObject jsonOut) { Inverter<> *webApi::getInverter(JsonObject jsonIn, JsonObject jsonOut) {
uint8_t id = jsonIn[F("inverter")]; uint8_t id = jsonIn[F("inverter")];
Inverter<> *iv = mApp->mSys->getInverterByPos(id); Inverter<> *iv = mApp->mSys->getInverterByPos(id);
if(NULL == iv) if(NULL == iv)

6
tools/esp8266/webApi.h
View file

@ -49,10 +49,10 @@ class webApi {
void getLive(JsonObject obj); void getLive(JsonObject obj);
void getRecord(JsonObject obj, record_t<> *rec); void getRecord(JsonObject obj, record_t<> *rec);
bool setCtrl(DynamicJsonDocument jsonIn, JsonObject jsonOut); bool setCtrl(JsonObject jsonIn, JsonObject jsonOut);
bool setSetup(DynamicJsonDocument jsonIn, JsonObject jsonOut); bool setSetup(JsonObject jsonIn, JsonObject jsonOut);
Inverter<> *getInverter(DynamicJsonDocument jsonIn, JsonObject jsonOut); Inverter<> *getInverter(JsonObject jsonIn, JsonObject jsonOut);
double round3(double value) { double round3(double value) {
return (int)(value * 1000 + 0.5) / 1000.0; return (int)(value * 1000 + 0.5) / 1000.0;