From eb9893e94aa555fab569ffe6fe16153652125d50 Mon Sep 17 00:00:00 2001 From: cnlohr Date: Sat, 21 Jan 2017 23:23:17 -0500 Subject: Closes #14 and closes #12 - fix syncing off correct word and don't throw out good data from HMD. --- include/survive.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/survive.h b/include/survive.h index 30ee310..d29b487 100644 --- a/include/survive.h +++ b/include/survive.h @@ -31,13 +31,15 @@ struct SurviveObject //Flood info, for calculating which laser is currently sweeping. int8_t oldcode; -#ifdef USE_OLD_DISAMBIGUATOR - int32_t last_photo_time; - int32_t last_photo_length; -#else - int32_t last_photo_time; - struct disambiguator * d; -#endif + + #ifdef USE_OLD_DISAMBIGUATOR + uint32_t last_master_time; + uint32_t last_slave_time; + int32_t last_photo_length; + #else + uint32_t last_master_time; + struct disambiguator * d; + #endif uint32_t last_lighttime; //May be a 24- or 32- bit number depending on what device. -- cgit v1.2.3