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

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

Author: eFfeM
Date: 2008-04-19 17:23:15 +0200 (Sat, 19 Apr 2008)
New Revision: 969

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_audio.c
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c
Log:
added curlies, reordered includes


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_audio.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_audio.c	2008-04-19 15:18:11 UTC (rev 968)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_audio.c	2008-04-19 15:23:15 UTC (rev 969)
@@ -18,12 +18,12 @@
  * 02111-1307, USA.
  */
 
+#include <errno.h>
 #include <stdio.h>
-#include <errno.h>
+#include <stdlib.h>
 #include <string.h>
-#include <stdlib.h>
+#include "tux_audio.h"
 #include "tux_hw_cmd.h"
-#include "tux_audio.h"
 #include "tux_usb.h"
 
 /**

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c	2008-04-19 15:18:11 UTC (rev 968)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c	2008-04-19 15:23:15 UTC (rev 969)
@@ -18,21 +18,21 @@
  * 02111-1307, USA.
  */
 
+#include <errno.h>
+#include <math.h>
 #include <stdio.h>
-#include <errno.h>
+#include <stdlib.h>
 #include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include "tux_battery.h"
 #include "tux_hw_status.h"
 #include "tux_sw_status.h"
-#include "tux_battery.h"
 
 typedef enum
 {
     FULL,
     HIGH,
     LOW,
-    EMPTY,
+    EMPTY
 } battery_state_t;
 
 static battery_state_t battery_state = EMPTY;
@@ -56,37 +56,58 @@
     
     old_level = *(float *)tux_sw_status_get_value(SW_ID_BATTERY_LEVEL);
     
-    if (fabs(new_level - last_level_for_event) > 0.1) {
+    if (fabs(new_level - last_level_for_event) > 0.1)
+    {
         last_level_for_event = new_level;
         if (!hw_status_table.battery.motors_state)
+	{
             tux_sw_status_set_value(SW_ID_BATTERY_LEVEL, 
                 (void *)&new_level, true);
+	}
             
-        if (new_level >= TUX_BATTERY_FULL_VALUE) {
+        if (new_level >= TUX_BATTERY_FULL_VALUE)
+	{
             new_state_str = STRING_VALUE_FULL;
             battery_state = FULL;
-        } else if ((new_level < TUX_BATTERY_FULL_VALUE) &&
-            (new_level >= TUX_BATTERY_HIGH_VALUE))
-        {
-            new_state_str = STRING_VALUE_HIGH;
-            battery_state = HIGH;
-        } else if ((new_level < TUX_BATTERY_HIGH_VALUE) &&
-            (new_level >= TUX_BATTERY_LOW_VALUE))
-        {
-            new_state_str = STRING_VALUE_LOW;
-            battery_state = LOW;
-        } else {
-            new_state_str = STRING_VALUE_EMPTY;
-            battery_state = EMPTY;
         }
+	else
+	{
+	    if ((new_level < TUX_BATTERY_FULL_VALUE) &&
+		(new_level >= TUX_BATTERY_HIGH_VALUE))
+	    {
+		new_state_str = STRING_VALUE_HIGH;
+		battery_state = HIGH;
+	    }
+	    else
+	    {
+		if ((new_level < TUX_BATTERY_HIGH_VALUE) &&
+		    (new_level >= TUX_BATTERY_LOW_VALUE))
+		{
+		    new_state_str = STRING_VALUE_LOW;
+		    battery_state = LOW;
+		}
+		else
+		{
+		    new_state_str = STRING_VALUE_EMPTY;
+		    battery_state = EMPTY;
+		}
+	    }
+        }
         
         old_state_str = (char *)tux_sw_status_get_value(SW_ID_BATTERY_STATE);
         
         if (strcmp(new_state_str, old_state_str))
+	{
             tux_sw_status_set_value(SW_ID_BATTERY_STATE, (void *)new_state_str,
                 true);
-    } else
+	}
+    }
+    else
+    {
         if (old_level != new_level)
+	{
             tux_sw_status_set_value(SW_ID_BATTERY_LEVEL, (void *)&new_level, 
                 false);
+	}
+    }
 }