Skip to content

optimize output in isForcedCP() #4

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

Merged
merged 1 commit into from
Mar 18, 2023
Merged

optimize output in isForcedCP() #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 12 additions & 18 deletions src/ESP_WiFiManager_Lite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1639,8 +1639,7 @@ class ESP_WiFiManager_Lite
bool isForcedCP()
{
uint32_t readForcedConfigPortalFlag;

ESP_WML_LOGDEBUG(F("Check if isForcedCP"));
bool retForcedConfigPortal = false;

File file = FileFS.open(CONFIG_PORTAL_FILENAME, "r");
ESP_WML_LOGINFO(F("LoadCPFile "));
Expand Down Expand Up @@ -1670,17 +1669,16 @@ class ESP_WiFiManager_Lite
if (readForcedConfigPortalFlag == FORCED_CONFIG_PORTAL_FLAG_DATA)
{
persForcedConfigPortal = false;
return true;
retForcedConfigPortal = true;
}
else if (readForcedConfigPortalFlag == FORCED_PERS_CONFIG_PORTAL_FLAG_DATA)
{
persForcedConfigPortal = true;
return true;
}
else
{
return false;
retForcedConfigPortal = true;
}

ESP_WML_LOGINFO1(F("Check if isForcedCP: "), retForcedConfigPortal ? F("true") : F("false"));
return retForcedConfigPortal;
}

//////////////////////////////////////////////
Expand Down Expand Up @@ -2149,29 +2147,25 @@ class ESP_WiFiManager_Lite
bool isForcedCP()
{
uint32_t readForcedConfigPortalFlag;
bool retForcedConfigPortal = false;

ESP_WML_LOGINFO(F("Check if isForcedCP"));

// Return true if forced CP (0xDEADBEEF read at offset EPROM_START + DRD_FLAG_DATA_SIZE + CONFIG_DATA_SIZE)
// => set flag noForcedConfigPortal = false
EEPROM.get(CONFIG_EEPROM_START + CONFIG_DATA_SIZE, readForcedConfigPortalFlag);

// Return true if forced CP (0xDEADBEEF read at offset EPROM_START + DRD_FLAG_DATA_SIZE + CONFIG_DATA_SIZE)
// => set flag noForcedConfigPortal = false
if (readForcedConfigPortalFlag == FORCED_CONFIG_PORTAL_FLAG_DATA)
{
persForcedConfigPortal = false;
return true;
retForcedConfigPortal = true;
}
else if (readForcedConfigPortalFlag == FORCED_PERS_CONFIG_PORTAL_FLAG_DATA)
{
persForcedConfigPortal = true;
return true;
}
else
{
return false;
retForcedConfigPortal = true;
}

ESP_WML_LOGINFO1(F("Check if isForcedCP: "), retForcedConfigPortal ? F("true") : F("false"));
return retForcedConfigPortal;
}

//////////////////////////////////////////////
Expand Down