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

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

Author: eFfeM
Date: 2008-04-20 12:22:21 +0200 (Sun, 20 Apr 2008)
New Revision: 975

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.h
Log:
removed unneeded includes, layout


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c	2008-04-20 10:15:17 UTC (rev 974)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c	2008-04-20 10:22:21 UTC (rev 975)
@@ -18,17 +18,16 @@
  * 02111-1307, USA.
  */
 
-#include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <stdlib.h>
+
+#include "tux_cmd_parser.h"
+#include "tux_eyes.h"
 #include "tux_hw_status.h"
 #include "tux_hw_cmd.h"
+#include "tux_movements.h"
 #include "tux_sw_status.h"
-#include "tux_cmd_parser.h"
-#include "tux_movements.h"
 #include "tux_usb.h"
-#include "tux_eyes.h"
 
 /**
  *  Update the status of the position of the eyes.
@@ -37,22 +36,31 @@
 tux_eyes_update_position(void)
 {
     char *new_position = ""; 
-    char *old_position = "";
+    char *old_position;
     
     if (!hw_status_table.ports.portd.bits.eyes_open_switch)
     {
         new_position = STRING_VALUE_OPEN;
-    } else if (!hw_status_table.ports.portd.bits.eyes_closed_switch)
+    }
+    else
     {
-        new_position = STRING_VALUE_CLOSE;
-    } else
-        new_position = STRING_VALUE_NDEF;
+	if (!hw_status_table.ports.portd.bits.eyes_closed_switch)
+	{
+	    new_position = STRING_VALUE_CLOSE;
+	}
+	else
+	{
+	    new_position = STRING_VALUE_NDEF;
+	}
+    }
     
     old_position = (char *)tux_sw_status_get_value(SW_ID_EYES_POSITION);
     
     if (strcmp(new_position, old_position))
+    {
         tux_sw_status_set_value(SW_ID_EYES_POSITION, (void *)new_position, 
             true);
+    }
 }
 
 /**
@@ -67,8 +75,10 @@
     old_count = *(unsigned char *)tux_sw_status_get_value(SW_ID_EYES_REMAINING_MVM);
     
     if (new_count != old_count)
+    {
         tux_sw_status_set_value(SW_ID_EYES_REMAINING_MVM, 
 			(void *)&new_count, true);
+    }
 }
 
 /**
@@ -82,11 +92,13 @@
     bool ret;
     
     ret = str_to_uint8(counter, &cnt);
-    fs = tux_movement_conststr_to_val(final_state);
-    
     if (!ret)
+    {
         return false;
+    }
     
+    fs = tux_movement_conststr_to_val(final_state);
+
     return tux_movement_perform(MOVE_EYES, cnt, 0.0, 5, fs, false); 
 }
 
@@ -102,19 +114,25 @@
     unsigned char frame[TUX_SEND_LENGTH - 1] = {EYES_BLINK_CMD, 0, 0, 0};
     
     ret = str_to_float(timeout, &to);
-    fs = tux_movement_conststr_to_val(final_state);
-    
     if (!ret)
+    {
         return false;
+    }
     
+    fs = tux_movement_conststr_to_val(final_state);
+    
     /* Short movements */
     if (to < 0.3)
+    {
         return tux_movement_perform(MOVE_EYES, 0, to, 5, fs, false); 
+    }
 
     /* Long movements */
     ret = tux_usb_send_to_tux(frame);
     if (!ret)
+    {
         return false;
+    }
     
     switch (fs) {
     case FINAL_ST_UNDEFINED:

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.h	2008-04-20 10:15:17 UTC (rev 974)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.h	2008-04-20 10:22:21 UTC (rev 975)
@@ -21,8 +21,6 @@
 #ifndef _TUX_EYES_H_
 #define _TUX_EYES_H_
 
-#include "tux_misc.h"
-
 #define TUX_EYES_POSITION_NDEF          0 
 #define TUX_EYES_POSITION_OPEN          1
 #define TUX_EYES_POSITION_CLOSE         2