ostc4: Discovery/Src/motion.c comparison

comparison Discovery/Src/motion.c @ 592:f52bc70e380f

MotionCtrl - Sectorview Map sectors directly to custom views: In previous version detection of sector changes lead to a button event which triggered the change of the shown custom view. As result the views shown were depending on the angle which is present while entering focus state. The new implementation maps the primary view to the center sector and assigns the other enabled views around the center => views will always appear at the same angle value.

author	Ideenmodellierer
date	Sun, 03 Jan 2021 14:43:16 +0100
parents	4dfdf230d8ba
children	fd0b60dee6f3

comparison

equal deleted inserted replaced

-:0172431fbad9
+:f52bc70e380f
 #include "motion.h"
 #include "data_central.h"
 #include "t7.h"
 #include "t3.h"
 #include "settings.h"
+#include "base.h"
 #define	STABLE_STATE_COUNT			2	/* number of count to declare a state as stable (at the moment based on 100ms) */
 #define STABLE_STATE_TIMEOUT		5	/* Detection shall be aborted if a movement state is stable for more than 500ms */
 #define SECTOR_WINDOW				30.0  	/* Pitch window which is used for custom view projection */
 #define SECTOR_BORDER				400.0	/* Define a value which is out of limit to avoid not wanted key events */
 #define SECTOR_FILTER				10		/* Define speed for calculated angle to follow real value */
 #define SECTOR_MAX					24		/* maximum number of sectors */
 #define SECTOR_SCROLL				7		/* number of sectors used for scroll detection */
+#define SECTOR_MAX_CNT				5		/* max number of views used for sector control */
 #define MOTION_DELTA_STABLE			0
 #define MOTION_DELTA_JITTER			1
 #define MOTION_DELTA_RAISE			2
 #define MOTION_DELTA_FALL			3
 static uint8_t motionDeltaHistory[3][MOTION_DELTA_HISTORY_SIZE];			/* Change history of roll, pitch and yaw */
 static uint8_t motionDeltaHistoryIdx;										/* Current index of history data */
 static uint8_t focusCnt = 0;
 static uint8_t inFocus = 0;
+static uint8_t sectorMap[SECTOR_MAX_CNT];
 void resetMotionDeltaHistory()
 {
 	motionDeltaHistoryIdx = 0;
 	memset(motionDeltaHistory, 0, sizeof(motionDeltaHistory));
 		}
 		else
 		{
 			sectorDetection.count =  t7_GetEnabled_customviews();
 		}
-		if(sectorDetection.count > 5)
+		if(sectorDetection.count > SECTOR_MAX_CNT)
 		{
-			sectorDetection.count = 5;	/* more views are hard to manually control */
+			sectorDetection.count = SECTOR_MAX_CNT;	/* more views are hard to manually control */
 		}
 	}
 	else
 	if(numOfSectors != CUSTOMER_KEEP_LAST_SECTORS)
 	{
 /* do a small adjustment to center pitch to make sure the actual pitch is in the center of the current sector */
 	sectorDetection.center = (sectorDetection.upperborder) - ((sectorDetection.size + 2 *SECTOR_HYSTERY) / 2.0) - (centerPitch + sectorDetection.offset);
 }
+uint8_t GetCVForSector(uint8_t selSector)
+{
+	if(selSector < sectorDetection.count)
+	{
+		return sectorMap[selSector];
+	}
+	else
+	{
+		return 0;
+	}
+}
+void MapCVToSector()
+{
+	uint8_t centerView = 0;
+	memset(sectorMap, 0, sizeof(sectorMap));
+	switch(sectorDetection.count)
+	{
+		case 1: centerView = 0; break;
+		case 2: centerView = 0; break;
+		case 3: centerView = 1; break;
+		case 4: centerView = 1; break;
+		case 5: centerView = 2; break;
+		default: centerView = sectorDetection.count / 2 - 1;
+			break;
+	}
+	if(settingsGetPointer()->design == 3)		/* Big font view ? */
+	{
+		sectorMap[centerView] = settingsGetPointer()->tX_customViewPrimaryBF;
+	}
+	else
+	{
+		sectorMap[centerView] = settingsGetPointer()->tX_customViewPrimary;
+	}
+	centerView++;
+	while(sectorMap[centerView] == 0)
+	{
+		if(settingsGetPointer()->design == 3)		/* Big font view ? */
+		{
+			sectorMap[centerView] = t3_change_customview(ACTION_BUTTON_ENTER);
+		}
+		else
+		{
+			sectorMap[centerView] = t7_change_customview(ACTION_BUTTON_ENTER);
+		}
+		centerView++;
+		if(centerView == sectorDetection.count)
+		{
+			centerView = 0;
+		}
+	}
+}
 void InitMotionDetection(void)
 {
 	sectorDetection.target = 0;
 	sectorDetection.current = 0;
 	sectorDetection.size = 0;
 	sectorDetection.count = 0;
 	switch(settingsGetPointer()->MotionDetection)
 	{
 		case MOTION_DETECT_SECTOR: DefinePitchSectors(settingsGetPointer()->viewPitch,CUSTOMER_DEFINED_VIEWS);
+									MapCVToSector();
 			break;
 		case MOTION_DETECT_MOVE: DefinePitchSectors(settingsGetPointer()->viewPitch,SECTOR_MAX);
 			break;
 		case MOTION_DETECT_SCROLL: DefinePitchSectors(settingsGetPointer()->viewPitch,SECTOR_SCROLL);
 			break;
 }
 /* Map the current pitch value to a sector and create button event in case the sector is left */
 detectionState_t detectSectorButtonEvent(float curPitch)
 {
-	static uint8_t lastTargetSector = 0;
 	uint8_t newTargetSector;
-	uint8_t PitchEvent = DETECT_NOTHING;
-/* only change sector if reading is stable */
 	newTargetSector = GetSectorForPitch(stateRealGetPointer()->lifeData.compass_pitch);
-	if(lastTargetSector == newTargetSector)
-	{
+	if(settingsGetPointer()->design == 3)		/* Big font view ? */
-		sectorDetection.target = newTargetSector;
+	{
-	}
+		t3_select_customview(GetCVForSector(newTargetSector));
-	lastTargetSector = newTargetSector;
+	}
-	if(sectorDetection.target != sectorDetection.current)
+	else
 	{
-		 if(sectorDetection.target > sectorDetection.current)
+		t7_select_customview(GetCVForSector(newTargetSector));
-		 {
+	}
-			 sectorDetection.current++;
-			PitchEvent = DETECT_POS_PITCH;
+	return DETECT_NOTHING;
-		 }
-		 else
-		 {
-			 sectorDetection.current--;
-			 PitchEvent = DETECT_NEG_PITCH;
-		 }
-	}
-	return PitchEvent;
 }
 /* Check if pitch is not in center position and trigger a button action if needed */
 detectionState_t detectScrollButtonEvent(float curPitch)
 {

Mercurial > public > ostc4

comparison Discovery/Src/motion.c @ 592:f52bc70e380f