Th3maz1ng/ESP8266_swiss_army_board
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated WEBServerManager due to changes in the Dictionary utility class plus bug fixes

Browse Source
This commit is contained in:
Anatole SCHRAMM 2019-04-03 17:16:50 +02:00
parent b95716c38b
commit a33add50f1
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/WEBServerManager.cpp
View File

@ -325,19 +325,17 @@ boolean WEBServerManager::sendPageToClientFromApiDictio(WiFiClient *wifiClient)
{ {
if(_apiDictionary.count() == 0) if(_apiDictionary.count() == 0)
return false; return false;
Serial.println("___1"); ApiRoutine *ref = _apiDictionary(_httpRequestData.httpResource);
ApiRoutine *ref = _apiDictionary(_httpRequestData.httpResource).getValueRef();
Serial.println("___2");
if(ref == NULL) if(ref == NULL)
return false; return false;
if(ref->HRM == UNDEFINED) if(ref->HRM == UNDEFINED)
{ {
Serial.println("___3"); return (*(ref->apiRoutine))(_httpRequestData, wifiClient, ref->pData);
return (*ref->apiRoutine)(_httpRequestData, wifiClient, ref->pData);
}else if(ref->HRM == _httpRequestData.HRM) }else if(ref->HRM == _httpRequestData.HRM)
{ {
return (*ref->apiRoutine)(_httpRequestData, wifiClient, ref->pData); return (*(ref->apiRoutine))(_httpRequestData, wifiClient, ref->pData);
} }
else else
return false; return false;
@ -445,4 +443,3 @@ void WEBServerManager::clearHttpRequestData()
_httpRequestData.httpResource = NULL;_httpRequestData.httpBody = NULL; _httpRequestData.httpResource = NULL;_httpRequestData.httpBody = NULL;
} }