From 93873b616394b24fefb0ce17ae0e302ff2697d14 Mon Sep 17 00:00:00 2001 From: cnlohr Date: Tue, 21 Feb 2017 02:54:42 -0500 Subject: making progress --- src/survive_cal.h | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'src/survive_cal.h') diff --git a/src/survive_cal.h b/src/survive_cal.h index dd69b57..bf6161d 100644 --- a/src/survive_cal.h +++ b/src/survive_cal.h @@ -32,14 +32,14 @@ void survive_cal_angle( struct SurviveObject * so, int sensor_id, int acode, uin #define MAX_SENSORS_TO_CAL 96 #define DRPTS 512 - +#define MAX_CAL_PT_DAT (MAX_SENSORS_TO_CAL*NUM_LIGHTHOUSES*2) struct SurviveCalData { struct SurviveContext * ctx; //OOTX Data is sync'd off of the sync pulses coming from the lighthouses. ootx_decoder_context ootx_decoders[NUM_LIGHTHOUSES]; - //For statistics-gathering phase. + //For statistics-gathering phase. (Stage 2/3) FLT all_lengths[MAX_SENSORS_TO_CAL][NUM_LIGHTHOUSES][2][DRPTS]; FLT all_angles[MAX_SENSORS_TO_CAL][NUM_LIGHTHOUSES][2][DRPTS]; int16_t all_counts[MAX_SENSORS_TO_CAL][NUM_LIGHTHOUSES][2]; @@ -47,6 +47,15 @@ struct SurviveCalData int8_t found_common; int8_t times_found_common; + //For camfind (4+) + FLT avgsweeps[MAX_CAL_PT_DAT]; + FLT avglens[MAX_CAL_PT_DAT]; + FLT stdsweeps[MAX_CAL_PT_DAT]; + FLT stdlens[MAX_CAL_PT_DAT]; + int ctsweeps[MAX_CAL_PT_DAT]; + + int senid_of_checkpt; //This is a point on a watchman that can be used to check the lh solution. + //Stage: // 0: Idle // 1: Collecting OOTX data. @@ -54,6 +63,10 @@ struct SurviveCalData }; +//The following function is not included in the core survive_cal and must be compiled from a camfind file. +//It should use data for stage 4 and report if it found the +int survive_cal_lhfind( struct SurviveCalData * cd ); + #endif -- cgit v1.2.3