diff options
| author | Michael Turvey <mwturvey@users.noreply.github.com> | 2017-02-13 16:52:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 16:52:34 -0700 |
| commit | 3f475fad0fc6b6b03bc0bf7a61edc986148f0786 (patch) | |
| tree | 410ace763f3f513081338d6803c2a755582b3202 /include/survive.h | |
| parent | dd949f9495956ab87795f6a75e8257d0a37325fd (diff) | |
| parent | ee433e4a076f77fa28e4d55d6703d6ed7c599251 (diff) | |
| download | libsurvive-3f475fad0fc6b6b03bc0bf7a61edc986148f0786.tar.gz libsurvive-3f475fad0fc6b6b03bc0bf7a61edc986148f0786.tar.bz2 | |
Merge pull request #8 from cnlohr/master
Updating Master
Diffstat (limited to 'include/survive.h')
| -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. |