[tuxdroid-svn] r1295 - in software_suite_v2/middleware/tuxdriver/trunk: include src
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r1295 - in software_suite_v2/middleware/tuxdriver/trunk: include src
|
From: remi <c2m...@c2...> - 2008-07-02 08:13:53
|
Author: remi
Date: 2008-07-02 10:13:56 +0200 (Wed, 02 Jul 2008)
New Revision: 1295
Modified:
software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.h
software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.pas
software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.py
software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c
software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c
software_suite_v2/middleware/tuxdriver/trunk/src/tux_flippers.c
software_suite_v2/middleware/tuxdriver/trunk/src/tux_flippers.h
software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_cmd.h
software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_status.c
software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_status.h
software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c
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_types.h
Log:
* replaced the word "wings" by "flippers" in the whole of lituxdriver.
Modified: software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.h 2008-07-02 07:40:23 UTC (rev 1294)
+++ software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.h 2008-07-02 08:13:56 UTC (rev 1295)
@@ -27,8 +27,8 @@
* Id enumeration of high level status.
*/
typedef enum {
- SW_ID_WINGS_POSITION = 0,
- SW_ID_WINGS_REMAINING_MVM,
+ SW_ID_FLIPPERS_POSITION = 0,
+ SW_ID_FLIPPERS_REMAINING_MVM,
SW_ID_SPINNING_DIRECTION,
SW_ID_SPINNING_REMAINING_MVM,
SW_ID_LEFT_WING_BUTTON,
Modified: software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.pas
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.pas 2008-07-02 07:40:23 UTC (rev 1294)
+++ software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.pas 2008-07-02 08:13:56 UTC (rev 1295)
@@ -48,8 +48,8 @@
{**
* Id enumeration of high level status.
*}
- SW_ID_WINGS_POSITION = 0;
- SW_ID_WINGS_REMAINING_MVM = 1;
+ SW_ID_FLIPPERS_POSITION = 0;
+ SW_ID_FLIPPERS_REMAINING_MVM = 1;
SW_ID_SPINNING_DIRECTION = 2;
SW_ID_SPINNING_REMAINING_MVM = 3;
SW_ID_LEFT_WING_BUTTON = 4;
Modified: software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.py
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.py 2008-07-02 07:40:23 UTC (rev 1294)
+++ software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.py 2008-07-02 08:13:56 UTC (rev 1295)
@@ -32,8 +32,8 @@
E_TUXDRV_BUSY = E_TUXDRV_BEGIN + 8
E_TUXDRV_WAVSIZEEXCEDED = E_TUXDRV_BEGIN + 9
-SW_ID_WINGS_POSITION = 0
-SW_ID_WINGS_REMAINING_MVM = 1
+SW_ID_FLIPPERS_POSITION = 0
+SW_ID_FLIPPERS_REMAINING_MVM = 1
SW_ID_SPINNING_DIRECTION = 2
SW_ID_SPINNING_REMAINING_MVM = 3
SW_ID_LEFT_WING_BUTTON = 4
@@ -74,8 +74,8 @@
SW_ID_SPIN_RIGHT_MOTOR_ON = 39
SW_NAME_DRIVER = [
- "wings_position",
- "wings_remaining_movements",
+ "flippers_position",
+ "flippers_remaining_movements",
"spinning_direction",
"spinning_remaining_movements",
"left_wing_button",
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c 2008-07-02 07:40:23 UTC (rev 1294)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c 2008-07-02 08:13:56 UTC (rev 1295)
@@ -544,7 +544,7 @@
*
*/
static TuxDrvError
-parse_tux_wings_command(tokens_t tokens, delay_cmd_t *cmd)
+parse_tux_flippers_command(tokens_t tokens, delay_cmd_t *cmd)
{
TuxDrvError ret = E_TUXDRV_INVALIDCOMMAND;
@@ -561,8 +561,8 @@
else if (strcmp(tokens[2], "ON") == 0)
{
cmd->sub_command = ON;
- if (str_to_uint8(tokens[3], &cmd->wings_on_parameters.nr_movements) &&
- str_to_state_t(tokens[4], &cmd->wings_on_parameters.state))
+ if (str_to_uint8(tokens[3], &cmd->flippers_on_parameters.nr_movements) &&
+ str_to_state_t(tokens[4], &cmd->flippers_on_parameters.state))
{
ret = E_TUXDRV_NOERROR;
}
@@ -570,8 +570,8 @@
else if (strcmp(tokens[2], "ON_DURING") == 0)
{
cmd->sub_command = ON_DURING;
- if (str_to_float(tokens[3], &cmd->wings_on_during_parameters.duration) &&
- str_to_state_t(tokens[4], &cmd->wings_on_during_parameters.state))
+ if (str_to_float(tokens[3], &cmd->flippers_on_during_parameters.duration) &&
+ str_to_state_t(tokens[4], &cmd->flippers_on_during_parameters.state))
{
ret = E_TUXDRV_NOERROR;
}
@@ -586,7 +586,7 @@
else if (strcmp(tokens[2], "SPEED") == 0)
{
cmd->sub_command = SPEED;
- if (str_to_uint8(tokens[3], &cmd->wings_speed_parameters.speed))
+ if (str_to_uint8(tokens[3], &cmd->flippers_speed_parameters.speed))
{
ret = E_TUXDRV_NOERROR;
}
@@ -637,10 +637,10 @@
cmd->command = SPINNING;
ret = parse_tux_spinning_command(tokens, cmd);
}
- else if (strcmp(tokens[1], "WINGS") == 0)
+ else if (strcmp(tokens[1], "FLIPPERS") == 0)
{
- cmd->command = WINGS;
- ret = parse_tux_wings_command(tokens, cmd);
+ cmd->command = FLIPPERS;
+ ret = parse_tux_flippers_command(tokens, cmd);
}
return ret;
}
@@ -917,33 +917,33 @@
*
*/
static void
-execute_wings_command (delay_cmd_t *cmd)
+execute_flippers_command (delay_cmd_t *cmd)
{
switch (cmd->sub_command) {
case ON:
- tux_wings_cmd_on(
- cmd->wings_on_parameters.nr_movements,
- cmd->wings_on_parameters.state);
+ tux_flippers_cmd_on(
+ cmd->flippers_on_parameters.nr_movements,
+ cmd->flippers_on_parameters.state);
break;
case ON_DURING:
- tux_wings_cmd_on_during(
- cmd->wings_on_during_parameters.duration,
- cmd->wings_on_during_parameters.state);
+ tux_flippers_cmd_on_during(
+ cmd->flippers_on_during_parameters.duration,
+ cmd->flippers_on_during_parameters.state);
break;
case OFF:
- tux_wings_cmd_off();
+ tux_flippers_cmd_off();
break;
case UP:
- tux_wings_cmd_up();
+ tux_flippers_cmd_up();
break;
case DOWN:
- tux_wings_cmd_down();
+ tux_flippers_cmd_down();
break;
case SPEED:
- tux_wings_cmd_speed(cmd->wings_speed_parameters.speed);
+ tux_flippers_cmd_speed(cmd->flippers_speed_parameters.speed);
break;
default: /* should not occur */
- log_error("execute invalid wings command");
+ log_error("execute invalid flippers command");
}
}
@@ -986,8 +986,8 @@
case SPINNING:
execute_spinning_command(cmd);
break;
- case WINGS:
- execute_wings_command(cmd);
+ case FLIPPERS:
+ execute_flippers_command(cmd);
break;
}
}
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c 2008-07-02 07:40:23 UTC (rev 1294)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c 2008-07-02 08:13:56 UTC (rev 1295)
@@ -138,7 +138,7 @@
case FRAME_HEADER_POSITION1:
if (header == ret)
{
- tux_wings_update_movements_remaining();
+ tux_flippers_update_movements_remaining();
tux_mouth_update_movements_remaining();
tux_eyes_update_movements_remaining();
}
@@ -146,11 +146,11 @@
case FRAME_HEADER_POSITION2:
if (header == ret)
{
- tux_wings_update_position();
+ tux_flippers_update_position();
tux_spinning_update_movements_remaining();
tux_eyes_update_motor();
tux_mouth_update_motor();
- tux_wings_update_motor();
+ tux_flippers_update_motor();
tux_spinning_update_left_motor();
tux_spinning_update_right_motor();
}
@@ -418,7 +418,7 @@
{
TuxDrv_PerformCommand(0.0, "TUX_CMD:EYES:OPEN");
TuxDrv_PerformCommand(0.3, "TUX_CMD:MOUTH:CLOSE");
- TuxDrv_PerformCommand(0.0, "TUX_CMD:WINGS:DOWN");
+ TuxDrv_PerformCommand(0.0, "TUX_CMD:FLIPPERS:DOWN");
TuxDrv_PerformCommand(0.0, "TUX_CMD:SPINNING:OFF");
TuxDrv_PerformCommand(0.0, "TUX_CMD:LED:ON:LED_BOTH,1.0");
}
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_flippers.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_flippers.c 2008-07-02 07:40:23 UTC (rev 1294)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_flippers.c 2008-07-02 08:13:56 UTC (rev 1295)
@@ -1,5 +1,5 @@
/*
- * Tux Droid - Wings
+ * Tux Droid - Flippers
* Copyright (C) 2008 C2ME Sa
*
* This program is free software; you can redistribute it and/or modify
@@ -35,11 +35,11 @@
*
*/
LIBLOCAL void
-tux_wings_update_position(void)
+tux_flippers_update_position(void)
{
char *new_position = "";
- if (!hw_status_table.position2.wings_down)
+ if (!hw_status_table.position2.flippers_down)
{
new_position = STRING_VALUE_DOWN;
}
@@ -48,14 +48,14 @@
new_position = STRING_VALUE_UP;
}
- tux_sw_status_set_strvalue(SW_ID_WINGS_POSITION, new_position, true);
+ tux_sw_status_set_strvalue(SW_ID_FLIPPERS_POSITION, new_position, true);
}
/**
* Update the status of the motor state of the flippers.
*/
LIBLOCAL void
-tux_wings_update_motor(void)
+tux_flippers_update_motor(void)
{
unsigned char new_state;
@@ -67,21 +67,21 @@
*
*/
LIBLOCAL void
-tux_wings_update_movements_remaining(void)
+tux_flippers_update_movements_remaining(void)
{
unsigned char new_count;
- new_count = hw_status_table.position1.wings_remaining_mvm;
+ new_count = hw_status_table.position1.flippers_remaining_mvm;
mvmt_counter = new_count;
- tux_sw_status_set_intvalue(SW_ID_WINGS_REMAINING_MVM, new_count, true);
+ tux_sw_status_set_intvalue(SW_ID_FLIPPERS_REMAINING_MVM, new_count, true);
}
/**
*
*/
LIBLOCAL bool
-tux_wings_cmd_speed(unsigned char speed)
+tux_flippers_cmd_speed(unsigned char speed)
{
return tux_movement_perform(MOVE_FLIPPERS, 0, 0.0, speed,
FINAL_ST_UNDEFINED, true);
@@ -91,7 +91,7 @@
*
*/
LIBLOCAL bool
-tux_wings_cmd_on(unsigned char counter, unsigned char final_state)
+tux_flippers_cmd_on(unsigned char counter, unsigned char final_state)
{
return tux_movement_cmd_on(MOVE_FLIPPERS, counter, final_state);
}
@@ -100,11 +100,11 @@
*
*/
LIBLOCAL bool
-tux_wings_cmd_on_during(float timeout, unsigned char final_state)
+tux_flippers_cmd_on_during(float timeout, unsigned char final_state)
{
bool ret;
- data_frame frame = {WINGS_WAVE_CMD, 0, 5, 0};
- delay_cmd_t cmd = { 0.0, TUX_CMD, WINGS };
+ data_frame frame = {FLIPPERS_WAVE_CMD, 0, 5, 0};
+ delay_cmd_t cmd = { 0.0, TUX_CMD, FLIPPERS };
/* Short movements */
if (timeout < 0.3)
@@ -121,7 +121,7 @@
}
mvmt_counter = 255;
- tux_sw_status_set_intvalue(SW_ID_WINGS_REMAINING_MVM, mvmt_counter, true);
+ tux_sw_status_set_intvalue(SW_ID_FLIPPERS_REMAINING_MVM, mvmt_counter, true);
switch (final_state) {
case FINAL_ST_UNDEFINED:
@@ -146,7 +146,7 @@
*
*/
LIBLOCAL bool
-tux_wings_cmd_up(void)
+tux_flippers_cmd_up(void)
{
return tux_movement_perform(MOVE_FLIPPERS, 0, 0, 5, FINAL_ST_OPEN_UP, false);
}
@@ -155,7 +155,7 @@
*
*/
LIBLOCAL bool
-tux_wings_cmd_down(void)
+tux_flippers_cmd_down(void)
{
return tux_movement_perform(MOVE_FLIPPERS, 0, 0, 5, FINAL_ST_CLOSE_DOWN, false);
}
@@ -164,14 +164,14 @@
*
*/
LIBLOCAL bool
-tux_wings_cmd_off(void)
+tux_flippers_cmd_off(void)
{
bool ret;
- tux_cmd_parser_clean_sys_command(WINGS);
+ tux_cmd_parser_clean_sys_command(FLIPPERS);
ret = tux_movement_perform(MOVE_FLIPPERS, 0, 0, 5, FINAL_ST_STOP, false);
mvmt_counter = 0;
- tux_sw_status_set_intvalue(SW_ID_WINGS_REMAINING_MVM, mvmt_counter, true);
+ tux_sw_status_set_intvalue(SW_ID_FLIPPERS_REMAINING_MVM, mvmt_counter, true);
return ret;
}
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_flippers.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_flippers.h 2008-07-02 07:40:23 UTC (rev 1294)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_flippers.h 2008-07-02 08:13:56 UTC (rev 1295)
@@ -1,5 +1,5 @@
/*
- * Tux Droid - Wings
+ * Tux Droid - Flippers
* Copyright (C) 2008 C2ME Sa
*
* This program is free software; you can redistribute it and/or modify
@@ -18,22 +18,22 @@
* 02111-1307, USA.
*/
-#ifndef _TUX_WINGS_H_
-#define _TUX_WINGS_H_
+#ifndef _TUX_FLIPPERS_H_
+#define _TUX_FLIPPERS_H_
#include <stdbool.h>
-#define TUX_WINGS_POSITION_DOWN 0
-#define TUX_WINGS_POSITION_UP 1
+#define TUX_FLIPPERS_POSITION_DOWN 0
+#define TUX_FLIPPERS_POSITION_UP 1
-extern void tux_wings_update_position(void);
-extern void tux_wings_update_motor(void);
-extern void tux_wings_update_movements_remaining(void);
-extern bool tux_wings_cmd_speed(unsigned char speed);
-extern bool tux_wings_cmd_on(unsigned char counter, unsigned char final_state);
-extern bool tux_wings_cmd_on_during(float timeout, unsigned char final_state);
-extern bool tux_wings_cmd_up(void);
-extern bool tux_wings_cmd_down(void);
-extern bool tux_wings_cmd_off(void);
+extern void tux_flippers_update_position(void);
+extern void tux_flippers_update_motor(void);
+extern void tux_flippers_update_movements_remaining(void);
+extern bool tux_flippers_cmd_speed(unsigned char speed);
+extern bool tux_flippers_cmd_on(unsigned char counter, unsigned char final_state);
+extern bool tux_flippers_cmd_on_during(float timeout, unsigned char final_state);
+extern bool tux_flippers_cmd_up(void);
+extern bool tux_flippers_cmd_down(void);
+extern bool tux_flippers_cmd_off(void);
-#endif /* _TUX_WINGS_H_ */
+#endif /* _TUX_FLIPPERS_H_ */
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_cmd.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_cmd.h 2008-07-02 07:40:23 UTC (rev 1294)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_cmd.h 2008-07-02 08:13:56 UTC (rev 1295)
@@ -59,10 +59,10 @@
MOUTH_MOVE_CMD = 0x41,
MOUTH_STOP_CMD = 0x36,
- WINGS_RAISE_CMD = 0x39,
- WINGS_LOWER_CMD = 0x3A,
- WINGS_WAVE_CMD = 0x80,
- WINGS_STOP_CMD = 0x30,
+ FLIPPERS_RAISE_CMD = 0x39,
+ FLIPPERS_LOWER_CMD = 0x3A,
+ FLIPPERS_WAVE_CMD = 0x80,
+ FLIPPERS_STOP_CMD = 0x30,
SPIN_LEFT_CMD = 0x82,
SPIN_RIGHT_CMD = 0x83,
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_status.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_status.c 2008-07-02 07:40:23 UTC (rev 1294)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_status.c 2008-07-02 08:13:56 UTC (rev 1295)
@@ -306,14 +306,14 @@
{
ret = FRAME_HEADER_POSITION1;
}
- if (hw_status_table.position1.wings_remaining_mvm != frame[3])
+ if (hw_status_table.position1.flippers_remaining_mvm != frame[3])
{
ret = FRAME_HEADER_POSITION1;
}
hw_status_table.position1.eyes_remaining_mvm = frame[1];
hw_status_table.position1.mouth_remaining_mvm = frame[2];
- hw_status_table.position1.wings_remaining_mvm = frame[3];
+ hw_status_table.position1.flippers_remaining_mvm = frame[3];
return ret;
}
@@ -330,7 +330,7 @@
{
ret = FRAME_HEADER_POSITION2;
}
- if (hw_status_table.position2.wings_down != frame[2])
+ if (hw_status_table.position2.flippers_down != frame[2])
{
ret = FRAME_HEADER_POSITION2;
}
@@ -340,7 +340,7 @@
}
hw_status_table.position2.spin_remaining_mvm = frame[1];
- hw_status_table.position2.wings_down = frame[2];
+ hw_status_table.position2.flippers_down = frame[2];
hw_status_table.position2.motors.Byte = frame[3];
return ret;
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_status.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_status.h 2008-07-02 07:40:23 UTC (rev 1294)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_status.h 2008-07-02 08:13:56 UTC (rev 1295)
@@ -62,7 +62,7 @@
typedef struct
{
- _BIT_ wings_motor_backward:1;
+ _BIT_ flippers_motor_backward:1;
_BIT_ spin_motor_forward:1;
_BIT_ spin_motor_backward:1;
_BIT_ mouth_open_switch:1;
@@ -81,7 +81,7 @@
typedef struct
{
_BIT_ photo_transistor_pull_up:1;
- _BIT_ wings_position_switch:1;
+ _BIT_ flippers_position_switch:1;
_BIT_ right_blue_led:1;
_BIT_ left_blue_led:1;
_BIT_ i2c_sda_line:1;
@@ -102,7 +102,7 @@
_BIT_ head_motor_for_eyes:1;
_BIT_ ir_receiver_signal:1;
_BIT_ spin_position_switch:1;
- _BIT_ wings_motor_forward:1;
+ _BIT_ flippers_motor_forward:1;
_BIT_ ir_led:1;
_BIT_ eyes_open_switch:1;
_BIT_ eyes_closed_switch:1;
@@ -243,13 +243,13 @@
{
unsigned char eyes_remaining_mvm;
unsigned char mouth_remaining_mvm;
- unsigned char wings_remaining_mvm;
+ unsigned char flippers_remaining_mvm;
} frame_body_position1_t;
typedef struct
{
unsigned char spin_remaining_mvm;
- unsigned char wings_down;
+ unsigned char flippers_down;
_MOTORS_STATUS_BYTE_ motors;
} frame_body_position2_t;
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c 2008-07-02 07:40:23 UTC (rev 1294)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c 2008-07-02 08:13:56 UTC (rev 1295)
@@ -136,7 +136,7 @@
}
case (MOVE_FLIPPERS):
{
- condition = !hw_status_table.position2.wings_down;
+ condition = !hw_status_table.position2.flippers_down;
if (value)
{
value = movement_status_control(final_state, value, condition);
@@ -257,19 +257,19 @@
case (MOVE_FLIPPERS):
if (final_state == FINAL_ST_OPEN_UP)
{
- frame[0] = WINGS_RAISE_CMD;
+ frame[0] = FLIPPERS_RAISE_CMD;
}
else
{
if (final_state == FINAL_ST_CLOSE_DOWN)
{
- frame[0] = WINGS_LOWER_CMD;
+ frame[0] = FLIPPERS_LOWER_CMD;
}
else
{
if (final_state == FINAL_ST_STOP)
{
- frame[0] = WINGS_STOP_CMD;
+ frame[0] = FLIPPERS_STOP_CMD;
}
}
}
@@ -305,7 +305,7 @@
* \param motor Which motor should be configured
* \param counter The number of movements to execute
* \param timeout The duration of the movement (if counter = 0)
- * \param speed The PWM value. Only applicable for the wings and the spinning.
+ * \param speed The PWM value. Only applicable for the flippers and the spinning.
* \param final_state The final state to reach
* \param refresh Flag indicate if the entire command must be sent, or just the
* new PWM value.
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c 2008-07-02 07:40:23 UTC (rev 1294)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c 2008-07-02 08:13:56 UTC (rev 1295)
@@ -76,11 +76,11 @@
{ id, name, value_fmt, {.strvalue = initval}, threshold, value_doc, 0.0 },
sw_status_t sw_status_table[SW_STATUS_NUMBER] = {
- INIT_STRINGID(SW_ID_WINGS_POSITION, ID_FMT_STRING,
- "wings_position", "DOWN|UP", STRING_VALUE_DOWN, 1)
+ INIT_STRINGID(SW_ID_FLIPPERS_POSITION, ID_FMT_STRING,
+ "flippers_position", "DOWN|UP", STRING_VALUE_DOWN, 1)
- INIT_INTID(SW_ID_WINGS_REMAINING_MVM, ID_FMT_UINT8,
- "wings_remaining_movements", "range[0..255]", 0, 1)
+ INIT_INTID(SW_ID_FLIPPERS_REMAINING_MVM, ID_FMT_UINT8,
+ "flippers_remaining_movements", "range[0..255]", 0, 1)
INIT_STRINGID(SW_ID_SPINNING_DIRECTION, ID_FMT_STRING,
"spinning_direction", "NONE|LEFT|RIGHT", STRING_VALUE_NONE, 1)
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.h 2008-07-02 07:40:23 UTC (rev 1294)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.h 2008-07-02 08:13:56 UTC (rev 1295)
@@ -54,8 +54,8 @@
#define STRING_VALUE_ERROR_USB "ERROR_USB"
typedef enum {
- SW_ID_WINGS_POSITION = 0,
- SW_ID_WINGS_REMAINING_MVM,
+ SW_ID_FLIPPERS_POSITION = 0,
+ SW_ID_FLIPPERS_REMAINING_MVM,
SW_ID_SPINNING_DIRECTION,
SW_ID_SPINNING_REMAINING_MVM,
SW_ID_LEFT_WING_BUTTON,
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_types.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_types.h 2008-07-02 07:40:23 UTC (rev 1294)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_types.h 2008-07-02 08:13:56 UTC (rev 1295)
@@ -46,7 +46,7 @@
MOUTH,
SOUND_FLASH,
SPINNING,
- WINGS
+ FLIPPERS
} tux_command_t;
/* subcommands */
@@ -175,20 +175,20 @@
unsigned char speed;
} spinning_speed_parameters_t;
-/* wings */
+/* flippers */
typedef struct {
move_final_state_t state;
unsigned char nr_movements;
-} wings_on_parameters_t;
+} flippers_on_parameters_t;
typedef struct {
move_final_state_t state;
float duration;
-} wings_on_during_parameters_t;
+} flippers_on_during_parameters_t;
typedef struct {
unsigned char speed;
-} wings_speed_parameters_t;
+} flippers_speed_parameters_t;
/* raw */
typedef struct {
@@ -221,9 +221,9 @@
spinning_on_parameters_t spinning_on_parameters;
spinning_on_during_parameters_t spinning_on_during_parameters;
spinning_speed_parameters_t spinning_speed_parameters;
- wings_on_parameters_t wings_on_parameters;
- wings_on_during_parameters_t wings_on_during_parameters;
- wings_speed_parameters_t wings_speed_parameters;
+ flippers_on_parameters_t flippers_on_parameters;
+ flippers_on_during_parameters_t flippers_on_during_parameters;
+ flippers_speed_parameters_t flippers_speed_parameters;
raw_parameters_t raw_parameters;
};
float inserted_at_time;
|
