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

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

Author: eFfeM
Date: 2008-04-20 14:06:32 +0200 (Sun, 20 Apr 2008)
New Revision: 988

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


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c	2008-04-20 12:03:48 UTC (rev 987)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c	2008-04-20 12:06:32 UTC (rev 988)
@@ -39,19 +39,29 @@
     char *new_position = ""; 
     char *old_position = "";
     
-    if (!hw_status_table.ports.portb.bits.mouth_open_switch) {
+    if (!hw_status_table.ports.portb.bits.mouth_open_switch)
+    {
         new_position = STRING_VALUE_OPEN;
     }
-    else if (!hw_status_table.ports.portb.bits.mouth_closed_switch) {
-        new_position = STRING_VALUE_CLOSE;
-    } else
-        new_position = STRING_VALUE_NDEF;
+    else
+    {
+	if (!hw_status_table.ports.portb.bits.mouth_closed_switch)
+	{
+	    new_position = STRING_VALUE_CLOSE;
+	}
+	else
+	{
+	    new_position = STRING_VALUE_NDEF;
+	}
+    }
     
     old_position = (char *)tux_sw_status_get_value(SW_ID_MOUTH_POSITION);
     
     if (strcmp(new_position, old_position))
+    {
         tux_sw_status_set_value(SW_ID_MOUTH_POSITION, 
 			(void *)new_position, true);
+    }
 }
 
 /**
@@ -66,8 +76,10 @@
     old_count = *(unsigned char *)tux_sw_status_get_value(SW_ID_MOUTH_REMAINING_MVM);
     
     if (new_count != old_count)
+    {
         tux_sw_status_set_value(SW_ID_MOUTH_REMAINING_MVM, 
 			(void *)&new_count, true);
+    }
 }
 
 /**
@@ -77,15 +89,17 @@
 tux_mouth_cmd_on(char *counter, char *final_state)
 {
     unsigned char cnt = 0;
-    unsigned char fs = FINAL_ST_UNDEFINED;
+    unsigned char fs;
     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_MOUTH, cnt, 0.0, 5, fs, false); 
 }
 
@@ -101,19 +115,25 @@
     unsigned char frame[TUX_SEND_LENGTH - 1] = {MOUTH_MOVE_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_MOUTH, 0, to, 5, fs, false); 
+    }
 
     /* Long movements */
     ret = tux_usb_send_to_tux(frame);
     if (!ret)
+    {
         return false;
+    }
     
     switch (fs) {
     case FINAL_ST_UNDEFINED: