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

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

Author: jaguarondi
Date: 2007-09-13 13:32:27 +0200 (Thu, 13 Sep 2007)
New Revision: 524

Modified:
   firmware/tuxcore/trunk/led.c
   firmware/tuxcore/trunk/led.h
   firmware/tuxcore/trunk/main.c
   firmware/tuxcore/trunk/parser.c
   firmware/tuxcore/trunk/standalone.c
Log:
* Cleanup.


Modified: firmware/tuxcore/trunk/led.c
===================================================================
--- firmware/tuxcore/trunk/led.c	2007-09-13 09:34:02 UTC (rev 523)
+++ firmware/tuxcore/trunk/led.c	2007-09-13 11:32:27 UTC (rev 524)
@@ -52,7 +52,7 @@
     if (!cnt)
         return;
     cnt--;                      /* the first toggle occurs here */
-    toggleLeds();
+    toggle_leds();
     if (!cnt)                   /* if one toggle, nothing more to do */
         return;
     led_delay = pulse_width;
@@ -84,7 +84,7 @@
         led_delay--;
         if (!led_delay)
         {
-            toggleLeds();
+            toggle_leds();
             if (--led_blinking_cnt)
                 led_delay = led_blinking_pw;
         }

Modified: firmware/tuxcore/trunk/led.h
===================================================================
--- firmware/tuxcore/trunk/led.h	2007-09-13 09:34:02 UTC (rev 523)
+++ firmware/tuxcore/trunk/led.h	2007-09-13 11:32:27 UTC (rev 524)
@@ -39,61 +39,61 @@
    \brief Turn both leds on.
    \ingroup led
  */
-#define turnLedsOn() (leds_buffer |= LED_MK)
+#define turn_leds_on() (leds_buffer |= LED_MK)
 
 /**
    \brief Turn both leds off.
    \ingroup led
  */
-#define turnLedsOff() (leds_buffer &= ~LED_MK)
+#define turn_leds_off() (leds_buffer &= ~LED_MK)
 
 /**
    \brief Turn left led on.
    \ingroup led
  */
-#define turnLeftLedOn() (leds_buffer |= LED_L_MK)
+#define turn_left_led_on() (leds_buffer |= LED_L_MK)
 
 /**
    \brief Turn right led on.
    \ingroup led
  */
-#define turnRightLedOn() (leds_buffer |= LED_R_MK)
+#define turn_right_led_on() (leds_buffer |= LED_R_MK)
 
 /**
    \brief Turn left led off.
    \ingroup led
  */
-#define turnLeftLedOff() (leds_buffer &= ~LED_L_MK)
+#define turn_left_led_off() (leds_buffer &= ~LED_L_MK)
 
 /**
    \brief Turn right led off.
    \ingroup led
  */
-#define turnRightLedOff() (leds_buffer &= ~LED_R_MK)
+#define turn_right_led_off() (leds_buffer &= ~LED_R_MK)
 
 /**
    \brief Read the value of the leds.
    \ingroup led
  */
-#define readLeds() (leds_buffer)
+#define read_leds() (leds_buffer)
 
 /**
    \brief Toggle leds.
    \ingroup led
  */
-#define toggleLeds() (leds_buffer ^= LED_MK)
+#define toggle_leds() (leds_buffer ^= LED_MK)
 
 /**
    \brief Toggle left led.
    \ingroup led
  */
-#define toggleLeftLed() (leds_buffer ^= LED_L_MK)
+#define toggle_left_led() (leds_buffer ^= LED_L_MK)
 
 /**
-   \brief toggle right led.
+   \brief Toggle right led.
    \ingroup led
  */
-#define toggleRightLed() (leds_buffer ^= LED_R_MK)
+#define toggle_right_led() (leds_buffer ^= LED_R_MK)
 
 /**
    \brief Turn both leds off directly on the I/O port.

Modified: firmware/tuxcore/trunk/main.c
===================================================================
--- firmware/tuxcore/trunk/main.c	2007-09-13 09:34:02 UTC (rev 523)
+++ firmware/tuxcore/trunk/main.c	2007-09-13 11:32:27 UTC (rev 524)
@@ -264,7 +264,7 @@
     PCICR = 0;
     EIMSK = 0;
     ADCSRA = 0;
-    turnLedsOff();
+    turn_leds_off();
     turnIrOff();
 }
 

Modified: firmware/tuxcore/trunk/parser.c
===================================================================
--- firmware/tuxcore/trunk/parser.c	2007-09-13 09:34:02 UTC (rev 523)
+++ firmware/tuxcore/trunk/parser.c	2007-09-13 11:32:27 UTC (rev 524)
@@ -136,27 +136,27 @@
     /* Leds */
     else if (command[0] == LED_ON_CMD)
     {
-        turnLedsOn();
+        turn_leds_on();
     }
     else if (command[0] == LED_OFF_CMD)
     {
-        turnLedsOff();
+        turn_leds_off();
     }
     else if (command[0] == LED_L_ON_CMD)
     {
-        turnLeftLedOn();
+        turn_left_led_on();
     }
     else if (command[0] == LED_L_OFF_CMD)
     {
-        turnLeftLedOff();
+        turn_left_led_on();
     }
     else if (command[0] == LED_R_ON_CMD)
     {
-        turnRightLedOn();
+        turn_right_led_on();
     }
     else if (command[0] == LED_R_OFF_CMD)
     {
-        turnRightLedOff();
+        turn_right_led_off();
     }
     else if (command[0] == LED_BLINK_CMD)
     {

Modified: firmware/tuxcore/trunk/standalone.c
===================================================================
--- firmware/tuxcore/trunk/standalone.c	2007-09-13 09:34:02 UTC (rev 523)
+++ firmware/tuxcore/trunk/standalone.c	2007-09-13 11:32:27 UTC (rev 524)
@@ -213,13 +213,13 @@
         if (gStatus.
             sw & (GSTATUS_LEFTWINGBTN_MK | GSTATUS_RIGHTWINGBTN_MK |
                   GSTATUS_HEADBTN_MK))
-            turnLeftLedOn();
+            turn_left_led_on();
         else
-            turnLeftLedOff();
+            turn_left_led_on();
         if ((gStatus.sw & GSTATUS_POWERPLUGSW_MK))
-            turnRightLedOn();
+            turn_right_led_on();
         else
-            turnRightLedOff();
+            turn_right_led_off();
     }
 
     /* IR signal processing */
@@ -297,10 +297,10 @@
                 tux_config.ir_feedback = !tux_config.ir_feedback;
                 break;
             case K_CHANNELPLUS:
-                toggleRightLed();
+                toggle_right_led();
                 break;
             case K_VOLUMEPLUS:
-                toggleLeftLed();
+                toggle_left_led();
                 break;
             case K_FASTREWIND:
                 if (spin_PWM)