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

Compare commits

base: Th3maz1ng:cd2b2ba624565f8905ef511f754fefe8296d2ee8
Branches Tags
Th3maz1ng:master
..
compare: Th3maz1ng:e5d250556fcb586f3f136a83e4a3fad3d9b14ac8
Branches Tags
Th3maz1ng:master

No commits in common. "cd2b2ba624565f8905ef511f754fefe8296d2ee8" and "e5d250556fcb586f3f136a83e4a3fad3d9b14ac8" have entirely different histories.
cd2b2ba624 ... e5d250556f

2 changed files with 5 additions and 9 deletions
Show Stats Expand all files Collapse all files

12
src/app/ScreenManager.cpp
View File

@ -292,9 +292,7 @@ void ScreenManager::displayNextView()
{ {
_forceRefresh = true; _forceRefresh = true;
_error = OK; _error = OK;
if(isListEmpty(_viewLinkedList))return; if(_currentView == NO_CURRENT_VIEW && !isListEmpty(_viewLinkedList))
if(_currentView == NO_CURRENT_VIEW)
{ {
_currentView = _viewLinkedList; _currentView = _viewLinkedList;
} }
@ -303,7 +301,7 @@ void ScreenManager::displayNextView()
_currentView = _currentView->next; _currentView = _currentView->next;
} }
//End of the views, we cycle again :) //End of the views, we cycle again :)
else if(isListEmpty(_currentView->next)) else if(isListEmpty(_currentView->next) && !isListEmpty(_viewLinkedList))
{ {
_currentView = _viewLinkedList; _currentView = _viewLinkedList;
} }
@ -325,9 +323,7 @@ void ScreenManager::displayPreviousView()
{ {
_forceRefresh = true; _forceRefresh = true;
_error = OK; _error = OK;
if(isListEmpty(_tail))return; if(_currentView == NO_CURRENT_VIEW && !isListEmpty(_tail))
if(_currentView == NO_CURRENT_VIEW)
{ {
_currentView = _tail; _currentView = _tail;
} }
@ -336,7 +332,7 @@ void ScreenManager::displayPreviousView()
_currentView = _currentView->previous; _currentView = _currentView->previous;
} }
//End of the views, we cycle again :) //End of the views, we cycle again :)
else if(isListEmpty(_currentView->previous)) else if(isListEmpty(_currentView->previous) && !isListEmpty(_tail))
{ {
_currentView = _tail; _currentView = _tail;
} }

2
src/app/app.ino
View File

@ -53,7 +53,7 @@ void setup()
sab.getScreenManager().addView(&(sysErrorInfo), &sab, 6); sab.getScreenManager().addView(&(sysErrorInfo), &sab, 6);
sab.getScreenManager().addView(NULL, NULL, 7); //for testing purposes sab.getScreenManager().addView(NULL, NULL, 7); //for testing purposes
sab.getScreenManager().addView(&(dummy), NULL, 8); //for testing purposes sab.getScreenManager().addView(&(dummy), NULL, 8); //for testing purposes
sab.getScreenManager().displayView(0); sab.getScreenManager().displayView(0);
if(sab.getRtcManager().hasLostPower()) if(sab.getRtcManager().hasLostPower())
{ {