should work now, of course it does not!

[my-code/atmel.git] / hdw-tank / motor.asm

diff --git a/hdw-tank/motor.asm b/hdw-tank/motor.asm
index 9386180..5b630ed 100644 (file)
--- a/hdw-tank/motor.asm
+++ b/hdw-tank/motor.asm
@@ -1,67 +1,63 @@
 ; motor functions
 
-;include "../include/m128def.inc"
-
 .equ   MOT_DIR_L       = 0x02
 .equ   MOT_DIR_R       = 0x03
 .equ   MOT_PWR_L       = 0x04
 .equ   MOT_PWR_R       = 0x07
 
-;.def  tmp             = r17
-
 MOTOR_INIT:
 
        ; ports -> output
-       in tmp,DDRB
-       sbr tmp,(1<<MOT_DIR_L)|(1<<MOT_DIR_R)
-       sbr tmp,(1<<MOT_PWR_L)|(1<<MOT_PWR_R)
-       out DDRB,tmp
+       in tmp_motor,DDRB
+       sbr tmp_motor,(1<<MOT_DIR_L)|(1<<MOT_DIR_R)
+       sbr tmp_motor,(1<<MOT_PWR_L)|(1<<MOT_PWR_R)
+       out DDRB,tmp_motor
 
 MOTOR_STOP:
 
        ; output zero
-       in tmp,PORTB
-       cbr tmp,(1<<MOT_DIR_L)|(1<<MOT_DIR_R)
-       cbr tmp,(1<<MOT_PWR_L)|(1<<MOT_PWR_R)
-       out PORTB,tmp
+       in tmp_motor,PORTB
+       cbr tmp_motor,(1<<MOT_DIR_L)|(1<<MOT_DIR_R)
+       cbr tmp_motor,(1<<MOT_PWR_L)|(1<<MOT_PWR_R)
+       out PORTB,tmp_motor
 
        ret
 
 MOTOR_FWD:
 
-       in tmp,PORTB
-       sbr tmp,(1<<MOT_DIR_L)|(1<<MOT_DIR_R)
-       sbr tmp,(1<<MOT_PWR_L)|(1<<MOT_PWR_R)
-       out PORTB,tmp
+       in tmp_motor,PORTB
+       sbr tmp_motor,(1<<MOT_DIR_L)|(1<<MOT_DIR_R)
+       sbr tmp_motor,(1<<MOT_PWR_L)|(1<<MOT_PWR_R)
+       out PORTB,tmp_motor
 
        ret
 
 MOTOR_BWD:
 
-       in tmp,PORTB
-       cbr tmp,(1<<MOT_DIR_L)|(1<<MOT_DIR_R)
-       sbr tmp,(1<<MOT_PWR_L)|(1<<MOT_PWR_R)
-       out PORTB,tmp
+       in tmp_motor,PORTB
+       cbr tmp_motor,(1<<MOT_DIR_L)|(1<<MOT_DIR_R)
+       sbr tmp_motor,(1<<MOT_PWR_L)|(1<<MOT_PWR_R)
+       out PORTB,tmp_motor
 
        ret
 
 MOTOR_RIGHT:
 
-       in tmp,PORTB
-       sbr tmp,(1<<MOT_DIR_L)
-       cbr tmp,(1<<MOT_DIR_R)
-       sbr tmp,(1<<MOT_PWR_L)|(1<<MOT_PWR_R)
-       out PORTB,tmp
+       in tmp_motor,PORTB
+       sbr tmp_motor,(1<<MOT_DIR_L)
+       cbr tmp_motor,(1<<MOT_DIR_R)
+       sbr tmp_motor,(1<<MOT_PWR_L)|(1<<MOT_PWR_R)
+       out PORTB,tmp_motor
 
        ret
 
 MOTOR_LEFT:
 
-       in tmp,PORTB
-       sbr tmp,(1<<MOT_DIR_R)
-       cbr tmp,(1<<MOT_DIR_L)
-       sbr tmp,(1<<MOT_PWR_L)|(1<<MOT_PWR_R)
-       out PORTB,tmp
+       in tmp_motor,PORTB
+       sbr tmp_motor,(1<<MOT_DIR_R)
+       cbr tmp_motor,(1<<MOT_DIR_L)
+       sbr tmp_motor,(1<<MOT_PWR_L)|(1<<MOT_PWR_R)
+       out PORTB,tmp_motor
 
        ret