Mercurial > public > ostc4
comparison Discovery/Src/t6_apnea.c @ 387:0dbb74be972f
Merged in Ideenmodellierer/ostc4/MotionDetection (pull request #34)
MotionDetection
author | heinrichsweikamp <bitbucket@heinrichsweikamp.com> |
---|---|
date | Sun, 24 Nov 2019 15:46:58 +0000 |
parents | 39c147e47c1c |
children | 65c7b009136f |
comparison
equal
deleted
inserted
replaced
358:c6a084d1433f | 387:0dbb74be972f |
---|---|
299 GFX_write_string(&Batt24,&t6c1,TextC1,0); | 299 GFX_write_string(&Batt24,&t6c1,TextC1,0); |
300 } | 300 } |
301 | 301 |
302 | 302 |
303 | 303 |
304 void t6_change_customview(void) | 304 void t6_change_customview(uint8_t action) |
305 { | 305 { |
306 t3_basics_change_customview(&t6_selection_customview, t6_customviews); | 306 t3_basics_change_customview(&t6_selection_customview, t6_customviews, action); |
307 } | 307 } |
308 | 308 |
309 | 309 |
310 void t6_refresh_customview(float depth) | 310 void t6_refresh_customview(float depth) |
311 { | 311 { |
312 uint8_t customViewLeftSide = CVIEW_T3_MaxDepth; | 312 uint8_t customViewLeftSide = CVIEW_T3_MaxDepth; |
313 | |
314 if((t6_selection_customview == CVIEW_sensors) &&(stateUsed->diveSettings.ccrOption == 0)) | |
315 t6_change_customview(); | |
316 | 313 |
317 if(t6_getCustomView() == CVIEW_T3_ApnoeSurfaceInfo) | 314 if(t6_getCustomView() == CVIEW_T3_ApnoeSurfaceInfo) |
318 customViewLeftSide = CVIEW_T3_ApnoeSurfaceInfo; | 315 customViewLeftSide = CVIEW_T3_ApnoeSurfaceInfo; |
319 | 316 |
320 t3_basics_refresh_customview(depth, customViewLeftSide, &t6screen, &t6c1, &t6c2, DIVEMODE_Apnea); | 317 t3_basics_refresh_customview(depth, customViewLeftSide, &t6screen, &t6c1, &t6c2, DIVEMODE_Apnea); |