[tuxdroid-svn] r986 - software_suite_v2/middleware/tuxdriver/trunk/src
Status: Beta
Brought to you by:
ks156
From: eFfeM <c2m...@c2...> - 2008-04-20 12:01:02
|
Author: eFfeM Date: 2008-04-20 14:01:05 +0200 (Sun, 20 Apr 2008) New Revision: 986 Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.h software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.c software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.h software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.c software_suite_v2/middleware/tuxdriver/trunk/src/tux_light.c software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.c software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.h 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_sound_flash.h software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.h software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.h software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.h software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.h software_suite_v2/middleware/tuxdriver/trunk/src/tux_wings.h Log: more include file changes Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c 2008-04-20 12:01:05 UTC (rev 986) @@ -23,6 +23,7 @@ #include <string.h> #include "tux_battery.h" +#include "tux_misc.h" #include "tux_hw_status.h" #include "tux_sw_status.h" Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c 2008-04-20 12:01:05 UTC (rev 986) @@ -32,10 +32,10 @@ #include "tux_error.h" #include "tux_eyes.h" #include "tux_leds.h" -#include "tux_misc.h" #include "tux_mouth.h" #include "tux_sound_flash.h" #include "tux_spinning.h" +#include "tux_sw_status.h" #include "tux_usb.h" #include "tux_user_inputs.h" #include "tux_wings.h" Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.h =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.h 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.h 2008-04-20 12:01:05 UTC (rev 986) @@ -21,8 +21,8 @@ #ifndef _TUX_CMD_PARSER_H_ #define _TUX_CMD_PARSER_H_ -#include "tux_sw_status.h" -#include "tux_misc.h" +#include <stdbool.h> + #include "tux_error.h" #define TOKENSIZE 1024 Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c 2008-04-20 12:01:05 UTC (rev 986) @@ -30,10 +30,10 @@ #include "tux_id.h" #include "tux_leds.h" #include "tux_light.h" -#include "tux_misc.h" #include "tux_mouth.h" #include "tux_pong.h" #include "tux_sound_flash.h" +#include "tux_sw_status.h" #include "tux_user_inputs.h" #include "tux_spinning.h" #include "tux_usb.h" Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c 2008-04-20 12:01:05 UTC (rev 986) @@ -22,8 +22,9 @@ #include "tux_cmd_parser.h" #include "tux_eyes.h" +#include "tux_hw_cmd.h" #include "tux_hw_status.h" -#include "tux_hw_cmd.h" +#include "tux_misc.h" #include "tux_movements.h" #include "tux_sw_status.h" #include "tux_usb.h" Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.c 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.c 2008-04-20 12:01:05 UTC (rev 986) @@ -24,6 +24,7 @@ #include "tux_descriptor.h" #include "tux_firmware.h" #include "tux_hw_status.h" +#include "tux_misc.h" #include "tux_sw_status.h" #include "tux_usb.h" Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.h =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.h 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.h 2008-04-20 12:01:05 UTC (rev 986) @@ -21,7 +21,7 @@ #ifndef _TUX_FIRMWARE_H_ #define _TUX_FIRMWARE_H_ -#include "tux_misc.h" +#include <stdbool.h> #define LOWEST_CPU_NUM 0 #define HIGHEST_CPU_NUM 4 Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.c 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.c 2008-04-20 12:01:05 UTC (rev 986) @@ -24,6 +24,7 @@ #include "tux_descriptor.h" #include "tux_hw_status.h" #include "tux_hw_cmd.h" +#include "tux_misc.h" #include "tux_usb.h" LIBLOCAL id_descriptor_t id_desc; Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_light.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_light.c 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_light.c 2008-04-20 12:01:05 UTC (rev 986) @@ -24,6 +24,7 @@ #include "tux_hw_status.h" #include "tux_light.h" +#include "tux_misc.h" #include "tux_sw_status.h" static float last_level_for_event = 0.0; Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.c 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.c 2008-04-20 12:01:05 UTC (rev 986) @@ -22,6 +22,7 @@ #include <string.h> #include "tux_misc.h" + #ifdef WIN32 # include <time.h> # include <windows.h> Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c 2008-04-20 12:01:05 UTC (rev 986) @@ -21,12 +21,13 @@ #include <stdio.h> #include <string.h> -#include "tux_movements.h" +#include "tux_cmd_parser.h" #include "tux_hw_status.h" #include "tux_hw_cmd.h" +#include "tux_misc.h" +#include "tux_mouth.h" +#include "tux_movements.h" #include "tux_sw_status.h" -#include "tux_cmd_parser.h" -#include "tux_mouth.h" #include "tux_usb.h" /** Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.h =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.h 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.h 2008-04-20 12:01:05 UTC (rev 986) @@ -21,7 +21,7 @@ #ifndef _TUX_MOUTH_H_ #define _TUX_MOUTH_H_ -#include "tux_misc.h" +#include <stdbool.h> #define TUX_MOUTH_POSITION_NDEF 0 #define TUX_MOUTH_POSITION_OPEN 1 Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c 2008-04-20 12:01:05 UTC (rev 986) @@ -22,11 +22,11 @@ #include <stdio.h> #include <string.h> +#include "tux_hw_cmd.h" #include "tux_hw_status.h" +#include "tux_movements.h" #include "tux_sw_status.h" #include "tux_usb.h" -#include "tux_movements.h" -#include "tux_hw_cmd.h" /* * Prototypes Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.h =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.h 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.h 2008-04-20 12:01:05 UTC (rev 986) @@ -21,7 +21,7 @@ #ifndef _TUX_MOVEMENTS_H_ #define _TUX_MOVEMENTS_H_ -#include "tux_misc.h" +#include <stdbool.h> #define EYES_MOVE_TIME 0.2 #define MOUTH_MOVE_TIME 0.25 Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.h =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.h 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.h 2008-04-20 12:01:05 UTC (rev 986) @@ -21,7 +21,8 @@ #ifndef _TUX_SOUND_FLASH_H_ #define _TUX_SOUND_FLASH_H_ -#include "tux_misc.h" +#include <stdbool.h> + #include "tux_error.h" typedef struct Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.h =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.h 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.h 2008-04-20 12:01:05 UTC (rev 986) @@ -21,7 +21,7 @@ #ifndef _TUX_SPINNING_H_ #define _TUX_SPINNING_H_ -#include "tux_misc.h" +#include <stdbool.h> #define TUX_SPINNING_DIRECTION_NONE 0 #define TUX_SPINNING_DIRECTION_LEFT 1 Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c 2008-04-20 12:01:05 UTC (rev 986) @@ -29,6 +29,7 @@ #include "version.h" #include "tux_firmware.h" #include "tux_hw_status.h" +#include "tux_misc.h" #include "tux_sw_status.h" static const char *SW_NAME[] = { Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.h =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.h 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.h 2008-04-20 12:01:05 UTC (rev 986) @@ -21,7 +21,8 @@ #ifndef _TUX_SW_STATUS_H_ #define _TUX_SW_STATUS_H_ -#include "tux_misc.h" +#include <stdbool.h> + #include "tux_error.h" #define STRING_VALUE_ON "ON" Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.h =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.h 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.h 2008-04-20 12:01:05 UTC (rev 986) @@ -21,9 +21,11 @@ #ifndef _TUX_USB_H_ #define _TUX_USB_H_ -#include "tux_misc.h" +#include <stdbool.h> #include <unistd.h> +#include "tux_misc.h" + #define TUX_PID 0xFF07 #define TUX_VID 0x03EB #define TUX_INTERFACE 0x03 @@ -44,7 +46,7 @@ typedef int TuxUSBError; typedef enum { - TuxUSBNoError = 0, + TuxUSBNoError = 0, TuxUSBFuxNotFound, TuxUSBCantClaimInterface, TuxUSBHandleNotOpen, Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.h =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.h 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.h 2008-04-20 12:01:05 UTC (rev 986) @@ -21,7 +21,7 @@ #ifndef _TUX_USER_INPUTS_H_ #define _TUX_USER_INPUTS_H_ -#include "tux_misc.h" +#include <stdbool.h> #define RC5_TIMEOUT 3 Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_wings.h =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_wings.h 2008-04-20 11:49:13 UTC (rev 985) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_wings.h 2008-04-20 12:01:05 UTC (rev 986) @@ -21,7 +21,7 @@ #ifndef _TUX_WINGS_H_ #define _TUX_WINGS_H_ -#include "tux_misc.h" +#include <stdbool.h> #define TUX_WINGS_POSITION_DOWN 0 #define TUX_WINGS_POSITION_UP 1 |