[tuxdroid-svn] r995 - software_suite_v2/middleware/tuxdriver/trunk/src
Status: Beta
Brought to you by:
ks156
From: eFfeM <c2m...@c2...> - 2008-04-20 19:08:46
|
Author: eFfeM Date: 2008-04-20 21:08:48 +0200 (Sun, 20 Apr 2008) New Revision: 995 Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_wings.c Log: curlies Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_wings.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_wings.c 2008-04-20 19:06:08 UTC (rev 994) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_wings.c 2008-04-20 19:08:48 UTC (rev 995) @@ -21,13 +21,13 @@ #include <stdio.h> #include <string.h> +#include "tux_cmd_parser.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_wings.h" -#include "tux_usb.h" /** * @@ -39,15 +39,21 @@ char *old_position = ""; if (!hw_status_table.position2.wings_down) + { new_position = STRING_VALUE_DOWN; + } else + { new_position = STRING_VALUE_UP; + } old_position = (char *)tux_sw_status_get_value(SW_ID_WINGS_POSITION); if (strcmp(new_position, old_position)) + { tux_sw_status_set_value(SW_ID_WINGS_POSITION, (void *)new_position, true); + } } /** @@ -62,8 +68,10 @@ old_count = *(unsigned char *)tux_sw_status_get_value(SW_ID_WINGS_REMAINING_MVM); if (new_count != old_count) + { tux_sw_status_set_value(SW_ID_WINGS_REMAINING_MVM, (void *)&new_count, true); + } } /** @@ -79,7 +87,9 @@ ret = str_to_uint8(speed, &sp); if (!ret) + { return false; + } return tux_movement_perform(MOVE_FLIPPERS, 0, 0.0, sp, fs, true); } @@ -95,11 +105,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_FLIPPERS, cnt, 0.0, 5, fs, false); } @@ -115,19 +127,26 @@ unsigned char frame[TUX_SEND_LENGTH - 1] = {WINGS_WAVE_CMD, 0, 5, 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_FLIPPERS, 0, to, 5, fs, false); + } /* Long movements */ ret = tux_usb_send_to_tux(frame); if (!ret) + { return false; + } switch (fs) { case FINAL_ST_UNDEFINED: |