Mercurial > public > ostc4

comparison Discovery/Src/t7.c @ 366:3c7030d6d67a MotionDetection

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix misalignment of do while loop
author ideenmodellierer
date Mon, 17 Jun 2019 19:56:38 +0200
parents c18aebb03fed
children e309f78f89a5
comparison
equal deleted inserted replaced
365:c18aebb03fed 366:3c7030d6d67a
1523 { 1523 {
1524 pViews--; 1524 pViews--;
1525 } 1525 }
1526 } 1526 }
1527 1527
1528 do 1528 do
1529 { 1529 {
1530 cv_disabled = 0; 1530 cv_disabled = 0;
1531 for(int i=0;i<6;i++) 1531 for(int i=0;i<6;i++)
1532 { 1532 {
1533 if((*pViews == cv_changelist[i]) && !CHECK_BIT_THOME(settingsGetPointer()->cv_configuration, cv_changelist[i])) 1533 if((*pViews == cv_changelist[i]) && !CHECK_BIT_THOME(settingsGetPointer()->cv_configuration, cv_changelist[i]))
1534 { 1534 {
1535 cv_disabled = 1; 1535 cv_disabled = 1;
1536 break; 1536 break;
1537 } 1537 }
1538 } 1538 }
1539 1539
1540 if (((*pViews == CVIEW_sensors) || (*pViews == CVIEW_sensors_mV)) && 1540 if (((*pViews == CVIEW_sensors) || (*pViews == CVIEW_sensors_mV)) &&
1541 ((stateUsed->diveSettings.ppo2sensors_deactivated) || (stateUsed->diveSettings.ccrOption == 0))) 1541 ((stateUsed->diveSettings.ppo2sensors_deactivated) || (stateUsed->diveSettings.ccrOption == 0)))
1542 { 1542 {
1543 cv_disabled = 1; 1543 cv_disabled = 1;
1544 } 1544 }
1545 1545
1546 if(cv_disabled) /* view is disabled => jump to next view */ 1546 if(cv_disabled) /* view is disabled => jump to next view */
1547 { 1547 {
1548 if((action == ACTION_BUTTON_ENTER) || (action == ACTION_SHAKE_POS)) 1548 if((action == ACTION_BUTTON_ENTER) || (action == ACTION_SHAKE_POS))
1549 { 1549 {
1550 pViews++; 1550 pViews++;
1551 if(*pViews == CVIEW_END) 1551 if(*pViews == CVIEW_END)
1552 { 1552 {
1553 pViews = pStartView; 1553 pViews = pStartView;
1554 } 1554 }
1555 } 1555 }
1556 else 1556 else
1557 { 1557 {
1558 if(pViews == pStartView) 1558 if(pViews == pStartView)
1559 { 1559 {
1560 pViews = pLastView - 1; 1560 pViews = pLastView - 1;
1561 } 1561 }
1562 else 1562 else
1563 { 1563 {
1564 pViews--; 1564 pViews--;
1565 } 1565 }
1566 } 1566 }
1567 } 1567 }
1568 } while(cv_disabled); 1568 } while(cv_disabled);
1569 } 1569
1570 selection_customview = *pViews; 1570 selection_customview = *pViews;
1571 } 1571 }
1572 1572
1573 1573
1574 uint8_t t7_get_length_of_customtext(void) 1574 uint8_t t7_get_length_of_customtext(void)