Mercurial > public > ostc4
comparison Discovery/Src/tHome.c @ 696:cc542448fb28
Merge
author | heinrichsweikamp |
---|---|
date | Fri, 19 Aug 2022 11:30:24 +0200 |
parents | 980d7f8d5530 |
children | 4a6bffaa38b3 |
comparison
equal
deleted
inserted
replaced
661:87bee7cc77b3 | 696:cc542448fb28 |
---|---|
588 t3_set_customview_to_primary(); | 588 t3_set_customview_to_primary(); |
589 } | 589 } |
590 } | 590 } |
591 } | 591 } |
592 | 592 |
593 if((stateUsed->mode == MODE_SURFACE) && (stateUsed->diveSettings.ppo2sensors_deactivated != 0x07) && (stateUsed->diveSettings.ccrOption != 0)) | 593 if((stateUsed->mode == MODE_SURFACE) && (stateUsed->diveSettings.ppo2sensors_deactivated != 0x07) && (stateUsed->diveSettings.ccrOption != 0) && (!t7_customview_disabled(CVIEW_sensors))) |
594 { | 594 { |
595 tHome_tick_count_o2sens++; | 595 tHome_tick_count_o2sens++; |
596 if(tHome_tick_count_o2sens > AUTORETURN_O2SENS) | 596 if(tHome_tick_count_o2sens > AUTORETURN_O2SENS) |
597 { | 597 { |
598 tHome_tick_count_o2sens = 0; | 598 tHome_tick_count_o2sens = 0; |