summaryrefslogtreecommitdiff
path: root/software
diff options
context:
space:
mode:
Diffstat (limited to 'software')
-rw-r--r--software/ihu/ihu.asm4
-rw-r--r--software/ihu/temp.inc20
2 files changed, 12 insertions, 12 deletions
diff --git a/software/ihu/ihu.asm b/software/ihu/ihu.asm
index c934137..f5bef62 100644
--- a/software/ihu/ihu.asm
+++ b/software/ihu/ihu.asm
@@ -71,8 +71,8 @@
#define I2C_SCL PORTD,0
#define I2C_SDA PORTD,1
I2C_PORT EQU PORTD
-I2C_MASK EQU b'00000011'
-I2C_SDA_MASK EQU b'00000010'
+I2C_MASK EQU b'00000011'
+I2C_SDA_MASK EQU b'00000010'
#define CTR_SS PORTD,2
#define BAT_SS PORTD,3
#define MPU_EN PORTD,4
diff --git a/software/ihu/temp.inc b/software/ihu/temp.inc
index 6c9504d..0a5a736 100644
--- a/software/ihu/temp.inc
+++ b/software/ihu/temp.inc
@@ -8,10 +8,10 @@
;; ESC im Labor and realraum.
;;
;; Please visit the project hompage at sat.mur.at for further information.
- ;;
+ ;;
;;
;; Copyright (C) 2011 Christian Pointner <equinox@mur.at>
- ;;
+ ;;
;; This file is part of mur.sat.
;;
;; mur.sat is free software: you can redistribute it and/or modify
@@ -67,21 +67,21 @@ owire_response_loop
decfsz OWIRE_CNT,f
goto owire_response_loop
return
-
+
;; -------------------------------------
owire_write1
bsf STATUS,RP0
bcf OWIRE
nop
bsf OWIRE
- bcf STATUS,RP0
+ bcf STATUS,RP0
movlw .20
movwf OWIRE_CNT
owire_write1_loop
decfsz OWIRE_CNT,f
goto owire_write1_loop
return
-
+
;; -------------------------------------
owire_write0
bsf STATUS,RP0
@@ -116,7 +116,7 @@ owire_readbit
bcf OWIRE
nop
bsf OWIRE
- bcf STATUS,RP0
+ bcf STATUS,RP0
nop
btfss OWIRE
bcf OWIRE_BYTE,7
@@ -134,15 +134,15 @@ owire_read_byte
movlw .8
movwf OWIRE_BIT_CNT
owire_read_loop
- call owire_readbit
+ call owire_readbit
decfsz OWIRE_BIT_CNT,f
- goto owire_read_next
+ goto owire_read_next
return
owire_read_next
rrf OWIRE_BYTE,f
goto owire_read_loop
-
+
;; -------------------------------------
temp_init
call owire_presence
@@ -182,7 +182,7 @@ temp_read_value_loop
btfss OWIRE_BYTE,7
goto temp_read_value_loop
-
+
call owire_presence
btfsc OWIRE_BYTE,0
goto temp_read_value_error