Mercurial > public > ostc4

comparison Discovery/Src/t7.c @ 212:c878a08dcf86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged in janlmulder/ostc4/cv-persistent (pull request #10) Custom views persistent and better support for mCCR
author heinrichsweikamp <bitbucket@heinrichsweikamp.com>
date Tue, 26 Mar 2019 22:23:26 +0000
parents 85bd5fea5e08
children 51a3aeffc6b3
comparison
equal deleted inserted replaced
209:2de856965c55 212:c878a08dcf86
1515 do 1515 do
1516 { 1516 {
1517 cv_disabled = 0; 1517 cv_disabled = 0;
1518 for(int i=0;i<6;i++) 1518 for(int i=0;i<6;i++)
1519 { 1519 {
1520 if((*pViews == cv_changelist[i]) && !CHECK_BIT_THOME(cv_configuration, cv_changelist[i])) 1520 if((*pViews == cv_changelist[i]) && !CHECK_BIT_THOME(settingsGetPointer()->cv_configuration, cv_changelist[i]))
1521 { 1521 {
1522 cv_disabled = 1; 1522 cv_disabled = 1;
1523 break; 1523 break;
1524 } 1524 }
1525 } 1525 }
1526
1527 if ((*pViews == CVIEW_sensors || *pViews == CVIEW_sensors_mV) &&
1528 stateUsed->diveSettings.ppo2sensors_deactivated)
1529 {
1530 cv_disabled = 1;
1531 }
1532
1526 if(cv_disabled) 1533 if(cv_disabled)
1527 { 1534 {
1528 if(*pViews < CVIEW_END) 1535 if(*pViews < CVIEW_END)
1529 { 1536 {
1530 pViews++; 1537 pViews++;