diff options
author | Christian Pointner <equinox@mur.at> | 2011-07-24 21:48:30 +0000 |
---|---|---|
committer | Christian Pointner <equinox@mur.at> | 2011-07-24 21:48:30 +0000 |
commit | c29259ec5ac0463faac6b1b92c196dd25e164423 (patch) | |
tree | 1e67f3572aff87643bc9d9c2d028d763bf9db1e8 /software | |
parent | first test for IHU,TTX communication (diff) |
switched to 125kHz for TTX
git-svn-id: https://svn.spreadspace.org/mur.sat@53 7de4ea59-55d0-425e-a1af-a3118ea81d4c
Diffstat (limited to 'software')
-rw-r--r-- | software/ttx/ttx.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/software/ttx/ttx.asm b/software/ttx/ttx.asm index 2957a64..3a9664b 100644 --- a/software/ttx/ttx.asm +++ b/software/ttx/ttx.asm @@ -38,11 +38,11 @@ ;; DEFINES ;; constants -DOT EQU .256 - .21 ;.29 -DASH EQU .256 - .63 ;.87 +DOT EQU .256 - .29 +DASH EQU .256 - .87 ESPACE EQU DOT CSPACE EQU DASH -WSPACE EQU .256 - .147 ;.203 +WSPACE EQU .256 - .203 ENABLE_TIME EQU DOT BCONINT_DEF EQU .5 ; *2 = Beacon Interval in seconds START_CHAR EQU 'A' - ' ' @@ -94,7 +94,7 @@ safe EQU .0 bcf STATUS,RP0 bcf STATUS,RP1 - btfsc PIR1,TMR1IF + btfss INTCON,INTF goto tmr1_int ext_int ;; TODO: read bit from GPIO,SDAT and add to received string @@ -129,13 +129,13 @@ init bsf STATUS,RP0 bcf STATUS,RP1 - movlw b'10000011' + movlw b'11000101' movwf OPTION_REG movlw b'11111100' movwf TRISIO movlw b'00000001' movwf PIE1 - movlw b'00000000' + movlw b'00010000' movwf OSCCON bcf STATUS,RP0 |