diff options
| author | Christian Pointner <equinox@mur.at> | 2012-05-02 21:27:28 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@mur.at> | 2012-05-02 21:27:28 +0000 |
| commit | 883a2846b31f8eefcecaf1085b1406c361351551 (patch) | |
| tree | 33dd0f44b8682eac8a7f8fa7267ff82037686cfa /software/ttx | |
| parent | updated solar cell stripes (diff) | |
some adaptions for exhibition setup
git-svn-id: https://svn.spreadspace.org/mur.sat@394 7de4ea59-55d0-425e-a1af-a3118ea81d4c
Diffstat (limited to 'software/ttx')
| -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 8c3015e..97fafac 100644 --- a/software/ttx/ttx.asm +++ b/software/ttx/ttx.asm @@ -32,7 +32,6 @@ LIST p=12F635 include "p12f635.inc" - ;;__config _WUREN_OFF & _FCMEN_OFF & _IESO_OFF & _BOD_OFF & _CPD_OFF & _CP_OFF & _MCLRE_ON & _PWRTE_OFF & _WDT_ON & _INTRC_OSC_NOCLKOUT __config _WUREN_OFF & _FCMEN_OFF & _IESO_OFF & _BOD_OFF & _CPD_OFF & _CP_OFF & _MCLRE_ON & _PWRTE_OFF & _WDT_OFF & _INTRC_OSC_NOCLKOUT ;; ------------------------------------- @@ -43,7 +42,7 @@ DOT_DEF EQU .256 - .21 ; .29 DASH_DEF EQU .256 - .63 ; .87 WSPACE_DEF EQU .256 - .147 ; .203 TUNE_DEF EQU DOT_DEF -BCNINTL_DEF EQU .256 - .120 +BCNINTL_DEF EQU .256 - .20 BCNINTH_DEF EQU .255 START_CHAR EQU 'N' ACK_CHAR EQU 'A' @@ -128,6 +127,7 @@ ext_int movwf OSCCON ;; we are on high OSC now bcf STATUS,RP0 + bsf WDTCON,SWDTEN clrf RX_CSUM movf FSR,w movwf RX_FSR_TMP @@ -163,6 +163,7 @@ ext_int_wait_ack_high goto ext_int_wait_ack_high btfss GPIO,SDAT bsf STATE,rxcomplete + bcf WDTCON,SWDTEN bsf STATUS,RP0 movlw OSC_LOW movwf OSCCON @@ -386,8 +387,8 @@ init bcf STATUS,RP0 ;; bank 0 - ;; movlw b'00010110' ; TODO: watchdog?? - ;; movwf WDTCON + movlw b'00010010' + movwf WDTCON movlw b'01010000' movwf INTCON @@ -493,7 +494,6 @@ dottime dot_inner btfss INTCON,T0IF goto dot_inner - clrwdt return ;; ------------------------------------- @@ -819,8 +819,8 @@ beaconint_elapsed ;; this gets called whenever a message was received from ihu msg_received + call send_ack bcf STATE,rxcomplete - ;; call send_ack clrf RX_DLEN powerdown |