From a95737952d4fbb658b6de3bec312109b56caf6a6 Mon Sep 17 00:00:00 2001 From: Julian Picht Date: Tue, 20 Dec 2016 21:32:44 +0100 Subject: hacked in my disambiguator --- include/survive.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/survive.h') diff --git a/include/survive.h b/include/survive.h index f64091f..e29c82b 100644 --- a/include/survive.h +++ b/include/survive.h @@ -1,6 +1,7 @@ #ifndef _SURVIVE_H #define _SURVIVE_H +#include "disambiguator.h" #include #define SV_FLOAT double @@ -31,10 +32,14 @@ struct SurviveObject //Flood info, for calculating which laser is currently sweeping. int8_t oldcode; +#if 0 int16_t total_photos; int32_t last_photo_time; int32_t total_photo_time; int32_t total_pulsecode_time; +#else + disambiguator d; +#endif }; typedef void (*text_feedback_fnptr)( struct SurviveContext * ctx, const char * fault ); -- cgit v1.2.3 From 093802f9cc7ebaa0bfe8d862766e7e08026576f0 Mon Sep 17 00:00:00 2001 From: cnlohr Date: Tue, 20 Dec 2016 22:44:10 -0500 Subject: switch to a hidden disambiguator. --- include/survive.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/survive.h') diff --git a/include/survive.h b/include/survive.h index e29c82b..889e24d 100644 --- a/include/survive.h +++ b/include/survive.h @@ -1,7 +1,6 @@ #ifndef _SURVIVE_H #define _SURVIVE_H -#include "disambiguator.h" #include #define SV_FLOAT double @@ -38,7 +37,7 @@ struct SurviveObject int32_t total_photo_time; int32_t total_pulsecode_time; #else - disambiguator d; + struct disambiguator * d; #endif }; -- cgit v1.2.3 From 170219fe413602508b31c39df23c8938adc6c35f Mon Sep 17 00:00:00 2001 From: cnlohr Date: Tue, 20 Dec 2016 23:36:55 -0500 Subject: get the new disambiguator closer, but it's still not perfect. --- include/survive.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/survive.h') diff --git a/include/survive.h b/include/survive.h index 889e24d..8ce5404 100644 --- a/include/survive.h +++ b/include/survive.h @@ -31,7 +31,7 @@ struct SurviveObject //Flood info, for calculating which laser is currently sweeping. int8_t oldcode; -#if 0 +#ifdef USE_OLD_DISAMBIGUATOR int16_t total_photos; int32_t last_photo_time; int32_t total_photo_time; -- cgit v1.2.3