diff options
| author | Josh Allen <axlecrusher@gmail.com> | 2017-02-13 16:00:19 -0500 |
|---|---|---|
| committer | Josh Allen <axlecrusher@gmail.com> | 2017-02-13 16:00:19 -0500 |
| commit | 7fdfd9fff265d38ae002d8007a02f746f42fd3f2 (patch) | |
| tree | 5fc7e797c66e6d3af40f8c2830c267b399be3765 /include | |
| parent | 56a6bbc24962251d223536285aa407c7652c7c46 (diff) | |
| parent | 6c99f7abf29463df723221dcaa8c3fe7c93c3371 (diff) | |
| download | libsurvive-7fdfd9fff265d38ae002d8007a02f746f42fd3f2.tar.gz libsurvive-7fdfd9fff265d38ae002d8007a02f746f42fd3f2.tar.bz2 | |
Merge branch 'master' of github.com:axlecrusher/libsurvive into ootx_decoder_context_cleanup
Diffstat (limited to 'include')
| -rw-r--r-- | include/survive.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/include/survive.h b/include/survive.h index d29b487..d2f5bfe 100644 --- a/include/survive.h +++ b/include/survive.h @@ -32,14 +32,11 @@ struct SurviveObject //Flood info, for calculating which laser is currently sweeping. int8_t oldcode; - #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_time[2]; //0 = master, 1 = slave. Hardcoded, because it cannot simply be expanded. + uint32_t last_length[2]; + int8_t sync_set_number; //0 = master, 1 = slave, -1 = fault. Possibly more lighthouses??? + int8_t did_handle_ootx; + uint32_t recent_sync_time; uint32_t last_lighttime; //May be a 24- or 32- bit number depending on what device. |