ostc4: Discovery/Src/motion.c annotate

annotate Discovery/Src/motion.c @ 626:3e1a0e267f38

Added option to select sensitivity of focus detection: Depending on the location the computer is equiped during dive (arm wet/ dry suite, glove...) it is usefull to adapt the sensitivity of the focus detection. Technical it means the radius of the spot in which direction ray is projected may be changed in size. The option has been added to the motion control menu.

author	Ideenmodellierer
date	Fri, 12 Feb 2021 21:37:50 +0100
parents	028d8f3a9410
children	189f945ae4ba

rev	line source
359 4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	1 /*
4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	2 * motion.c
4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	3 *
4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	4 * Created on: 20.05.2019
4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	5 * Author: Thorsten Sonntag
4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	6 */
4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	7
4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	8 #include <stdint.h>
4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	9 #include <string.h>
373 7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	10 #include <stdlib.h>
359 4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	11 #include <math.h>
4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	12 #include "motion.h"
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	13 #include "data_central.h"
77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	14 #include "t7.h"
384 427ae9f8e28e Consider number of available t3 views in sector handling: ideenmodellierer parents: 383 diff changeset	15 #include "t3.h"
371 fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	16 #include "settings.h"
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	17 #include "base.h"
359 4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	18
4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	19 #define STABLE_STATE_COUNT 2 /* number of count to declare a state as stable (at the moment based on 100ms) */
363 bdf978d2a5d4 Reworked detection function ideenmodellierer parents: 362 diff changeset	20 #define STABLE_STATE_TIMEOUT 5 /* Detection shall be aborted if a movement state is stable for more than 500ms */
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	21
385 0cd862e501f6 Finetune parameter for detection of small sectors as used for the pitch detection ideenmodellierer parents: 384 diff changeset	22 #define SECTOR_MAX 24 /* maximum number of sectors */
378 834e087505ec Incremented "idle window" for scroll detection ideenmodellierer parents: 373 diff changeset	23 #define SECTOR_SCROLL 7 /* number of sectors used for scroll detection */
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	24 #define SECTOR_MAX_CNT 5 /* max number of views used for sector control */
359 4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	25
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	26 #define MOTION_DELTA_STABLE 0
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	27 #define MOTION_DELTA_JITTER 1
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	28 #define MOTION_DELTA_RAISE 2
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	29 #define MOTION_DELTA_FALL 3
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	30
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	31 #define MOTION_DELTA_JITTER_LEVEL 2.0 /* lower values are considered as stable */
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	32 #define MOTION_DELTA_RAISE_LEVEL 4.0 /* Movement causing a significant change detected */
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	33 #define MOTION_DELTA_FALL_LEVEL -4.0 /* Movement causing a significant change detected */
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	34
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	35 #define MOTION_DELTA_HISTORY_SIZE 20 /* Number of history data sets */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	36
385 0cd862e501f6 Finetune parameter for detection of small sectors as used for the pitch detection ideenmodellierer parents: 384 diff changeset	37 detectionState_t detectionState = DETECT_NOTHING;
0cd862e501f6 Finetune parameter for detection of small sectors as used for the pitch detection ideenmodellierer parents: 384 diff changeset	38 SSector sectorDetection;
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	39
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	40 static uint8_t motionDeltaHistory[3][MOTION_DELTA_HISTORY_SIZE]; /* Change history of roll, pitch and yaw */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	41 static uint8_t motionDeltaHistoryIdx; /* Current index of history data */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	42
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	43 static uint8_t focusCnt = 0;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	44 static uint8_t inFocus = 0;
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	45 static uint8_t sectorMap[SECTOR_MAX_CNT];
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	46
611 916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	47 static uint8_t suspendMotionDetectionSec = 0;
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	48
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	49 void resetMotionDeltaHistory()
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	50 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	51 motionDeltaHistoryIdx = 0;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	52 memset(motionDeltaHistory, 0, sizeof(motionDeltaHistory));
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	53 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	54
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	55 void evaluateMotionDelta(float roll, float pitch, float yaw)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	56 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	57 static float lastValue[3] = {0.0,0.0,0.0};
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	58 uint8_t nextIndex = motionDeltaHistoryIdx + 1;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	59 uint8_t axis;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	60 float curValue;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	61
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	62 if(nextIndex == MOTION_DELTA_HISTORY_SIZE)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	63 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	64 nextIndex = 0;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	65 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	66 for(axis=0; axis < 3; axis++)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	67 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	68 switch(axis)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	69 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	70 case MOTION_HISTORY_ROLL: curValue = roll;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	71 break;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	72 case MOTION_HISTORY_PITCH: curValue = pitch;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	73 break;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	74 default:
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	75 case MOTION_HISTORY_YAW: if((yaw < 90) && (lastValue[MOTION_HISTORY_YAW] > 270.0)) /* transition 360 => 0 */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	76 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	77 lastValue[MOTION_HISTORY_YAW] -= 360;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	78 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	79 else if((yaw > 270) && (lastValue[MOTION_HISTORY_YAW] < 90.0)) /* transition 0 => 360 */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	80 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	81 lastValue[MOTION_HISTORY_YAW] += 360;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	82 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	83 curValue = yaw;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	84 break;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	85 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	86 if(curValue - lastValue[axis] > MOTION_DELTA_RAISE_LEVEL)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	87 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	88 motionDeltaHistory[axis][nextIndex] = MOTION_DELTA_RAISE;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	89 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	90 if(fabsf(curValue - lastValue[axis]) < MOTION_DELTA_RAISE_LEVEL)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	91 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	92 motionDeltaHistory[axis][nextIndex] = MOTION_DELTA_JITTER;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	93 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	94 if(fabsf(curValue - lastValue[axis]) < MOTION_DELTA_JITTER_LEVEL)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	95 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	96 motionDeltaHistory[axis][nextIndex] = MOTION_DELTA_STABLE;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	97 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	98 if(curValue - lastValue[axis] < MOTION_DELTA_FALL_LEVEL)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	99 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	100 motionDeltaHistory[axis][nextIndex] = MOTION_DELTA_FALL;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	101 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	102 lastValue[axis] = curValue;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	103 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	104 motionDeltaHistoryIdx = nextIndex;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	105 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	106
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	107 SDeltaHistory GetDeltaHistory(uint8_t stepback)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	108 {
578 beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	109 uint8_t loop;
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	110 uint8_t index = motionDeltaHistoryIdx;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	111
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	112 SDeltaHistory result = {0,0,0};
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	113
578 beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	114 stepback++; /* motionDeltaHistoryIdx is pointing to future entry => step back one to get the latest */
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	115 loop = stepback;
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	116 if(stepback < MOTION_DELTA_HISTORY_SIZE)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	117 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	118 while(loop != 0) /* find requested entry */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	119 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	120 loop--;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	121 index--;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	122 if(index == 0)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	123 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	124 index = MOTION_DELTA_HISTORY_SIZE - 1;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	125 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	126 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	127 result.roll = motionDeltaHistory[MOTION_HISTORY_ROLL][index];
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	128 result.pitch = motionDeltaHistory[MOTION_HISTORY_PITCH][index];
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	129 result.yaw = motionDeltaHistory[MOTION_HISTORY_YAW][index];
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	130 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	131 return result;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	132 }
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	133
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	134 uint8_t GetSectorForFocus(float focusOffset)
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	135 {
77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	136 uint8_t sector = 0;
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	137 float compare = 0.1;
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	138
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	139 while(compare <= 0.5)
381 695434a6dcf6 Simplified pitch detection state machine: ideenmodellierer parents: 378 diff changeset	140 {
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	141 if(focusOffset > compare)
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	142 {
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	143 sector++;
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	144 }
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	145 else
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	146 {
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	147 break;
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	148 }
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	149 compare += 0.1;
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	150 }
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	151 if(sector > sectorDetection.count)
381 695434a6dcf6 Simplified pitch detection state machine: ideenmodellierer parents: 378 diff changeset	152 {
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	153 sector = sectorDetection.count;
381 695434a6dcf6 Simplified pitch detection state machine: ideenmodellierer parents: 378 diff changeset	154 }
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	155 return sector;
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	156 }
77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	157
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	158 void DefineSectorCount(uint8_t numOfSectors)
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	159 {
371 fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	160 if(numOfSectors == CUSTOMER_DEFINED_VIEWS)
fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	161 {
384 427ae9f8e28e Consider number of available t3 views in sector handling: ideenmodellierer parents: 383 diff changeset	162 if(settingsGetPointer()->design == 3) /* Big font view ? */
427ae9f8e28e Consider number of available t3 views in sector handling: ideenmodellierer parents: 383 diff changeset	163 {
427ae9f8e28e Consider number of available t3 views in sector handling: ideenmodellierer parents: 383 diff changeset	164 sectorDetection.count = t3_GetEnabled_customviews();
427ae9f8e28e Consider number of available t3 views in sector handling: ideenmodellierer parents: 383 diff changeset	165 }
427ae9f8e28e Consider number of available t3 views in sector handling: ideenmodellierer parents: 383 diff changeset	166 else
427ae9f8e28e Consider number of available t3 views in sector handling: ideenmodellierer parents: 383 diff changeset	167 {
427ae9f8e28e Consider number of available t3 views in sector handling: ideenmodellierer parents: 383 diff changeset	168 sectorDetection.count = t7_GetEnabled_customviews();
427ae9f8e28e Consider number of available t3 views in sector handling: ideenmodellierer parents: 383 diff changeset	169 }
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	170 if(sectorDetection.count > SECTOR_MAX_CNT)
371 fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	171 {
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	172 sectorDetection.count = SECTOR_MAX_CNT; /* more views are hard to manually control */
371 fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	173 }
fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	174 }
fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	175 else
373 7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	176 if(numOfSectors != CUSTOMER_KEEP_LAST_SECTORS)
371 fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	177 {
383 49a02dea8ae3 Combine variables in a structure to improve readability of code ideenmodellierer parents: 381 diff changeset	178 sectorDetection.count = numOfSectors;
371 fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	179 }
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	180 }
77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	181
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	182
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	183 uint8_t GetCVForSector(uint8_t selSector)
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	184 {
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	185 if(selSector < sectorDetection.count)
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	186 {
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	187 return sectorMap[selSector];
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	188 }
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	189 else
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	190 {
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	191 return 0;
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	192 }
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	193 }
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	194
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	195 void MapCVToSector()
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	196 {
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	197 uint8_t ViewIndex = 0;
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	198
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	199 memset(sectorMap, 0, sizeof(sectorMap));
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	200
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	201 if(settingsGetPointer()->design == 3) /* Big font view ? */
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	202 {
595 fd0b60dee6f3 Bugfix Selection of primary view: Ideenmodellierer parents: 592 diff changeset	203 t3_set_customview_to_primary();
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	204 sectorMap[ViewIndex] = t3_change_customview(ACTION_END);
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	205 }
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	206 else
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	207 {
595 fd0b60dee6f3 Bugfix Selection of primary view: Ideenmodellierer parents: 592 diff changeset	208 t7_set_customview_to_primary();
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	209 sectorMap[ViewIndex] = t7_change_customview(ACTION_END);
595 fd0b60dee6f3 Bugfix Selection of primary view: Ideenmodellierer parents: 592 diff changeset	210
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	211 }
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	212
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	213 ViewIndex++;
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	214 while(ViewIndex < sectorDetection.count)
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	215 {
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	216 if(settingsGetPointer()->design == 3) /* Big font view ? */
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	217 {
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	218 sectorMap[ViewIndex] = t3_change_customview(ACTION_BUTTON_ENTER);
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	219 }
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	220 else
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	221 {
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	222 sectorMap[ViewIndex] = t7_change_customview(ACTION_BUTTON_ENTER);
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	223 }
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	224 ViewIndex++;
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	225 }
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	226
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	227 }
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	228
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	229 void InitMotionDetection(void)
77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	230 {
383 49a02dea8ae3 Combine variables in a structure to improve readability of code ideenmodellierer parents: 381 diff changeset	231 sectorDetection.target = 0;
49a02dea8ae3 Combine variables in a structure to improve readability of code ideenmodellierer parents: 381 diff changeset	232 sectorDetection.current = 0;
49a02dea8ae3 Combine variables in a structure to improve readability of code ideenmodellierer parents: 381 diff changeset	233 sectorDetection.size = 0;
49a02dea8ae3 Combine variables in a structure to improve readability of code ideenmodellierer parents: 381 diff changeset	234 sectorDetection.count = 0;
371 fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	235
fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	236 switch(settingsGetPointer()->MotionDetection)
fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	237 {
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	238 case MOTION_DETECT_SECTOR: DefineSectorCount(CUSTOMER_DEFINED_VIEWS);
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	239 MapCVToSector();
371 fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	240 break;
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	241 case MOTION_DETECT_MOVE: DefineSectorCount(SECTOR_MAX);
371 fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	242 break;
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	243 case MOTION_DETECT_SCROLL: DefineSectorCount(SECTOR_SCROLL);
373 7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	244 break;
371 fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	245 default:
fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	246 break;
fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	247 }
fca370f847f8 Added parameter for number of sectors to be defined ideenmodellierer parents: 370 diff changeset	248
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	249 resetMotionDeltaHistory();
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	250 }
77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	251
77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	252 /* Map the current pitch value to a sector and create button event in case the sector is left */
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	253 detectionState_t detectSectorButtonEvent(float focusOffset)
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	254 {
77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	255 uint8_t newTargetSector;
77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	256
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	257 newTargetSector = GetSectorForFocus(focusOffset);
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	258
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	259 if(settingsGetPointer()->design == 3) /* Big font view ? */
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	260 {
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	261 t3_select_customview(GetCVForSector(newTargetSector));
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	262 }
592 f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	263 else
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	264 {
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	265 t7_select_customview(GetCVForSector(newTargetSector));
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	266 }
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	267
f52bc70e380f MotionCtrl - Sectorview Map sectors directly to custom views: Ideenmodellierer parents: 585 diff changeset	268 return DETECT_NOTHING;
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	269 }
77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	270
373 7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	271 /* Check if pitch is not in center position and trigger a button action if needed */
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	272 detectionState_t detectScrollButtonEvent(float focusOffset)
373 7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	273 {
378 834e087505ec Incremented "idle window" for scroll detection ideenmodellierer parents: 373 diff changeset	274 static uint8_t delayscroll = 0; /* slow down the number of scroll events */
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	275
373 7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	276 uint8_t PitchEvent = DETECT_NOTHING;
7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	277
7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	278 if(delayscroll == 0)
7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	279 {
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	280 if(focusOffset > 0.3)
373 7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	281 {
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	282 PitchEvent = DETECT_POS_PITCH;
574 01ee21dd311f Improved focus detection: Ideenmodellierer parents: 551 diff changeset	283 delayscroll = 7;
373 7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	284 }
7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	285 }
7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	286 else
7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	287 {
7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	288 delayscroll--;
7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	289 }
7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	290 return PitchEvent;
7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	291 }
7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	292
7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	293
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	294 /* Detect if user is generating an pitch including return to starting position */
359 4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	295 /* This is done by feeding the past movements value per value into a state machine */
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	296 detectionState_t detectPitch(float currentPitch)
359 4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	297 {
578 beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	298 static int8_t lastStart = 0;
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	299 uint8_t exit = 0;
578 beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	300 int8_t step = 0;
574 01ee21dd311f Improved focus detection: Ideenmodellierer parents: 551 diff changeset	301 uint8_t duration = 0;
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	302 SDeltaHistory test;
370 77cdfbdaca8c Changed function names from shake to pitch and improved detection function: Shake might be confusing for people reading the code because pitch values are ased for calculation => changed name to pitch to be more transparent ideenmodellierer parents: 363 diff changeset	303
578 beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	304 if(lastStart < 0)
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	305 {
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	306 detectionState = DETECT_NOTHING;
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	307 lastStart = 0;
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	308 }
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	309 else
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	310 {
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	311 detectionState = DETECT_START;
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	312 }
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	313 step = lastStart;
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	314 do
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	315 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	316 test = GetDeltaHistory(step);
574 01ee21dd311f Improved focus detection: Ideenmodellierer parents: 551 diff changeset	317 duration++;
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	318 switch (detectionState)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	319 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	320 case DETECT_NOTHING: if(test.pitch > MOTION_DELTA_STABLE)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	321 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	322 exit = 1;
578 beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	323 lastStart = -2;
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	324 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	325 else
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	326 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	327 detectionState = DETECT_START;
578 beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	328 lastStart = -1;
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	329 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	330 break;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	331 case DETECT_START: if(test.pitch == MOTION_DELTA_RAISE)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	332 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	333 detectionState = DETECT_POS_MOVE;
578 beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	334 lastStart = step;
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	335 }
578 beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	336 else
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	337 if(test.pitch == MOTION_DELTA_FALL)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	338 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	339 detectionState = DETECT_NEG_MOVE;
578 beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	340 lastStart = step;
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	341 }
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	342 else
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	343 {
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	344 lastStart = -1;
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	345 }
574 01ee21dd311f Improved focus detection: Ideenmodellierer parents: 551 diff changeset	346 duration = 0;
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	347 break;
578 beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	348 case DETECT_NEG_MOVE: if((test.pitch <= MOTION_DELTA_JITTER) \|\| (test.pitch == MOTION_DELTA_RAISE))
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	349 {
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	350 detectionState++;
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	351 }
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	352 break;
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	353 case DETECT_POS_MOVE: if((test.pitch <= MOTION_DELTA_JITTER) \|\| (test.pitch == MOTION_DELTA_FALL))
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	354 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	355 detectionState++;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	356 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	357 break;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	358 case DETECT_MAXIMA: if(test.pitch == MOTION_DELTA_FALL)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	359 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	360 detectionState = DETECT_FALLBACK;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	361 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	362 break;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	363 case DETECT_MINIMA: if(test.pitch == MOTION_DELTA_RAISE)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	364 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	365 detectionState = DETECT_RISEBACK;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	366 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	367 break;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	368 case DETECT_RISEBACK:
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	369 case DETECT_FALLBACK: if(test.pitch == MOTION_DELTA_STABLE)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	370 {
578 beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	371 if(duration > 4) /* avoid detection triggered by short moves */
574 01ee21dd311f Improved focus detection: Ideenmodellierer parents: 551 diff changeset	372 {
01ee21dd311f Improved focus detection: Ideenmodellierer parents: 551 diff changeset	373 detectionState++;
01ee21dd311f Improved focus detection: Ideenmodellierer parents: 551 diff changeset	374 }
578 beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	375 exit = 1;
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	376 lastStart = -2;
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	377 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	378 break;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	379 default:
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	380 detectionState = DETECT_NOTHING;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	381 exit = 1;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	382 break;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	383 }
578 beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	384 step--;
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	385 } while((step >= 0) && (!exit));
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	386
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	387 if((lastStart < MOTION_DELTA_HISTORY_SIZE))
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	388 {
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	389 lastStart++; /* prepare value for next iteration (history index will be increased) */
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	390 }
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	391 else
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	392 {
beb4d47542f1 Rework pitch detection: Ideenmodellierer parents: 574 diff changeset	393 lastStart = -1;
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	394 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	395 if((detectionState != DETECT_POS_PITCH) && (detectionState != DETECT_NEG_PITCH)) /* nothing found */
359 4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	396 {
4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	397 detectionState = DETECT_NOTHING;
4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	398 }
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	399 else /* dont detect the same event twice */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	400 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	401 resetMotionDeltaHistory();
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	402 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	403 return detectionState;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	404 }
363 bdf978d2a5d4 Reworked detection function ideenmodellierer parents: 362 diff changeset	405
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	406 void anglesToCoord(float roll, float pitch, float yaw, SCoord *pCoord)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	407 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	408 pCoord->x = ((cosf(yaw) * cosf(pitch)) * pCoord->x + (cosf(yaw)sinf(pitch)sinf(roll) - (sinf(yaw)* cosf(roll))) * pCoord->y + (cosf(yaw)sinf(pitch)cosf(roll) + sinf(yaw)sinf(roll)) pCoord->z);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	409 pCoord->y = ((sinf(yaw) * cosf(pitch)) * pCoord->x + (sinf(yaw)sinf(pitch)sinf(roll) + cosf(yaw) * cosf(roll)) * pCoord->y + ( sinf(yaw) * sinf(pitch) * cosf(roll) - cosf(yaw) * sinf(roll))* pCoord->z);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	410 pCoord->z = ((-1sinf(pitch)) pCoord->x + (cosf(pitch) sinf(roll)) pCoord->y + (cosf(pitch) * cosf(roll))* pCoord->z);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	411 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	412
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	413 SCoord CoordAdd(SCoord cA, SCoord cB)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	414 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	415 SCoord result;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	416
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	417 result.x = cA.x + cB.x;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	418 result.y = cA.y + cB.y;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	419 result.z = cA.z + cB.z;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	420 return result;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	421 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	422
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	423 SCoord CoordSub(SCoord cA, SCoord cB)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	424 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	425 SCoord result;
373 7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	426
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	427 result.x = cA.x - cB.x;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	428 result.y = cA.y - cB.y;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	429 result.z = cA.z - cB.z;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	430 return result;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	431 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	432
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	433 SCoord CoordCross(SCoord cA, SCoord cB)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	434 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	435 SCoord result;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	436
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	437 result.x = (cA.y * cB.z) - (cA.z * cB.y);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	438 result.y = (cA.z * cB.x) - (cA.x * cB.z);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	439 result.z = (cA.x * cB.y) - (cA.y * cB.x);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	440
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	441 return result;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	442
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	443 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	444
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	445 SCoord CoordMulF(SCoord op, float factor)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	446 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	447 SCoord result;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	448 result.x = (op.x * factor);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	449 result.y = (op.y * factor);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	450 result.z = (op.z * factor);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	451
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	452 return result;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	453 }
373 7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	454
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	455 SCoord CoordDivF(SCoord op, float factor)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	456 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	457 SCoord result;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	458 result.x = (op.x / factor);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	459 result.y = (op.y / factor);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	460 result.z = (op.z / factor);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	461
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	462 return result;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	463 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	464
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	465 float CoordDot(SCoord cA, SCoord cB)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	466 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	467 float result;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	468
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	469 result = cA.x * cB.x + cA.y * cB.y + cB.z*cA.z;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	470 return result;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	471 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	472
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	473 void calibrateViewport(float roll, float pitch, float yaw)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	474 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	475 SSettings* pSettings = settingsGetPointer();
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	476
621 6826731ff2be Use roll and pitch agles in 0-360 format: Ideenmodellierer parents: 618 diff changeset	477 pSettings->viewPitch = pitch + 180;
6826731ff2be Use roll and pitch agles in 0-360 format: Ideenmodellierer parents: 618 diff changeset	478 pSettings->viewRoll = roll+ 180;
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	479 pSettings->viewYaw = yaw;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	480 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	481
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	482
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	483 float checkViewport(float roll, float pitch, float yaw, uint8_t enableAxis)
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	484 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	485 uint8_t retval = 0;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	486 float angleYaw;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	487 float anglePitch;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	488 float angleRoll;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	489 float distance = 0;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	490 float _a, _b;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	491 SCoord u,v,n;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	492 float r;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	493
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	494 SCoord refVec;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	495 SCoord axis_1;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	496 SCoord axis_2;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	497 SCoord curVec;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	498 SCoord resultVec;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	499
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	500 SSettings* pSettings = settingsGetPointer();
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	501
621 6826731ff2be Use roll and pitch agles in 0-360 format: Ideenmodellierer parents: 618 diff changeset	502 roll += 180;
6826731ff2be Use roll and pitch agles in 0-360 format: Ideenmodellierer parents: 618 diff changeset	503 pitch += 180;
6826731ff2be Use roll and pitch agles in 0-360 format: Ideenmodellierer parents: 618 diff changeset	504
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	505 /* calculate base vector taking calibration delta into account yaw (heading) */
621 6826731ff2be Use roll and pitch agles in 0-360 format: Ideenmodellierer parents: 618 diff changeset	506 float compYaw;
574 01ee21dd311f Improved focus detection: Ideenmodellierer parents: 551 diff changeset	507
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	508 if(enableAxis & MOTION_ENABLE_YAW)
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	509 {
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	510 compYaw = 360.0 - yaw; /* turn to 0° */
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	511 compYaw += pSettings->viewYaw; /* consider calib yaw value */
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	512 compYaw += yaw;
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	513
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	514 if (compYaw < 0.0)
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	515 {
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	516 compYaw = 360.0 + compYaw;
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	517 }
574 01ee21dd311f Improved focus detection: Ideenmodellierer parents: 551 diff changeset	518
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	519 if (compYaw > 360.0)
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	520 {
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	521 compYaw = compYaw - 360.0;
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	522 }
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	523 if (compYaw > 360.0)
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	524 {
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	525 compYaw = compYaw - 360.0;
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	526 }
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	527 angleYaw = pSettings->viewYaw * M_PI / 180.0;
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	528 }
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	529 else
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	530 {
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	531 compYaw = 0.0;
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	532 angleYaw = 0.0;
381 695434a6dcf6 Simplified pitch detection state machine: ideenmodellierer parents: 378 diff changeset	533 }
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	534
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	535 if(enableAxis & MOTION_ENABLE_PITCH)
381 695434a6dcf6 Simplified pitch detection state machine: ideenmodellierer parents: 378 diff changeset	536 {
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	537 anglePitch = pSettings->viewPitch * M_PI / 180.0;
373 7b981f8bdd41 Add scroll event by pitch angle detection: ideenmodellierer parents: 371 diff changeset	538 }
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	539 else
574 01ee21dd311f Improved focus detection: Ideenmodellierer parents: 551 diff changeset	540 {
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	541 anglePitch = 0;
574 01ee21dd311f Improved focus detection: Ideenmodellierer parents: 551 diff changeset	542 }
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	543 if(enableAxis & MOTION_ENABLE_ROLL)
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	544 {
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	545 angleRoll = pSettings->viewRoll * M_PI / 180.0;
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	546 }
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	547 else
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	548 {
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	549 angleRoll = 0;
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	550 }
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	551
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	552 refVec.x = 0;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	553 refVec.y = 0;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	554 refVec.z = 1.0;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	555
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	556 anglesToCoord(angleRoll,anglePitch,angleYaw, &refVec);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	557
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	558 /* assume x = 0 and y = 1 => find matching vector so axis_1 is 90° to axis_2 */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	559 axis_1.x = 0;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	560 if(refVec.y >=0)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	561 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	562 axis_2.y = 1; /* => Spawn y == refVec y */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	563 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	564 else axis_1.y = -1;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	565 axis_1.z = -1.0 * refVec.y / refVec.z;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	566 axis_2 = CoordCross(refVec, axis_1); /* Cross is 90° to refVec and Spawn as well => Plane Spawn / cross */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	567
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	568 /* check if detection plane is correct */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	569 u = CoordSub(axis_1,refVec);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	570 v = CoordSub(axis_2,refVec);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	571 n = CoordCross(u,v);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	572
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	573 if((fabsf(n.x) <= 0.0001) && (fabsf(n.y) <= 0.0001) && (fabsf(n.z) <= 0.0001))
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	574 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	575 retval = 2;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	576 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	577 else
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	578 {
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	579 if(enableAxis & MOTION_ENABLE_PITCH)
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	580 {
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	581 anglePitch = pitch * M_PI / 180.0;
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	582 }
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	583 else
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	584 {
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	585 anglePitch = 0.0;
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	586 }
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	587 if(enableAxis & MOTION_ENABLE_ROLL)
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	588 {
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	589 angleRoll = roll * M_PI / 180.0;
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	590 }
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	591 else
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	592 {
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	593 angleRoll = 0.0;
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	594 }
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	595 if(enableAxis & MOTION_ENABLE_YAW)
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	596 {
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	597 angleYaw = compYaw * M_PI / 180.0;
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	598 }
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	599 else
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	600 {
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	601 angleYaw = 0.0;
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	602 }
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	603
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	604 curVec.x = 0;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	605 curVec.y = 0;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	606 curVec.z = 1.0;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	607 anglesToCoord(angleRoll,anglePitch,angleYaw, &curVec);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	608
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	609 _a = CoordDot(curVec,n);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	610 _b = CoordDot(refVec,n);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	611
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	612 if(_b>=(-0.0001)&&_b<=0.0001) /* Check if view port is parallel (no matchpoint) */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	613 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	614 retval = 3;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	615 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	616 else
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	617 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	618 r=_a/_b;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	619 if(r<0.00\|\|r>1.40) /* are we looking into wrong direction? */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	620 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	621 retval = 4;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	622 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	623 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	624 distance = retval * 1.0; /* just for debugging */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	625 if(retval == 0)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	626 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	627 /* start calculating the matchpoint */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	628 curVec = CoordMulF(curVec,r);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	629 resultVec = CoordSub(refVec,curVec);
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	630
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	631 /* calculate the distance between reference and actual vector */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	632 resultVec.x = resultVec.x * resultVec.x;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	633 resultVec.y = resultVec.y * resultVec.y;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	634 resultVec.z = resultVec.z * resultVec.z;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	635
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	636 if((resultVec.x == 0) && (resultVec.y == 0) && (resultVec.z == 0))
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	637 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	638 distance = 0.0;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	639 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	640 else
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	641 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	642 distance = sqrtf((resultVec.x + resultVec.y + resultVec.z));
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	643 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	644 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	645 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	646
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	647 if(distance < 0.5) /* handle focus counter to avoid fast in/out focus changes */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	648 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	649 if(focusCnt < 10)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	650 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	651 if((focusCnt == 9) && (inFocus == 0)) /* we will get into focus */
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	652 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	653 resetMotionDeltaHistory();
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	654 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	655 focusCnt++;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	656 }
574 01ee21dd311f Improved focus detection: Ideenmodellierer parents: 551 diff changeset	657 if((focusCnt == 10) && (inFocus == 0))
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	658 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	659 inFocus = 1;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	660 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	661 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	662 else
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	663 {
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	664 if(focusCnt >= 5) /* Reset focus faster then setting focus */
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	665 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	666 focusCnt--;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	667 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	668 else
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	669 {
574 01ee21dd311f Improved focus detection: Ideenmodellierer parents: 551 diff changeset	670 focusCnt = 0;
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	671 inFocus = 0;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	672 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	673 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	674 return distance;
359 4258ea9b67fa Added new files for motion detection (shaking) detection ideenmodellierer parents: diff changeset	675 }
551 e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	676 uint8_t viewInFocus(void)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	677 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	678 return inFocus;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	679 }
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	680 void resetFocusState(void)
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	681 {
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	682 inFocus = 0;
e3237f580ae9 Added viewport functionality: Ideenmodellierer parents: 385 diff changeset	683 }
611 916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	684
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	685 void suspendMotionDetection(uint8_t seconds)
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	686 {
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	687 suspendMotionDetectionSec = seconds * 10; /* detection function is called every 100ms */
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	688 }
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	689
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	690 void HandleMotionDetection(void)
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	691 {
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	692 detectionState_t pitchstate = DETECT_NOTHING;
618 96af74455420 Development bugfix: focus state not remembered: Ideenmodellierer parents: 611 diff changeset	693 static uint8_t wasInFocus = 0;
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	694 float focusOffset = 0.0;
611 916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	695
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	696 evaluateMotionDelta(stateUsed->lifeData.compass_roll, stateUsed->lifeData.compass_pitch, stateUsed->lifeData.compass_heading);
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	697 if(viewInFocus())
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	698 {
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	699 focusOffset = checkViewport(stateUsed->lifeData.compass_roll, stateUsed->lifeData.compass_pitch, stateUsed->lifeData.compass_heading, (MOTION_ENABLE_PITCH \| MOTION_ENABLE_YAW));
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	700 }
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	701 else
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	702 {
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	703 focusOffset = checkViewport(stateUsed->lifeData.compass_roll, stateUsed->lifeData.compass_pitch, stateUsed->lifeData.compass_heading, MOTION_ENABLE_ALL);
028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	704 }
611 916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	705 if(viewInFocus())
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	706 {
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	707 wasInFocus = 1;
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	708 set_Backlight_Boost(settingsGetPointer()->viewPortMode & 0x03);
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	709
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	710 if(suspendMotionDetectionSec == 0) /* suspend detection while diver is manually operating the OSTC */
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	711 {
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	712 switch(settingsGetPointer()->MotionDetection)
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	713 {
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	714 case MOTION_DETECT_MOVE: pitchstate = detectPitch(stateRealGetPointer()->lifeData.compass_pitch);
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	715 break;
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	716 case MOTION_DETECT_SECTOR: pitchstate = detectSectorButtonEvent(focusOffset);
611 916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	717 break;
625 028d8f3a9410 Switch Sector / Scroll detection to vector implementation: Ideenmodellierer parents: 621 diff changeset	718 case MOTION_DETECT_SCROLL: pitchstate = detectScrollButtonEvent(focusOffset);
611 916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	719 break;
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	720 default:
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	721 pitchstate = DETECT_NOTHING;
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	722 break;
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	723 }
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	724 }
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	725
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	726 if(DETECT_NEG_PITCH == pitchstate)
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	727 {
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	728 StoreButtonAction((uint8_t)ACTION_PITCH_NEG);
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	729 }
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	730 if(DETECT_POS_PITCH == pitchstate)
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	731 {
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	732 StoreButtonAction((uint8_t)ACTION_PITCH_POS);
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	733 }
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	734 }
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	735 else
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	736 {
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	737 if(wasInFocus)
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	738 {
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	739 wasInFocus = 0;
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	740 if(suspendMotionDetectionSec == 0)
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	741 {
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	742 if(settingsGetPointer()->design == 7)
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	743 {
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	744 t7_set_customview_to_primary();
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	745 }
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	746 else
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	747 {
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	748 t3_set_customview_to_primary();
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	749 }
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	750 }
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	751 }
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	752 set_Backlight_Boost(0);
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	753 }
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	754 if(suspendMotionDetectionSec != 0)
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	755 {
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	756 suspendMotionDetectionSec--;
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	757 }
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	758 }
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	759
916998f90e39 Suspend MotionDetection events while diver is operationg the OSTC: Ideenmodellierer parents: 595 diff changeset	760

Mercurial > public > ostc4

annotate Discovery/Src/motion.c @ 626:3e1a0e267f38