Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated keywords. Renamed server functions and made them public #126

Merged
merged 4 commits into from
Jun 12, 2019
Merged

Updated keywords. Renamed server functions and made them public #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d61ba6
Update keywords.txt
Onno-Dirkzwager Jun 12, 2019
8a768bb
Rearranged, Regrouped & renamed some functions
Onno-Dirkzwager Jun 12, 2019
ae0c91c
Update IOTAppStory.cpp
Onno-Dirkzwager Jun 12, 2019
b2ec450
Update configServer.cpp
Onno-Dirkzwager Jun 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions keywords.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,44 +7,71 @@
#######################################

IOTAppStory KEYWORD1
IAS_Xtra_Func KEYWORD1



#######################################
# Methods and Functions (KEYWORD2)
#######################################
serialdebug KEYWORD2
preSetConfig KEYWORD2

# preSets
preSetDeviceName KEYWORD2
preSetAppName KEYWORD2
preSetAppVersion KEYWORD2
preSetAutoUpdate KEYWORD2
preSetAutoConfig KEYWORD2
preSetWifi KEYWORD2

# callbacks
onFirstBoot KEYWORD2
onModeButtonNoPress KEYWORD2
onModeButtonShortPress KEYWORD2
onModeButtonLongPress KEYWORD2
onModeButtonVeryLongPress KEYWORD2
onFirstBoot KEYWORD2
onConfigMode KEYWORD2
onFirmwareUpdateCheck KEYWORD2
onFirmwareUpdateDownload KEYWORD2
onFirmwareUpdateProgress KEYWORD2
onFirmwareUpdateError KEYWORD2
onFirmwareUpdateSuccess KEYWORD2
onConfigMode KEYWORD2

# regular functions
addField KEYWORD2
begin KEYWORD2
loop KEYWORD2
callHome KEYWORD2
setCallHome KEYWORD2
setCallHomeInterval KEYWORD2
loop KEYWORD2

writeConfig KEYWORD2
readConfig KEYWORD2
espRestart KEYWORD2
eraseEEPROM KEYWORD2

WiFiSetupAndConnect KEYWORD2
WiFiDisconnect KEYWORD2
setClock KEYWORD2

callHome KEYWORD2
iotUpdater KEYWORD2
espInstaller KEYWORD2

iasLog KEYWORD2
dPinConv KEYWORD2
eepFreeFrom KEYWORD2

#server functions
strRetWifiScan KEYWORD2
strRetWifiCred KEYWORD2
strRetCertScan KEYWORD2
strRetHtmlRoot KEYWORD2
strRetDevInfo KEYWORD2
strRetAppInfo KEYWORD2
servSaveFngPrint KEYWORD2
servSaveWifiCred KEYWORD2
servSaveAppInfo KEYWORD2
servSaveActcode KEYWORD2


