aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJulian Picht <julian.picht@gmail.com>2016-12-27 00:15:33 +0100
committerJulian Picht <julian.picht@gmail.com>2016-12-27 01:11:10 +0100
commit37e6524203b7a974bddede2f2631015d74ea31b1 (patch)
tree85f4047f19a104554a6846e5a4a58bb025fe3225 /tools
parent8688f251051fd0e12453f513b248f1c3e4f4dc7b (diff)
downloadlibsurvive-37e6524203b7a974bddede2f2631015d74ea31b1.tar.gz
libsurvive-37e6524203b7a974bddede2f2631015d74ea31b1.tar.bz2
implement slave sync pulses
Diffstat (limited to 'tools')
-rw-r--r--tools/disambiguate/disambiguate.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/disambiguate/disambiguate.c b/tools/disambiguate/disambiguate.c
index 4fa0758..938a72f 100644
--- a/tools/disambiguate/disambiguate.c
+++ b/tools/disambiguate/disambiguate.c
@@ -41,15 +41,14 @@ int main() {
case P_UNKNOWN:
//printf("UNKN %s %2d %d %d\n", controller, sensor, time - last, length);
continue;
- case P_SYNC:
+ case P_MASTER:
+ case P_SLAVE:
{
- double l = length;
- char cc = round(l / 500) - 6;
- int ll = (length+125)/250;
+ char cc = (length - 2750) / 500;
if (cc & 0x4) {
- printf("SKIP %s %2d %10d %5d %c%d %10d %d %d\n", controller, sensor, time, length, (cc & 0x1) ? 'k' : 'j', (cc >> 1) & 0x3, time-last, ll & 1, (ll >> 1) - 6);
+ printf("SKIP %s %2d %10d %5d %c%d %10d\n", controller, sensor, time, length, (cc & 0x1) ? 'k' : 'j', (cc >> 1) & 0x3, time-last);
} else {
- printf("SYNC %s %2d %10d %5d %c%d %10d %d %d\n", controller, sensor, time, length, (cc & 0x1) ? 'k' : 'j', (cc >> 1) & 0x3, time-last, ll & 1, (ll >> 1) - 6);
+ printf("SYNC %s %2d %10d %5d %c%d %10d\n", controller, sensor, time, length, (cc & 0x1) ? 'k' : 'j', (cc >> 1) & 0x3, time-last);
last = time;
}
}