From 2e580c8e7ae701974aa58a72d47dccd1c95c43ad Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 23 Jul 2011 18:36:01 +0000 Subject: decode beacon prints cnt as deciaml number now git-svn-id: https://svn.spreadspace.org/mur.sat@48 7de4ea59-55d0-425e-a1af-a3118ea81d4c --- software/tests/beacon/decode.pl | 2 +- software/tests/beacon/test.dat | 45 +++-------------------------------------- 2 files changed, 4 insertions(+), 43 deletions(-) diff --git a/software/tests/beacon/decode.pl b/software/tests/beacon/decode.pl index 85739b3..17c026d 100755 --- a/software/tests/beacon/decode.pl +++ b/software/tests/beacon/decode.pl @@ -31,7 +31,7 @@ foreach(@beacons) { foreach(@values) { $csval_calc ^= $_ - ord(' '); } $csval_calc = ($csval_calc & 0x1F) ^ (($csval_calc & 0x20) >> 5); - print $beacon . " -> cnt: " . sprintf("%04X", $cntval); + print $beacon . " -> cnt: " . $cntval; if($csval_calc != $csval_recv) { print " checksom wrong! (" . sprintf("%02X", $csval_recv) . " vs. " . sprintf("%02X", $csval_calc) . ")\n"; } else { diff --git a/software/tests/beacon/test.dat b/software/tests/beacon/test.dat index c1c270e..be90c6f 100644 --- a/software/tests/beacon/test.dat +++ b/software/tests/beacon/test.dat @@ -1,42 +1,3 @@ -OE6MUR AAA X -OE6MUR AAB U -OE6MUR AAC V -OE6MUR AAD S -OE6MUR AAE T -OE6MUR AAF Q -OE6MUR AAG R -OE6MUR AAH 6 -OE6MUR AAI 7 -OE6MUR AAJ 4 -OE6MUR AAK 5 -OE6MUR AAL 2 -OE6MUR AAM 3 -OE6MUR AAN Y -OE6MUR AAO Z -OE6MUR AAP G -OE6MUR AAQ H -OE6MUR AAR E -OE6MUR AAS F -OE6MUR AAT C -OE6MUR AAU D -OE6MUR AAV A -OE6MUR AAW B -OE6MUR AAX O -OE6MUR AAY P -OE6MUR AAZ M -OE6MUR AA2 F -OE6MUR AA3 E -OE6MUR AA4 D -OE6MUR AA5 C -OE6MUR AA6 -OE6MUR AA7 A -OE6MUR ABA U -OE6MUR ABB X -OE6MUR ABC W -OE6MUR ABD R -OE6MUR ABE Q -OE6MUR ABF T -OE6MUR ABG S -OE6MUR ABH 5 -OE6MUR ABI 4 -OE6MUR ABJ 7 \ No newline at end of file +OE6MUR FZK F +OE6MUR FZL C +OE6MUR FZM D -- cgit v1.2.3