[tuxdroid-svn] r1098 - software_suite_v2/middleware/tuxdriver/trunk/src

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

Author: eFfeM
Date: 2008-05-04 21:01:13 +0200 (Sun, 04 May 2008)
New Revision: 1098

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.c
Log:
changed enum value to avoid conflicts with parser enum values


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.c	2008-05-04 10:39:10 UTC (rev 1097)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.c	2008-05-04 19:01:13 UTC (rev 1098)
@@ -31,13 +31,13 @@
 
 typedef enum
 {
-    ON,
-    OFF,
-    CHANGING,
+    LED_ON,
+    LED_OFF,
+    LED_CHANGING,
 } led_state_t;
 
-static led_state_t left_led_state = OFF;
-static led_state_t right_led_state = OFF;
+static led_state_t left_led_state = LED_OFF;
+static led_state_t right_led_state = LED_OFF;
 
 static bool led_set(leds_t leds, int intensity, led_effect_t *effect);
 static bool led_pulse(leds_t leds, int min_intensity, int max_intensity, 
@@ -74,29 +74,29 @@
     /* Get on / off state */
     if (hw_status_table.led.left_led_intensity < 50)
     {
-        left_led_state = OFF;
+        left_led_state = LED_OFF;
     }
     else
     {
-        left_led_state = ON;
+        left_led_state = LED_ON;
     }
     
     /* Get changing state */
     if (hw_status_table.led.effect_status.bits.left_led_fading ||
         hw_status_table.led.effect_status.bits.left_led_pulsing)
     {
-        left_led_state = CHANGING;
+        left_led_state = LED_CHANGING;
     }
     
     /* State to string */
     switch (left_led_state) {
-    case ON:
+    case LED_ON:
         new_left_state = STRING_VALUE_ON;
         break;
-    case OFF:
+    case LED_OFF:
         new_left_state = STRING_VALUE_OFF;
         break;
-    case CHANGING:
+    case LED_CHANGING:
         new_left_state = STRING_VALUE_CHANGING;
         break;
     }
@@ -123,29 +123,29 @@
     /* Get on / off state */
     if (hw_status_table.led.right_led_intensity < 50)
     {
-        right_led_state = OFF;
+        right_led_state = LED_OFF;
     }
     else
     {
-        right_led_state = ON;
+        right_led_state = LED_ON;
     }
     
     /* Get changing state */  
     if (hw_status_table.led.effect_status.bits.right_led_fading ||
         hw_status_table.led.effect_status.bits.right_led_pulsing)
     {
-        right_led_state = CHANGING;
+        right_led_state = LED_CHANGING;
     }
 
     /* State to string */
     switch (right_led_state) {
-    case ON:
+    case LED_ON:
         new_right_state = STRING_VALUE_ON;
         break;
-    case OFF:
+    case LED_OFF:
         new_right_state = STRING_VALUE_OFF;
         break;
-    case CHANGING:
+    case LED_CHANGING:
         new_right_state = STRING_VALUE_CHANGING;
         break;
     }