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

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

Author: eFfeM
Date: 2008-04-21 21:11:46 +0200 (Mon, 21 Apr 2008)
New Revision: 1000

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.h
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_wings.c
Log:
factored out cmd_on function (moved common code to tux_movements.c)


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c	2008-04-21 08:53:27 UTC (rev 999)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c	2008-04-21 19:11:46 UTC (rev 1000)
@@ -87,19 +87,7 @@
 LIBLOCAL bool
 tux_eyes_cmd_on(char *counter, char *final_state)
 {
-    unsigned char cnt = 0;
-    unsigned char fs = FINAL_ST_UNDEFINED;
-    bool ret;
-    
-    ret = str_to_uint8(counter, &cnt);
-    if (!ret)
-    {
-        return false;
-    }
-    
-    fs = tux_movement_conststr_to_val(final_state);
-
-    return tux_movement_perform(MOVE_EYES, cnt, 0.0, 5, fs, false); 
+    return tux_movement_cmd_on(MOVE_EYES, counter, final_state);
 }
 
 /**

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c	2008-04-21 08:53:27 UTC (rev 999)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c	2008-04-21 19:11:46 UTC (rev 1000)
@@ -87,19 +87,7 @@
 LIBLOCAL bool
 tux_mouth_cmd_on(char *counter, char *final_state)
 {
-    unsigned char cnt = 0;
-    unsigned char fs;
-    bool ret;
-    
-    ret = str_to_uint8(counter, &cnt);
-    
-    if (!ret)
-    {
-        return false;
-    }
-
-    fs = tux_movement_conststr_to_val(final_state);
-    return tux_movement_perform(MOVE_MOUTH, cnt, 0.0, 5, fs, false); 
+    return tux_movement_cmd_on(MOVE_MOUTH, counter, final_state);
 }
 
 /**

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c	2008-04-21 08:53:27 UTC (rev 999)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c	2008-04-21 19:11:46 UTC (rev 1000)
@@ -292,6 +292,24 @@
     tux_usb_send_to_tux(frame);
 }
 
+LIBLOCAL bool
+tux_movement_cmd_on(move_body_part_t movement, char *counter, char *final_state)
+{
+    unsigned char cnt;
+    unsigned char fs;
+    bool ret;
+    
+    ret = str_to_uint8(counter, &cnt);
+    if (!ret)
+    {
+        return false;
+    }
+    
+    fs = tux_movement_conststr_to_val(final_state);
+
+    return tux_movement_perform(movement, cnt, 0.0, 5, fs, false); 
+}
+
 /**
  * \brief Control et configure the movements.
  * \param motor Which motor should be configured

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.h	2008-04-21 08:53:27 UTC (rev 999)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.h	2008-04-21 19:11:46 UTC (rev 1000)
@@ -54,6 +54,8 @@
     FINAL_ST_STOP = 3,
 } move_final_state_t;
 
+extern bool tux_movement_cmd_on(move_body_part_t movement,
+    char *counter, char *final_state);
 extern unsigned char tux_movement_conststr_to_val(char *conststr);
 extern bool tux_movement_perform(move_body_part_t movement, 
     unsigned char counter, float timeout, move_speed_t speed,

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_wings.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_wings.c	2008-04-21 08:53:27 UTC (rev 999)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_wings.c	2008-04-21 19:11:46 UTC (rev 1000)
@@ -99,19 +99,7 @@
 LIBLOCAL bool
 tux_wings_cmd_on(char *counter, char *final_state)
 {
-    unsigned char cnt = 0;
-    unsigned char fs = FINAL_ST_UNDEFINED;
-    bool ret;
-    
-    ret = str_to_uint8(counter, &cnt);
-    
-    if (!ret)
-    {
-        return false;
-    }
-    
-    fs = tux_movement_conststr_to_val(final_state);
-    return tux_movement_perform(MOVE_FLIPPERS, cnt, 0.0, 5, fs, false); 
+    return tux_movement_cmd_on(MOVE_FLIPPERS, counter, final_state);
 }
 
 /**