[tuxdroid-svn] r1091 - software_suite_v2/middleware/tuxdriver/trunk/src
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r1091 - software_suite_v2/middleware/tuxdriver/trunk/src
|
From: eFfeM <c2m...@c2...> - 2008-05-03 09:57:43
|
Author: eFfeM
Date: 2008-05-03 11:57:42 +0200 (Sat, 03 May 2008)
New Revision: 1091
Added:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_types.h
Modified:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_audio.c
software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c
software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c
software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.c
software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.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_pong.c
software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c
software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c
software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c
software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.c
software_suite_v2/middleware/tuxdriver/trunk/src/tux_wings.c
Log:
introduced tux_types.h
created type for data_frame (4 bytes) and raw frame (5 bytes)
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_audio.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_audio.c 2008-05-03 09:40:13 UTC (rev 1090)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_audio.c 2008-05-03 09:57:42 UTC (rev 1091)
@@ -20,6 +20,7 @@
#include "tux_audio.h"
#include "tux_hw_cmd.h"
+#include "tux_types.h"
#include "tux_usb.h"
/**
@@ -28,8 +29,7 @@
LIBLOCAL bool
tux_audio_cmd_channel_general(void)
{
- unsigned char frame[TUX_SEND_LENGTH - 1] =
- {USB_DONGLE_AUDIO_CMD, 0, 0, 0};
+ data_frame frame = {USB_DONGLE_AUDIO_CMD, 0, 0, 0};
return tux_usb_send_to_dongle(frame);
}
@@ -39,8 +39,7 @@
LIBLOCAL bool
tux_audio_cmd_channel_tts(void)
{
- unsigned char frame[TUX_SEND_LENGTH - 1] =
- {USB_DONGLE_AUDIO_CMD, 1, 0, 0};
+ data_frame frame = {USB_DONGLE_AUDIO_CMD, 1, 0, 0};
return tux_usb_send_to_dongle(frame);
}
@@ -50,8 +49,7 @@
LIBLOCAL bool
tux_audio_cmd_mute(bool value)
{
- unsigned char frame[TUX_SEND_LENGTH - 1] =
- {AUDIO_MUTE_CMD, 0, 0, 0};
+ data_frame frame = {AUDIO_MUTE_CMD, 0, 0, 0};
if (value)
{
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c 2008-05-03 09:40:13 UTC (rev 1090)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c 2008-05-03 09:57:42 UTC (rev 1091)
@@ -36,6 +36,7 @@
#include "tux_sound_flash.h"
#include "tux_spinning.h"
#include "tux_sw_status.h"
+#include "tux_types.h"
#include "tux_usb.h"
#include "tux_user_inputs.h"
#include "tux_wings.h"
@@ -275,7 +276,7 @@
static bool
tux_cmd_parser_parse_raw_cmd(tokens_t tokens, int nr_tokens)
{
- unsigned char data[TUX_SEND_LENGTH] = {0, 0, 0, 0, 0};
+ raw_frame data = {0, 0, 0, 0};
int r = 0;
int i;
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c 2008-05-03 09:40:13 UTC (rev 1090)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c 2008-05-03 09:57:42 UTC (rev 1091)
@@ -27,6 +27,7 @@
#include "tux_misc.h"
#include "tux_movements.h"
#include "tux_sw_status.h"
+#include "tux_types.h"
#include "tux_usb.h"
/**
@@ -97,7 +98,7 @@
tux_eyes_cmd_on_during(float timeout, unsigned char final_state)
{
bool ret;
- unsigned char frame[TUX_SEND_LENGTH - 1] = {EYES_BLINK_CMD, 0, 0, 0};
+ data_frame frame = {EYES_BLINK_CMD, 0, 0, 0};
/* Short movements */
if (timeout < 0.3)
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.c 2008-05-03 09:40:13 UTC (rev 1090)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.c 2008-05-03 09:57:42 UTC (rev 1091)
@@ -25,6 +25,7 @@
#include "tux_hw_status.h"
#include "tux_hw_cmd.h"
#include "tux_misc.h"
+#include "tux_types.h"
#include "tux_usb.h"
LIBLOCAL id_descriptor_t id_desc;
@@ -65,7 +66,7 @@
LIBLOCAL void
tux_id_get_descriptor(void)
{
- unsigned char frame[TUX_SEND_LENGTH - 1] =
+ data_frame frame =
{ USB_DONGLE_CONNECTION_CMD,
USB_TUX_CONNECTION_ID_REQUEST,
0, 0};
@@ -79,7 +80,7 @@
LIBLOCAL bool
tux_id_cmd_disconnect_from_tux(void)
{
- unsigned char frame[TUX_SEND_LENGTH - 1] =
+ data_frame frame =
{ USB_DONGLE_CONNECTION_CMD,
USB_TUX_CONNECTION_DISCONNECT,
0, 0};
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.c 2008-05-03 09:40:13 UTC (rev 1090)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.c 2008-05-03 09:57:42 UTC (rev 1091)
@@ -26,6 +26,7 @@
#include "tux_hw_status.h"
#include "tux_leds.h"
#include "tux_sw_status.h"
+#include "tux_types.h"
#include "tux_usb.h"
typedef enum
@@ -188,7 +189,7 @@
config_fading(leds_t leds, float fading_delay)
{
int loops = fading_delay / FW_MAIN_LOOP_DELAY;
- unsigned char frame[TUX_SEND_LENGTH - 1] = {0, 0, 0, 0};
+ data_frame frame = {0, 0, 0, 0};
/* Can't go infinitely fast. */
if (loops == 0)
@@ -242,7 +243,7 @@
static int
config_gradient(leds_t leds, int delta, float gradient_delay)
{
- unsigned char frame[TUX_SEND_LENGTH - 1] = {0, 0, 0, 0};
+ data_frame frame = {0, 0, 0, 0};
/* Preconditions. */
delta = bound_to_range(delta, 1, 255);
@@ -279,7 +280,7 @@
int right_intensity_delta, led_effect_t *effect)
{
bool ret = false;
- unsigned char frame[TUX_SEND_LENGTH - 1] = {0, 0, 0, 0};
+ data_frame frame = {0, 0, 0, 0};
switch(effect->type)
{
@@ -473,7 +474,7 @@
*/
static bool led_set(leds_t leds, int intensity, led_effect_t *effect)
{
- unsigned char frame[TUX_SEND_LENGTH - 1] = {0, 0, 0, 0};
+ data_frame frame = {0, 0, 0, 0};
int left_intensity_delta, right_intensity_delta;
bool ret;
@@ -524,7 +525,7 @@
led_pulse(leds_t leds, int min_intensity, int max_intensity,
int toggle_count, float pulse_period, led_effect_t *effect)
{
- unsigned char frame[TUX_SEND_LENGTH - 1] = {0, 0, 0, 0};
+ data_frame frame = {0, 0, 0, 0};
bool ret;
/* Pulse width or duration of the pulse, in hardware loops. The pulse
* period is twice that number. */
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c 2008-05-03 09:40:13 UTC (rev 1090)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c 2008-05-03 09:57:42 UTC (rev 1091)
@@ -27,6 +27,7 @@
#include "tux_mouth.h"
#include "tux_movements.h"
#include "tux_sw_status.h"
+#include "tux_types.h"
#include "tux_usb.h"
/**
@@ -97,7 +98,7 @@
tux_mouth_cmd_on_during(float timeout, unsigned char final_state)
{
bool ret;
- unsigned char frame[TUX_SEND_LENGTH - 1] = {MOUTH_MOVE_CMD, 0, 0, 0};
+ data_frame frame = {MOUTH_MOVE_CMD, 0, 0, 0};
/* Short movements */
if (timeout < 0.3)
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c 2008-05-03 09:40:13 UTC (rev 1090)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c 2008-05-03 09:57:42 UTC (rev 1091)
@@ -24,6 +24,7 @@
#include "tux_hw_status.h"
#include "tux_movements.h"
#include "tux_sw_status.h"
+#include "tux_types.h"
#include "tux_usb.h"
/*
@@ -207,7 +208,7 @@
LIBLOCAL void
single_movement(char motor, char final_state)
{
- unsigned char frame[TUX_SEND_LENGTH - 1] = {0, 0, 0, 0};
+ data_frame frame = {0, 0, 0, 0};
switch (motor)
{
@@ -331,7 +332,7 @@
float timeout, move_speed_t speed,
move_final_state_t final_state, bool refresh)
{
- unsigned char frame[TUX_SEND_LENGTH - 1] = {0, 0, 0, 0};
+ data_frame frame = {0, 0, 0, 0};
int value;
bool ret = false;
char type = 0;
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_pong.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_pong.c 2008-05-03 09:40:13 UTC (rev 1090)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_pong.c 2008-05-03 09:57:42 UTC (rev 1091)
@@ -22,6 +22,7 @@
#include "tux_hw_cmd.h"
#include "tux_pong.h"
#include "tux_sw_status.h"
+#include "tux_types.h"
#include "tux_usb.h"
#define STACK_SIZE 10
@@ -105,8 +106,7 @@
tux_pong_get(void)
{
static unsigned char get_count = 0;
- const unsigned char frame[TUX_SEND_LENGTH - 1] =
- { TUX_PONG_PING_CMD, 200, 0, 0};
+ data_frame frame = { TUX_PONG_PING_CMD, 200, 0, 0};
get_count++;
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c 2008-05-03 09:40:13 UTC (rev 1090)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c 2008-05-03 09:57:42 UTC (rev 1091)
@@ -30,6 +30,7 @@
#include "tux_leds.h"
#include "tux_sw_status.h"
#include "tux_sound_flash.h"
+#include "tux_types.h"
#include "tux_usb.h"
LIBLOCAL sound_flash_descriptor_t sound_flash_desc;
@@ -290,7 +291,7 @@
LIBLOCAL bool
tux_sound_flash_cmd_play(unsigned char track_num, float vol)
{
- unsigned char frame[TUX_SEND_LENGTH - 1] = {PLAY_SOUND_CMD, 0, 0, 0};
+ data_frame frame = {PLAY_SOUND_CMD, 0, 0, 0};
unsigned char vol2 = 0;
if (vol < 0.0)
@@ -620,7 +621,7 @@
{
bool rf_state = false;
float full_time_sec = 0.0;
- unsigned char frame[TUX_SEND_LENGTH - 1] = {0, 0, 0, 0};
+ data_frame frame = {0, 0, 0, 0};
unsigned char curr_track_for_event = 0;
/* Check fux connection and radio connection */
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c 2008-05-03 09:40:13 UTC (rev 1090)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c 2008-05-03 09:57:42 UTC (rev 1091)
@@ -26,6 +26,7 @@
#include "tux_movements.h"
#include "tux_spinning.h"
#include "tux_sw_status.h"
+#include "tux_types.h"
#include "tux_usb.h"
/**
@@ -128,7 +129,7 @@
move_body_part_t movement)
{
bool ret;
- unsigned char frame[TUX_SEND_LENGTH - 1] = {cmd, 0, 5, 0};
+ data_frame frame = {cmd, 0, 5, 0};
/* Short movements */
if (timeout < 0.3)
Added: software_suite_v2/middleware/tuxdriver/trunk/src/tux_types.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_types.h (rev 0)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_types.h 2008-05-03 09:57:42 UTC (rev 1091)
@@ -0,0 +1,29 @@
+/*
+ * Tux Droid - tux types
+ * Copyright (C) 2008 C2ME Sa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef _TUX_TYPES_H_
+#define _TUX_TYPES_H_
+
+typedef unsigned char data_frame[4];
+typedef unsigned char tux_frame[5];
+typedef unsigned char fux_frame[5];
+typedef unsigned char raw_frame[5];
+
+#endif /* _TUX_TYPES_H_ */
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c 2008-05-03 09:40:13 UTC (rev 1090)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c 2008-05-03 09:57:42 UTC (rev 1091)
@@ -27,6 +27,7 @@
#else
# include "tux_hid_unix.h"
#endif
+#include "tux_types.h"
#include "tux_usb.h"
#ifdef USE_MUTEX
@@ -586,8 +587,7 @@
LIBLOCAL bool
tux_usb_send_to_tux(const unsigned char* data)
{
- unsigned char frame[TUX_SEND_LENGTH] = {0, data[0], data[1],
- data[2], data[3]};
+ raw_frame frame = {0, data[0], data[1], data[2], data[3]};
return tux_usb_send_raw(frame);
}
@@ -599,8 +599,7 @@
LIBLOCAL bool
tux_usb_send_to_dongle(const unsigned char* data)
{
- unsigned char frame[TUX_SEND_LENGTH] = {1, data[0], data[1],
- data[2], data[3]};
+ raw_frame frame = {1, data[0], data[1], data[2], data[3]};
return tux_usb_send_raw(frame);
}
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.c 2008-05-03 09:40:13 UTC (rev 1090)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.c 2008-05-03 09:57:42 UTC (rev 1091)
@@ -23,6 +23,7 @@
#include "tux_hw_cmd.h"
#include "tux_hw_status.h"
#include "tux_sw_status.h"
+#include "tux_types.h"
#include "tux_usb.h"
#include "tux_user_inputs.h"
@@ -340,7 +341,7 @@
LIBLOCAL bool
tux_user_inputs_cmd_ir_on(void)
{
- unsigned char frame[TUX_SEND_LENGTH - 1] = {TURN_IR_ON_CMD, 0, 0, 0};
+ data_frame frame = {TURN_IR_ON_CMD, 0, 0, 0};
return tux_usb_send_to_tux(frame);
}
@@ -351,7 +352,7 @@
LIBLOCAL bool
tux_user_inputs_cmd_ir_off(void)
{
- unsigned char frame[TUX_SEND_LENGTH - 1] = {TURN_IR_OFF_CMD, 0, 0, 0};
+ data_frame frame = {TURN_IR_OFF_CMD, 0, 0, 0};
return tux_usb_send_to_tux(frame);
}
@@ -362,7 +363,7 @@
LIBLOCAL bool
tux_user_inputs_cmd_ir_send(unsigned char address, unsigned char command)
{
- unsigned char frame[TUX_SEND_LENGTH - 1] = {IR_SEND_RC5_CMD, 0, 0, 0};
+ data_frame frame = {IR_SEND_RC5_CMD, 0, 0, 0};
frame[1] = address;
frame[2] = command;
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_wings.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_wings.c 2008-05-03 09:40:13 UTC (rev 1090)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_wings.c 2008-05-03 09:57:42 UTC (rev 1091)
@@ -25,6 +25,7 @@
#include "tux_hw_cmd.h"
#include "tux_movements.h"
#include "tux_sw_status.h"
+#include "tux_types.h"
#include "tux_usb.h"
#include "tux_wings.h"
@@ -99,7 +100,7 @@
tux_wings_cmd_on_during(float timeout, unsigned char final_state)
{
bool ret;
- unsigned char frame[TUX_SEND_LENGTH - 1] = {WINGS_WAVE_CMD, 0, 5, 0};
+ data_frame frame = {WINGS_WAVE_CMD, 0, 5, 0};
/* Short movements */
if (timeout < 0.3)
|
