regard rotary counts in setup menu and select menu's as well

iltis42 · Mar 26, 2024 · c7685ff · c7685ff
1 parent a3cc1d5
commit c7685ff
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/main/SetupMenu.cpp b/main/SetupMenu.cpp
@@ -573,10 +573,11 @@ void SetupMenu::down(int count){
 	ucg->setColor(COLOR_BLACK);
 	ucg->drawFrame( 1,(highlight+1)*25+3,238,25 );
 	ucg->setColor(COLOR_WHITE);
-	if( highlight  > -1 ){
+	while( (highlight  > -1) && count ){
 		highlight --;
+		count--;
 	}
-	else
+	if( highlight < -1 )
 		highlight = (int)(_childs.size() -1 );
 	ucg->drawFrame( 1,(highlight+1)*25+3,238,25 );
 	xSemaphoreGive(spiMutex );
@@ -617,11 +618,13 @@ void SetupMenu::up(int count){
 	ucg->setColor(COLOR_BLACK);
 	ucg->drawFrame( 1,(highlight+1)*25+3,238,25 );
 	ucg->setColor(COLOR_WHITE);
-	if( highlight < (int)(_childs.size()-1) ){
+	while( highlight < (int)(_childs.size()-1) && count ){
 		highlight ++;
+		count--;
 	}
-	else
+	if( highlight > (int)(_childs.size()-1) ){
 		highlight = -1;
+	}
 	ucg->drawFrame( 1,(highlight+1)*25+3,238,25 );
 	pressed = true;
 	xSemaphoreGive(spiMutex );

diff --git a/main/SetupMenuSelect.cpp b/main/SetupMenuSelect.cpp
@@ -187,8 +187,10 @@ void SetupMenuSelect::down(int count){
 		ucg->setColor(COLOR_BLACK);
 		ucg->drawFrame( 1,(_select+1)*25+3,238,25 );  // blank old frame
 		ucg->setColor(COLOR_WHITE);
-		if( (_select) >  0 )
+		while( (_select) >  0 && count){
 			(_select)--;
+			count--;
+		}
 		ESP_LOGI(FNAME,"val down %d", _select );
 		ucg->drawFrame( 1,(_select+1)*25+3,238,25 );  // draw new frame
 		xSemaphoreGive(spiMutex );
@@ -215,8 +217,10 @@ void SetupMenuSelect::up(int count){
 		ucg->setColor(COLOR_BLACK);
 		ucg->drawFrame( 1,(_select+1)*25+3,238,25 );  // blank old frame
 		ucg->setColor(COLOR_WHITE);
-		if ( (_select) < _numval-1 )
+		while ( (_select) < _numval-1 && count ){
 			(_select)++;
+			count--;
+		}
 		ESP_LOGI(FNAME,"val up %d", _select );
 		ucg->drawFrame( 1,(_select+1)*25+3,238,25 );  // draw new frame
 		xSemaphoreGive(spiMutex );