diff options
| author | cnlohr <lohr85@gmail.com> | 2017-02-13 01:16:05 -0500 |
|---|---|---|
| committer | cnlohr <lohr85@gmail.com> | 2017-02-13 01:16:05 -0500 |
| commit | ff7167fb8afff6633db422290864e5da302d9afb (patch) | |
| tree | eb3b679912d9d2afaf3238d91bd3df14268a9b7c /include | |
| parent | 1ffadeda2fac023741c9a828714bb4ac29fcd815 (diff) | |
| download | libsurvive-ff7167fb8afff6633db422290864e5da302d9afb.tar.gz libsurvive-ff7167fb8afff6633db422290864e5da302d9afb.tar.bz2 | |
Update disambiguator. I think I got it right this time, finally. Also, seems to output OOTX data pretty good.
Diffstat (limited to 'include')
| -rw-r--r-- | include/survive.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/include/survive.h b/include/survive.h index 7d461c7..d2f5bfe 100644 --- a/include/survive.h +++ b/include/survive.h @@ -32,16 +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; - int16_t last_master_length; - int16_t last_slave_length; - int8_t is_on_slave; - #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. |