[tuxdroid-svn] r374 - firmware/tuxcore/trunk

[jaguarondi <c2m...@c2...>]

Author: jaguarondi
Date: 2007-06-14 15:16:01 +0200 (Thu, 14 Jun 2007)
New Revision: 374

Modified:
   firmware/tuxcore/trunk/global.h
   firmware/tuxcore/trunk/motors.c
Log:
* Just updated a few comments in global.h & motors.c.



Modified: firmware/tuxcore/trunk/global.h
===================================================================
--- firmware/tuxcore/trunk/global.h	2007-06-13 19:55:44 UTC (rev 373)
+++ firmware/tuxcore/trunk/global.h	2007-06-14 13:16:01 UTC (rev 374)
@@ -146,10 +146,10 @@
 #define MOT_IMOUTH_MK       _BV(PD0)    /* inverted mouth motor (backward) */
 #define MOT_IMOUTH_PT       PORTD
 #define MOT_IMOUTH_DDR      DDRD
-#define MOT_IEYES_MK        _BV(PD1)    /* eyes motor (forward) */
+#define MOT_IEYES_MK        _BV(PD1)    /* inverted eyes motor (backward) */
 #define MOT_IEYES_PT        PORTD
 #define MOT_IEYES_DDR       DDRD
-#define MOT_EYES_MK         _BV(PD0)    /* inverted eyes motor (backward) */
+#define MOT_EYES_MK         _BV(PD0)    /* eyes motor (forward) */
 #define MOT_EYES_PT         PORTD
 #define MOT_EYES_DDR        DDRD
 #define MOT_SPIN_R_MK       _BV(PB2)    /* spin motor, turn on the right */

Modified: firmware/tuxcore/trunk/motors.c
===================================================================
--- firmware/tuxcore/trunk/motors.c	2007-06-13 19:55:44 UTC (rev 373)
+++ firmware/tuxcore/trunk/motors.c	2007-06-14 13:16:01 UTC (rev 374)
@@ -129,7 +129,7 @@
 
 /**
    \brief Mouth position interrupt
-   \ingroup moth
+   \ingroup mouth
 
    This interrupt stops the mouth when the desired number of movements have been
    executed. In order to stop the mouth quickly and block the motor, we need to
@@ -148,11 +148,11 @@
 {
     if (~PSW_MOUTH_PIN & PSW_MOUTH_MK)  /* we only count when the switch is pushed, not released */
     {
-        if (~PSW_MOUTH_PIN & PSW_MOUTH_O_MK)    /* we only count when the switch is pushed, not released */
-            if (mouth_pos == CLOSE)
+        if (~PSW_MOUTH_PIN & PSW_MOUTH_O_MK)
+            if (mouth_pos == CLOSE) /* XXX can we delete this line? */
                 mouth_pos = OPEN;
-        if (~PSW_MOUTH_PIN & PSW_MOUTH_C_MK)    /* we only count when the switch is pushed, not released */
-            if (mouth_pos == OPEN)
+        if (~PSW_MOUTH_PIN & PSW_MOUTH_C_MK)
+            if (mouth_pos == OPEN) /* XXX can we delete this line? */
                 mouth_pos = CLOSE;
         if (mouthPosCnt)
         {