diff options
| author | cnlohr <lohr85@gmail.com> | 2017-01-21 23:23:17 -0500 |
|---|---|---|
| committer | cnlohr <lohr85@gmail.com> | 2017-01-21 23:23:17 -0500 |
| commit | eb9893e94aa555fab569ffe6fe16153652125d50 (patch) | |
| tree | 81c51acce7bd866f384cd3e17ad6584d22e0f506 /include | |
| parent | 70f396c731d57742349fc13539b32120238a6f35 (diff) | |
| download | libsurvive-eb9893e94aa555fab569ffe6fe16153652125d50.tar.gz libsurvive-eb9893e94aa555fab569ffe6fe16153652125d50.tar.bz2 | |
Closes #14 and closes #12 - fix syncing off correct word and don't throw out good data from HMD.
Diffstat (limited to 'include')
| -rw-r--r-- | include/survive.h | 16 |
1 files changed, 9 insertions, 7 deletions
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. |