Mercurial > public > ostc4
comparison Discovery/Src/settings.c @ 541:6fbf7cd391cb
Added default view selection and auto return to view to t3 visualization:
In previous version the ostc tried to applied the t7 default view selection to t3 view. As t3 has different views than t3, a new selection menu has been added to the custom view menu enabling the selection of the big font default view.
In parallel the auto return function has been adapted to use the new parameter.
author | Ideenmodellierer |
---|---|
date | Sat, 10 Oct 2020 18:34:10 +0200 |
parents | d784f281833a |
children | 6960df7ddb09 |
comparison
equal
deleted
inserted
replaced
540:ffd01ead2c80 | 541:6fbf7cd391cb |
---|---|
311 .FlipDisplay = 0, | 311 .FlipDisplay = 0, |
312 .cv_configuration = 0xFFFFFFFF, | 312 .cv_configuration = 0xFFFFFFFF, |
313 .MotionDetection = MOTION_DETECT_OFF, | 313 .MotionDetection = MOTION_DETECT_OFF, |
314 .cv_config_BigScreen = 0xFFFFFFFF, | 314 .cv_config_BigScreen = 0xFFFFFFFF, |
315 .compassInertia = 0, | 315 .compassInertia = 0, |
316 .tX_customViewPrimaryBF = CVIEW_T3_Decostop, | |
316 }; | 317 }; |
317 | 318 |
318 /* Private function prototypes -----------------------------------------------*/ | 319 /* Private function prototypes -----------------------------------------------*/ |
319 uint8_t checkValue(uint8_t value,uint8_t from, uint8_t to); | 320 uint8_t checkValue(uint8_t value,uint8_t from, uint8_t to); |
320 | 321 |
465 pSettings->cv_config_BigScreen = 0xFFFFFFFF; | 466 pSettings->cv_config_BigScreen = 0xFFFFFFFF; |
466 pSettings->cv_config_BigScreen &= pSettings->cv_configuration ^= 1 << CVIEW_T3_Navigation; | 467 pSettings->cv_config_BigScreen &= pSettings->cv_configuration ^= 1 << CVIEW_T3_Navigation; |
467 pSettings->cv_config_BigScreen &= pSettings->cv_configuration ^= 1 << CVIEW_T3_DepthData; | 468 pSettings->cv_config_BigScreen &= pSettings->cv_configuration ^= 1 << CVIEW_T3_DepthData; |
468 // no break | 469 // no break |
469 case 0xFFFF001B: | 470 case 0xFFFF001B: |
470 pSettings->compassInertia = 0; /* no inertia */ | 471 pSettings->compassInertia = 0; /* no inertia */ |
472 pSettings->tX_customViewPrimaryBF = CVIEW_T3_Decostop; | |
471 // no break | 473 // no break |
472 default: | 474 default: |
473 pSettings->header = pStandard->header; | 475 pSettings->header = pStandard->header; |
474 break; // no break before!! | 476 break; // no break before!! |
475 } | 477 } |
1385 if(Settings.compassInertia > MAX_COMPASS_COMP) | 1387 if(Settings.compassInertia > MAX_COMPASS_COMP) |
1386 { | 1388 { |
1387 Settings.compassInertia = 0; | 1389 Settings.compassInertia = 0; |
1388 corrections++; | 1390 corrections++; |
1389 } | 1391 } |
1392 if(Settings.tX_customViewPrimaryBF > CVIEW_T3_END) | |
1393 { | |
1394 Settings.tX_customViewPrimaryBF = CVIEW_T3_Decostop; | |
1395 corrections++; | |
1396 } | |
1390 | 1397 |
1391 if(corrections > 255) | 1398 if(corrections > 255) |
1392 return 255; | 1399 return 255; |
1393 else | 1400 else |
1394 return (uint8_t)corrections; | 1401 return (uint8_t)corrections; |