#######################################
# Constants (LITERAL1)
#######################################
Expand Down
40 changes: 20 additions & 20 deletions src/IOTAppStory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,7 +1289,7 @@ void IOTAppStory::onConfigMode(THandlerFunction value) {


/** Handle root */
String IOTAppStory::servHdlRoot() {
String IOTAppStory::strRetHtmlRoot() {

String retHtml;
retHtml += FPSTR(HTTP_TEMP_START);
Expand All @@ -1302,7 +1302,7 @@ String IOTAppStory::servHdlRoot() {

retHtml.replace("{h}", FPSTR(HTTP_AP_CSS));
retHtml += FPSTR(HTTP_WIFI_FORM);
retHtml.replace("{r}", strWifiScan());
retHtml.replace("{r}", strRetWifiScan());
retHtml += FPSTR(HTTP_AP_JS);
}

Expand All @@ -1313,7 +1313,7 @@ String IOTAppStory::servHdlRoot() {


/** Handle device information */
String IOTAppStory::servHdlDevInfo(){
String IOTAppStory::strRetDevInfo(){
#if DEBUG_LVL >= 3
DEBUG_PRINTLN(SER_SERV_DEV_INFO);
#endif
Expand Down Expand Up @@ -1351,7 +1351,7 @@ String IOTAppStory::servHdlDevInfo(){


/** Handle wifi scan */
String IOTAppStory::strWifiScan(){
String IOTAppStory::strRetWifiScan(){

#if DEBUG_LVL >= 3
DEBUG_PRINTLN(SER_SERV_WIFI_SCAN_RES);
Expand Down Expand Up @@ -1407,7 +1407,7 @@ String IOTAppStory::strWifiScan(){


/** Handle wifi scan */
String IOTAppStory::strWifiCred(){
String IOTAppStory::strRetWifiCred(){

#if DEBUG_LVL >= 3
DEBUG_PRINTLN(SER_SERV_WIFI_CRED);
Expand Down Expand Up @@ -1455,7 +1455,7 @@ String IOTAppStory::strWifiCred(){


/** Handle save wifi credentials */
String IOTAppStory::servHdlWifiSave(const char* newSSID, const char* newPass, const int apNr) {
bool IOTAppStory::servSaveWifiCred(const char* newSSID, const char* newPass, const int apNr) {

WiFiConnector WiFiConn;
if(apNr==0){
Expand All @@ -1464,13 +1464,13 @@ String IOTAppStory::servHdlWifiSave(const char* newSSID, const char* newPass, co
WiFiConn.addAPtoEEPROM(newSSID, newPass, apNr);
}

return F("1"); // ok
return true; // ok
}



/** Handle save wifi credentials */
String IOTAppStory::servHdlWifiSave(const char* newSSID, const char* newPass, String ip, String subnet, String gateway, String dnsserv) {
bool IOTAppStory::servSaveWifiCred(const char* newSSID, const char* newPass, String ip, String subnet, String gateway, String dnsserv) {

WiFiConnector WiFiConn;
if((ip+subnet+gateway+dnsserv) == ""){
Expand All @@ -1479,13 +1479,13 @@ String IOTAppStory::servHdlWifiSave(const char* newSSID, const char* newPass, St
WiFiConn.addAPtoEEPROM(newSSID, newPass, ip, subnet, gateway, dnsserv);
}

return F("1"); // ok
return true; // ok
}



/** Handle app / firmware information */
String IOTAppStory::servHdlAppInfo(){
String IOTAppStory::strRetAppInfo(){
#if DEBUG_LVL >= 3
DEBUG_PRINTLN(SER_SERV_APP_SETTINGS);
#endif
Expand Down Expand Up @@ -1572,7 +1572,7 @@ String IOTAppStory::servHdlAppInfo(){
Only used if ESP8266 && HTTPS_8266_TYPE == FNGPRINT
*/
#if defined ESP8266 && HTTPS_8266_TYPE == FNGPRINT
String IOTAppStory::servHdlFngPrintSave(String fngprint){
bool IOTAppStory::servSaveFngPrint(String fngprint){

// get config from EEPROM
configStruct config;
Expand All @@ -1591,15 +1591,15 @@ String IOTAppStory::servHdlFngPrintSave(String fngprint){
// write config to EEPROM
this->writeConfig(config);

return F("1");
return true;
}
#endif



#if defined ESP32
/** Get all root certificates */
String IOTAppStory::strCertScan(String path){
String IOTAppStory::strRetCertScan(String path){

#if DEBUG_LVL >= 3
DEBUG_PRINTLN(SER_SERV_CERT_SCAN_RES);
Expand Down Expand Up @@ -1648,7 +1648,7 @@ String IOTAppStory::strCertScan(String path){
return retHtml;
}
#else
String IOTAppStory::strCertScan(String path){
String IOTAppStory::strRetCertScan(String path){

#if DEBUG_LVL >= 3
DEBUG_PRINTLN(SER_SERV_CERT_SCAN_RES);
Expand Down Expand Up @@ -1708,7 +1708,7 @@ String IOTAppStory::strCertScan(String path){


/** Save App Settings */
String IOTAppStory::servHdlAppSave(AsyncWebServerRequest *request) {
bool IOTAppStory::servSaveAppInfo(AsyncWebServerRequest *request) {
#if DEBUG_LVL >= 3
DEBUG_PRINTLN(SER_SAVE_APP_SETTINGS);
#endif
Expand Down Expand Up @@ -1784,16 +1784,16 @@ String IOTAppStory::servHdlAppSave(AsyncWebServerRequest *request) {
EEPROM.end();
delay(200);

return F("1");
return true;
}

return F("0");
return false;
}



/** Save activation code */
String IOTAppStory::servHdlactcodeSave(String actcode) {
bool IOTAppStory::servSaveActcode(String actcode) {
#if DEBUG_LVL >= 3
DEBUG_PRINT(SER_REC_ACT_CODE);
DEBUG_PRINTLN(actcode);
Expand All @@ -1809,8 +1809,8 @@ String IOTAppStory::servHdlactcodeSave(String actcode) {
// write config to EEPROM
this->writeConfig(config);

return F("1");
return true;
}

return F("0");
return false;
}
Loading