Mercurial > public > ostc4
diff Discovery/Src/t7.c @ 212:c878a08dcf86
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 |
line wrap: on
line diff
--- a/Discovery/Src/t7.c Sun Mar 24 22:09:37 2019 +0000 +++ b/Discovery/Src/t7.c Tue Mar 26 22:23:26 2019 +0000 @@ -1517,12 +1517,19 @@ cv_disabled = 0; for(int i=0;i<6;i++) { - if((*pViews == cv_changelist[i]) && !CHECK_BIT_THOME(cv_configuration, cv_changelist[i])) + if((*pViews == cv_changelist[i]) && !CHECK_BIT_THOME(settingsGetPointer()->cv_configuration, cv_changelist[i])) { cv_disabled = 1; break; } } + + if ((*pViews == CVIEW_sensors || *pViews == CVIEW_sensors_mV) && + stateUsed->diveSettings.ppo2sensors_deactivated) + { + cv_disabled = 1; + } + if(cv_disabled) { if(*pViews < CVIEW_END)