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

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

Author: eFfeM
Date: 2008-04-20 20:59:46 +0200 (Sun, 20 Apr 2008)
New Revision: 992

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c
Log:
curlies


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c	2008-04-20 18:57:15 UTC (rev 991)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c	2008-04-20 18:59:46 UTC (rev 992)
@@ -21,12 +21,12 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "tux_cmd_parser.h"
 #include "tux_hw_status.h"
 #include "tux_hw_cmd.h"
-#include "tux_sw_status.h"
-#include "tux_cmd_parser.h"
 #include "tux_movements.h"
 #include "tux_spinning.h"
+#include "tux_sw_status.h"
 #include "tux_usb.h"
 
 /**
@@ -42,17 +42,29 @@
         (!hw_status_table.ports.portb.bits.spin_motor_backward))
     {
         new_direction = STRING_VALUE_NONE;
-    } else if (hw_status_table.ports.portb.bits.spin_motor_forward) {
-        new_direction = STRING_VALUE_LEFT;
-    } else if (hw_status_table.ports.portb.bits.spin_motor_backward) {
-        new_direction = STRING_VALUE_RIGHT;
-    }    
+    }
+    else
+    {
+	if (hw_status_table.ports.portb.bits.spin_motor_forward)
+	{
+	    new_direction = STRING_VALUE_LEFT;
+	}
+	else
+	{
+	    if (hw_status_table.ports.portb.bits.spin_motor_backward)
+	    {
+		new_direction = STRING_VALUE_RIGHT;
+	    }    
+	}    
+    }
     
     old_direction = (char *)tux_sw_status_get_value(SW_ID_SPINNING_DIRECTION);
     
     if (strcmp(new_direction, old_direction))
+    {
         tux_sw_status_set_value(SW_ID_SPINNING_DIRECTION, 
             (void *)new_direction, true);
+    }
 }
 
 /**
@@ -67,8 +79,10 @@
     old_count = *(unsigned char *)tux_sw_status_get_value(SW_ID_SPINNING_REMAINING_MVM);
     
     if (new_count != old_count)
+    {
         tux_sw_status_set_value(SW_ID_SPINNING_REMAINING_MVM, 
             (void *)&new_count, true);
+    }
 }
 
 /**
@@ -84,7 +98,9 @@
     ret = str_to_uint8(speed, &sp);
     
     if (!ret)
+    {
         return false;
+    }
     
     return tux_movement_perform(MOVE_SPIN_R, 0, 0.0, sp, fs, true); 
 }
@@ -102,7 +118,9 @@
     ret = str_to_uint8(counter, &cnt);
     
     if (!ret)
+    {
         return false;
+    }
     
     return tux_movement_perform(MOVE_SPIN_L, cnt, 0.0, 5, fs, false); 
 }
@@ -120,7 +138,9 @@
     ret = str_to_uint8(counter, &cnt);
     
     if (!ret)
+    {
         return false;
+    }
     
     return tux_movement_perform(MOVE_SPIN_R, cnt, 0.0, 5, fs, false); 
 }
@@ -139,16 +159,22 @@
     ret = str_to_float(timeout, &to);
     
     if (!ret)
+    {
         return false;
+    }
     
     /* Short movements */
     if (to < 0.3)
+    {
         return tux_movement_perform(MOVE_SPIN_L, 0, to, 5, fs, false); 
+    }
 
     /* Long movements */
     ret = tux_usb_send_to_tux(frame);
     if (!ret)
+    {
         return false;
+    }
     
     ret = tux_cmd_parser_insert_delay_command(to, 
         "TUX_CMD:SPINNING:OFF", true);
@@ -170,16 +196,22 @@
     ret = str_to_float(timeout, &to);
     
     if (!ret)
+    {
         return false;
+    }
     
     /* Short movements */
     if (to < 0.3)
+    {
         return tux_movement_perform(MOVE_SPIN_R, 0, to, 5, fs, false); 
+    }
 
     /* Long movements */
     ret = tux_usb_send_to_tux(frame);
     if (!ret)
+    {
         return false;
+    }
     
     ret = tux_cmd_parser_insert_delay_command(to, 
         "TUX_CMD:SPINNING:OFF", true);