diff options
| author | Christian Pointner <equinox@mur.at> | 2012-01-27 22:03:09 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@mur.at> | 2012-01-27 22:03:09 +0000 |
| commit | 49fbcffb176bd610c99da8ccec6ed3034b7c36ed (patch) | |
| tree | bf271e5fae4de63c5edbcc4623dd605eaad7e58e /software | |
| parent | note (diff) | |
fixed temp_read_value
git-svn-id: https://svn.spreadspace.org/mur.sat@234 7de4ea59-55d0-425e-a1af-a3118ea81d4c
Diffstat (limited to 'software')
| -rw-r--r-- | software/ihu/ihu.asm | 160 | ||||
| -rw-r--r-- | software/ihu/temp.inc | 1 |
2 files changed, 81 insertions, 80 deletions
diff --git a/software/ihu/ihu.asm b/software/ihu/ihu.asm index da0ef9b..45ad1d4 100644 --- a/software/ihu/ihu.asm +++ b/software/ihu/ihu.asm @@ -55,7 +55,7 @@ BAT_C EQU 3 I2C_SDA EQU 4 I2C_SCL EQU 5 RTC_INT EQU 6 -RTC_RST EQU 7 +RTC_RST EQU 7 ;; PortC MPU_PWRDWN EQU 0 MPU_RESET EQU 1 @@ -372,75 +372,75 @@ main ;; -------------------- ;; ADC Test - call adc_get_solar - call solar_calc_power + ;; call adc_get_solar + ;; call solar_calc_power - movlw .255 - movwf TXREG - movlw .1 - call wait_ms + ;; movlw .255 + ;; movwf TXREG + ;; movlw .1 + ;; call wait_ms - movf ADC_SOLAR_C0,w - movwf TXREG - movlw .1 - call wait_ms + ;; movf ADC_SOLAR_C0,w + ;; movwf TXREG + ;; movlw .1 + ;; call wait_ms - movf ADC_SOLAR_C1,w - movwf TXREG - movlw .1 - call wait_ms + ;; movf ADC_SOLAR_C1,w + ;; movwf TXREG + ;; movlw .1 + ;; call wait_ms - movf ADC_SOLAR_C2,w - movwf TXREG - movlw .1 - call wait_ms + ;; movf ADC_SOLAR_C2,w + ;; movwf TXREG + ;; movlw .1 + ;; call wait_ms - movf ADC_SOLAR_C3,w - movwf TXREG - movlw .1 - call wait_ms + ;; movf ADC_SOLAR_C3,w + ;; movwf TXREG + ;; movlw .1 + ;; call wait_ms - movf ADC_SOLAR_V0,w - movwf TXREG - movlw .1 - call wait_ms + ;; movf ADC_SOLAR_V0,w + ;; movwf TXREG + ;; movlw .1 + ;; call wait_ms - movf ADC_SOLAR_C4,w - movwf TXREG - movlw .1 - call wait_ms + ;; movf ADC_SOLAR_C4,w + ;; movwf TXREG + ;; movlw .1 + ;; call wait_ms - movf ADC_SOLAR_C5,w - movwf TXREG - movlw .1 - call wait_ms + ;; movf ADC_SOLAR_C5,w + ;; movwf TXREG + ;; movlw .1 + ;; call wait_ms - movf ADC_SOLAR_C6,w - movwf TXREG - movlw .1 - call wait_ms + ;; movf ADC_SOLAR_C6,w + ;; movwf TXREG + ;; movlw .1 + ;; call wait_ms - movf ADC_SOLAR_C7,w - movwf TXREG - movlw .1 - call wait_ms + ;; movf ADC_SOLAR_C7,w + ;; movwf TXREG + ;; movlw .1 + ;; call wait_ms - movf ADC_SOLAR_V1,w - movwf TXREG - movlw .1 - call wait_ms + ;; movf ADC_SOLAR_V1,w + ;; movwf TXREG + ;; movlw .1 + ;; call wait_ms - movf SOL_POWERH,w - movwf TXREG - movlw .1 - call wait_ms + ;; movf SOL_POWERH,w + ;; movwf TXREG + ;; movlw .1 + ;; call wait_ms - movf SOL_POWERL,w - movwf TXREG - movlw .8 - call wait_ms + ;; movf SOL_POWERL,w + ;; movwf TXREG + ;; movlw .8 + ;; call wait_ms - goto main + ;; goto main ;; -------------------- ;; DTMF Test program @@ -581,34 +581,34 @@ main ;; -------------------- ;; Temp Test program - ;; movf TMP,f - ;; btfsc STATUS,Z - ;; goto main + movf TMP,f + btfsc STATUS,Z + goto main - ;; call temp_read_value - ;; swapf OWIRE_BYTE,w - ;; andlw b'00001111' - ;; call digit - ;; movwf TXREG - ;; movlw .1 - ;; call wait_ms + call temp_read_value + swapf OWIRE_BYTE,w + andlw b'00001111' + call digit + movwf TXREG + movlw .1 + call wait_ms - ;; movf OWIRE_BYTE,w - ;; andlw b'00001111' - ;; call digit - ;; movwf TXREG - ;; movlw .1 - ;; call wait_ms + movf OWIRE_BYTE,w + andlw b'00001111' + call digit + movwf TXREG + movlw .1 + call wait_ms - ;; movlw '\r' - ;; movwf TXREG - ;; movlw .1 - ;; call wait_ms - ;; movlw '\n' - ;; movwf TXREG + movlw '\r' + movwf TXREG + movlw .1 + call wait_ms + movlw '\n' + movwf TXREG - ;; clrf TMP - ;; goto main + clrf TMP + goto main ;; ------------------------------------- ;; END diff --git a/software/ihu/temp.inc b/software/ihu/temp.inc index bbb3ea5..f0ec683 100644 --- a/software/ihu/temp.inc +++ b/software/ihu/temp.inc @@ -161,6 +161,7 @@ temp_init_error ;; ------------------------------------- temp_read_value + bcf PORTA,OWIRE call owire_presence btfsc OWIRE_BYTE,0 goto temp_read_value_error |