diff options
| author | Christian Pointner <equinox@mur.at> | 2011-07-23 18:59:59 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@mur.at> | 2011-07-23 18:59:59 +0000 |
| commit | fa7ab600fffb4f08701af9973fb3345a70e9d0bc (patch) | |
| tree | 6ad39f4afc01a15a713efb4569f5b727a5c1c9d7 | |
| parent | decode beacon prints cnt as deciaml number now (diff) | |
now using A as start sign
git-svn-id: https://svn.spreadspace.org/mur.sat@49 7de4ea59-55d0-425e-a1af-a3118ea81d4c
| -rwxr-xr-x | software/tests/beacon/decode.pl | 2 | ||||
| -rw-r--r-- | software/tests/beacon/test.dat | 10 | ||||
| -rw-r--r-- | software/ttx/ttx.asm | 5 |
3 files changed, 11 insertions, 6 deletions
diff --git a/software/tests/beacon/decode.pl b/software/tests/beacon/decode.pl index 17c026d..b2b1446 100755 --- a/software/tests/beacon/decode.pl +++ b/software/tests/beacon/decode.pl @@ -25,7 +25,7 @@ foreach(@beacons) { my $cntval = unpack("n", MIME::Base32::decode($cnt . "=")) >> 1; my $csval_recv = unpack("C", MIME::Base32::decode($checksum . "=")) >> 3; - my $csval_calc = ord('E') - ord(' '); + my $csval_calc = ord('A') - ord(' '); my @values = unpack("C*", $preamble); @values = (@values, unpack("C*", $cnt)); foreach(@values) { $csval_calc ^= $_ - ord(' '); } diff --git a/software/tests/beacon/test.dat b/software/tests/beacon/test.dat index be90c6f..3acc496 100644 --- a/software/tests/beacon/test.dat +++ b/software/tests/beacon/test.dat @@ -1,3 +1,7 @@ -OE6MUR FZK F -OE6MUR FZL C -OE6MUR FZM D +A OE6MUR FZO F +A OE6MUR FZP 2 +A OE6MUR FZQ 3 +A OE6MUR FZR Y +T OE6MUR FZK B +A OE6MUR FZL G +A OE6MUR FZM H
\ No newline at end of file diff --git a/software/ttx/ttx.asm b/software/ttx/ttx.asm index 79fabdf..ccf025d 100644 --- a/software/ttx/ttx.asm +++ b/software/ttx/ttx.asm @@ -44,7 +44,8 @@ ESPACE EQU DOT CSPACE EQU DASH WSPACE EQU .256 - .147 ;.203 ENABLE_TIME EQU DOT -BCONINT_DEF EQU .4 ; *2 = Beacon Interval in seconds +BCONINT_DEF EQU .5 ; *2 = Beacon Interval in seconds +START_CHAR EQU 'A' - ' ' ;; I/O Pins CWENABLE EQU GP0 @@ -567,7 +568,7 @@ send_beacon call dottime clrf PARITY - movlw 'E' - ' ' + movlw START_CHAR call send_char movlw WSPACE |