Minor changes

This commit is contained in:
anschrammh 2019-09-01 22:52:21 +02:00
parent 8d2df8530d
commit 634faad650

View File

@ -80,12 +80,12 @@ boolean rtcSetTimeApi(WEBServerManager::HttpRequestData &HRD, WiFiClient *wc, vo
else
{
p->getRtcManager().setDateTime(DateTime(
atoi(dictio->get(2)->getString()),
atoi(dictio->get(1)->getString()),
atoi(dictio->get((unsigned int)0)->getString()),
atoi(dictio->get(3)->getString()),
atoi(dictio->get(4)->getString()),
atoi(dictio->get(5)->getString())
atoi(dictio->getAt(2)->getString()),
atoi(dictio->getAt(1)->getString()),
atoi(dictio->getAt((unsigned int)0)->getString()),
atoi(dictio->getAt(3)->getString()),
atoi(dictio->getAt(4)->getString()),
atoi(dictio->getAt(5)->getString())
));
DateTime d = p->getRtcManager().getDateTime();
sprintf(buffer,"HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n{ \"status\" : \"ok\", \"date\" : \"%d/%d/%d\", \"time\" : \"%d:%d:%d\" }", d.day(), d.month(), d.year(), d.hour(), d.minute(), d.second());
@ -138,18 +138,13 @@ boolean espRestartApi(WEBServerManager::HttpRequestData &HRD, WiFiClient *wc, vo
SAB *sab = (SAB*)pData;
char buffer[200];
sprintf(buffer,"HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n{ \"status\" : \"ok\", \"message\" : \"module restarting in 10 seconds\" }");
sprintf(buffer,"HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n{ \"status\" : \"ok\", \"message\" : \"module %s in 10 seconds\" }",strstr(HRD.httpResource,"reset") == NULL ? "restarting" : "resetting");
wc->print(buffer);
unsigned int id = sab->getTaskSchedulerManager().taskCount()+1;
sab->getTaskSchedulerManager().addTask(id, TaskSchedulerManagerHelper::Schedule::scheduleBuilder()
sab->getTaskSchedulerManager().addTask(sab->getTaskSchedulerManager().findFreeTaskId(), TaskSchedulerManagerHelper::Schedule::scheduleBuilder()
->setSeconds(10)
->setTriggerType(TaskSchedulerManagerHelper::Schedule::TRIGGER_ONCE_AND_DELETE)
->setTriggerRightAway(false), &(task_esp_reset_restart), NULL);
Serial.print(F("Task id : "));Serial.println(id);
return true;
}