tux-droid-svn Mailing List for Tux Droid CE (Page 201)
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
tux-droid-svn — Subversion commit reports.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(32) |
Mar
(108) |
Apr
(71) |
May
(38) |
Jun
(128) |
Jul
(1) |
Aug
(14) |
Sep
(77) |
Oct
(104) |
Nov
(90) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(81) |
Feb
(18) |
Mar
(40) |
Apr
(102) |
May
(151) |
Jun
(74) |
Jul
(151) |
Aug
(257) |
Sep
(447) |
Oct
(379) |
Nov
(404) |
Dec
(430) |
| 2009 |
Jan
(173) |
Feb
(236) |
Mar
(519) |
Apr
(300) |
May
(112) |
Jun
(232) |
Jul
(314) |
Aug
(58) |
Sep
(203) |
Oct
(293) |
Nov
(26) |
Dec
(109) |
| 2010 |
Jan
(19) |
Feb
(25) |
Mar
(33) |
Apr
(1) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: eFfeM <c2m...@c2...> - 2008-04-22 19:44:40
|
Author: eFfeM
Date: 2008-04-22 21:44:39 +0200 (Tue, 22 Apr 2008)
New Revision: 1006
Modified:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c
Log:
factored out common code to a local helper function
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c 2008-04-22 19:40:29 UTC (rev 1005)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c 2008-04-22 19:44:39 UTC (rev 1006)
@@ -143,13 +143,13 @@
/**
*
*/
-LIBLOCAL bool
-tux_spinning_cmd_left_on_during(char *timeout)
+static bool
+tux_spinning_cmd_on_during(char *timeout, unsigned char cmd,
+ move_body_part_t movement)
{
- float to = 0;
- unsigned char fs = FINAL_ST_UNDEFINED;
+ float to = 0.0;
bool ret;
- unsigned char frame[TUX_SEND_LENGTH - 1] = {SPIN_LEFT_CMD, 0, 5, 0};
+ unsigned char frame[TUX_SEND_LENGTH - 1] = {cmd, 0, 5, 0};
ret = str_to_float(timeout, &to);
@@ -161,7 +161,8 @@
/* Short movements */
if (to < 0.3)
{
- return tux_movement_perform(MOVE_SPIN_L, 0, to, 5, fs, false);
+ return tux_movement_perform(movement, 0, to, 5, FINAL_ST_UNDEFINED,
+ false);
}
/* Long movements */
@@ -181,37 +182,18 @@
*
*/
LIBLOCAL bool
-tux_spinning_cmd_right_on_during(char *timeout)
+tux_spinning_cmd_left_on_during(char *timeout)
{
- float to = 0;
- unsigned char fs = FINAL_ST_UNDEFINED;
- bool ret;
- unsigned char frame[TUX_SEND_LENGTH - 1] = {SPIN_RIGHT_CMD, 0, 5, 0};
-
- ret = str_to_float(timeout, &to);
-
- if (!ret)
- {
- return false;
- }
-
- /* Short movements */
- if (to < 0.3)
- {
- return tux_movement_perform(MOVE_SPIN_R, 0, to, 5, fs, false);
- }
+ return tux_spinning_cmd_on_during(timeout, SPIN_LEFT_CMD, MOVE_SPIN_L);
+}
- /* Long movements */
- ret = tux_usb_send_to_tux(frame);
- if (!ret)
- {
- return false;
- }
-
- ret = tux_cmd_parser_insert_delay_command(to,
- "TUX_CMD:SPINNING:OFF", true);
-
- return ret;
+/**
+ *
+ */
+LIBLOCAL bool
+tux_spinning_cmd_right_on_during(char *timeout)
+{
+ return tux_spinning_cmd_on_during(timeout, SPIN_RIGHT_CMD, MOVE_SPIN_R);
}
/**
|
|
From: eFfeM <c2m...@c2...> - 2008-04-22 19:40:26
|
Author: eFfeM
Date: 2008-04-22 21:40:29 +0200 (Tue, 22 Apr 2008)
New Revision: 1005
Modified:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c
Log:
Oops. Made a last minute parameter rename and missed one occurrence
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-22 19:29:29 UTC (rev 1004)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c 2008-04-22 19:40:29 UTC (rev 1005)
@@ -114,7 +114,7 @@
{
while (1)
{
- pnext = strpbrk(p, pattern);
+ pnext = strpbrk(p, delimiters);
if (pnext)
{
len = pnext - p;
|
|
From: eFfeM <c2m...@c2...> - 2008-04-22 19:29:30
|
Author: eFfeM
Date: 2008-04-22 21:29:29 +0200 (Tue, 22 Apr 2008)
New Revision: 1004
Modified:
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_sound_flash.c
software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c
Log:
- generalised the tokenizer in cmd_parser.c (added delimiter argument)
- adopted the code for the additional paramter
- applied it in tux_sound_flash.c
- fixed small problem in tux_spinning.c
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-22 12:48:24 UTC (rev 1003)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c 2008-04-22 19:29:29 UTC (rev 1004)
@@ -91,11 +91,13 @@
cmd_parser_enable = value;
}
+
/**
*
*/
LIBLOCAL int
-tux_cmd_parser_get_tokens(char *src_str, tokens_t *toks, int max_tokens)
+tux_cmd_parser_get_tokens(char *src_str, tokens_t *toks,
+ int max_tokens, char *delimiters)
{
char *p;
char *pnext;
@@ -112,13 +114,17 @@
{
while (1)
{
- pnext = strpbrk(p, ":,");
+ pnext = strpbrk(p, pattern);
if (pnext)
{
len = pnext - p;
strncpy((*toks)[cnt], p,len);
((*toks)[cnt])[len] = 0;
cnt++;
+ if (cnt >= max_tokens)
+ {
+ break;
+ }
}
else
{
@@ -184,7 +190,7 @@
}
log_debug("Parse command : [%s]", cmd_str);
- i = tux_cmd_parser_get_tokens(cmd_str, &tokens, 32);
+ i = tux_cmd_parser_get_tokens(cmd_str, &tokens, 32, ":,");
/* If no tokens in the command then fail */
if (i <= 0)
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-22 12:48:24 UTC (rev 1003)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.h 2008-04-22 19:29:29 UTC (rev 1004)
@@ -34,7 +34,7 @@
extern void tux_cmd_parser_init(void);
extern void tux_cmd_parser_set_enable(bool value);
extern int tux_cmd_parser_get_tokens(char *src_str, tokens_t *toks,
- int max_tokens);
+ int max_tokens, char *delimiters);
extern TuxDrvError tux_cmd_parser_parse_command(char *cmd_str);
extern bool tux_cmd_parser_clear_delay_commands(void);
extern TuxDrvError tux_cmd_parser_insert_delay_command(float delay,
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c 2008-04-22 12:48:24 UTC (rev 1003)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c 2008-04-22 19:29:29 UTC (rev 1004)
@@ -348,7 +348,7 @@
LIBEXPORT int
TuxDrv_TokenizeStatus(char *status, tokens_t *tokens)
{
- return tux_cmd_parser_get_tokens(status, tokens, 32);
+ return tux_cmd_parser_get_tokens(status, tokens, 32, ":,");
}
/**
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c 2008-04-22 12:48:24 UTC (rev 1003)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c 2008-04-22 19:29:29 UTC (rev 1004)
@@ -462,66 +462,29 @@
static void
get_hw_audio_device_name(void)
{
- DIR* dir;
FILE *fp;
- struct dirent *dinfo;
- int count;
int card;
- int last_card;
- int device;
- int last_device;
char filename[29];
char line[81];
- char hw_device[7] = "";
unsigned int vid, pid;
- dir = opendir("/dev/snd");
- if (dir == NULL)
+ for (card = 0; card < 255; card++)
{
- printf("No sound device directory\n");
- }
- else
- {
- dinfo = readdir(dir);
- last_card = 255;
- last_device = 255;
- while (dinfo != NULL)
+ sprintf(filename, "/proc/asound/card%d/usbid", card);
+ fp = fopen((const char *)filename, "r");
+ if(fp != NULL)
{
- if (strncmp(dinfo->d_name, "pcm", 3) == 0)
+ fgets(line, 81, fp);
+ sscanf( line, "%4x:%4x", &vid, &pid);
+ fclose(fp);
+ if((vid == TUX_VID) && (pid == TUX_PID))
{
- count = sscanf(dinfo->d_name, "pcmC%dD%d", &card, &device);
- if ((count == 2) && ((last_card != card) ||
- (last_device != device)))
- {
- last_card = card;
- last_device = device;
- sprintf(filename, "/proc/asound/card%d/usbbus", card);
- fp = fopen((const char *)filename, "r");
- if(fp != NULL)
- {
- fclose(fp);
- sprintf(hw_device, "hw:%d,%d", card, device);
- }
- sprintf(filename, "/proc/asound/card%d/usbid", card);
- fp = fopen((const char *)filename, "r");
- if(fp != NULL)
- {
- fgets(line, 81, fp);
- sscanf( line, "%4x:%4x", &vid, &pid);
- fclose(fp);
- if((vid == TUX_VID) && (pid == TUX_PID))
- {
- /* Todo log this */
- sprintf(hw_audio_name, "%s", hw_device);
- return;
- }
- }
- }
+ /* Todo log this */
+ sprintf(hw_audio_name, "hw:%d,0", card);
+ return;
}
- dinfo = readdir(dir);
}
- closedir(dir);
- }
+ }
}
#endif /* WIN32 || UNIX */
@@ -591,91 +554,10 @@
/**
*
*/
-/* TODO : It has surely a better way to do this. */
static int
parse_wavs(char *src_str, tokens_t *toks)
{
- tokens_t tokens;
- char tok[10] = "%[^|]%[|]";
- char reg_ex[2560] = "";
- char ts[8] = "";
- int i;
-
- for (i = 0; i < 256; i++)
- {
- strncat(reg_ex, tok, sizeof(tok) - 1);
- }
-
- i = sscanf(src_str, reg_ex,
- tokens[0], ts, tokens[1], ts, tokens[2], ts, tokens[3], ts,
- tokens[4], ts, tokens[5], ts, tokens[6], ts, tokens[7], ts,
- tokens[8], ts, tokens[9], ts, tokens[10], ts, tokens[11], ts,
- tokens[12], ts, tokens[13], ts, tokens[14], ts, tokens[15], ts,
- tokens[16], ts, tokens[17], ts, tokens[18], ts, tokens[19], ts,
- tokens[20], ts, tokens[21], ts, tokens[22], ts, tokens[23], ts,
- tokens[24], ts, tokens[25], ts, tokens[26], ts, tokens[27], ts,
- tokens[28], ts, tokens[29], ts, tokens[30], ts, tokens[31], ts,
- tokens[32], ts, tokens[33], ts, tokens[34], ts, tokens[35], ts,
- tokens[36], ts, tokens[37], ts, tokens[38], ts, tokens[39], ts,
- tokens[40], ts, tokens[41], ts, tokens[42], ts, tokens[43], ts,
- tokens[44], ts, tokens[45], ts, tokens[46], ts, tokens[47], ts,
- tokens[48], ts, tokens[49], ts, tokens[50], ts, tokens[51], ts,
- tokens[52], ts, tokens[53], ts, tokens[54], ts, tokens[55], ts,
- tokens[56], ts, tokens[57], ts, tokens[58], ts, tokens[59], ts,
- tokens[60], ts, tokens[61], ts, tokens[62], ts, tokens[63], ts,
- tokens[64], ts, tokens[65], ts, tokens[66], ts, tokens[67], ts,
- tokens[68], ts, tokens[69], ts, tokens[70], ts, tokens[71], ts,
- tokens[72], ts, tokens[73], ts, tokens[74], ts, tokens[75], ts,
- tokens[76], ts, tokens[77], ts, tokens[78], ts, tokens[79], ts,
- tokens[80], ts, tokens[81], ts, tokens[82], ts, tokens[83], ts,
- tokens[84], ts, tokens[85], ts, tokens[86], ts, tokens[87], ts,
- tokens[88], ts, tokens[89], ts, tokens[90], ts, tokens[91], ts,
- tokens[92], ts, tokens[93], ts, tokens[94], ts, tokens[95], ts,
- tokens[96], ts, tokens[97], ts, tokens[98], ts, tokens[99], ts,
- tokens[100], ts, tokens[101], ts, tokens[102], ts, tokens[103], ts,
- tokens[104], ts, tokens[105], ts, tokens[106], ts, tokens[107], ts,
- tokens[108], ts, tokens[109], ts, tokens[110], ts, tokens[111], ts,
- tokens[112], ts, tokens[113], ts, tokens[114], ts, tokens[115], ts,
- tokens[116], ts, tokens[117], ts, tokens[118], ts, tokens[119], ts,
- tokens[120], ts, tokens[121], ts, tokens[122], ts, tokens[123], ts,
- tokens[124], ts, tokens[125], ts, tokens[126], ts, tokens[127], ts,
- tokens[128], ts, tokens[129], ts, tokens[130], ts, tokens[131], ts,
- tokens[132], ts, tokens[133], ts, tokens[134], ts, tokens[135], ts,
- tokens[136], ts, tokens[137], ts, tokens[138], ts, tokens[139], ts,
- tokens[140], ts, tokens[141], ts, tokens[142], ts, tokens[143], ts,
- tokens[144], ts, tokens[145], ts, tokens[146], ts, tokens[147], ts,
- tokens[148], ts, tokens[149], ts, tokens[150], ts, tokens[151], ts,
- tokens[152], ts, tokens[153], ts, tokens[154], ts, tokens[155], ts,
- tokens[156], ts, tokens[157], ts, tokens[158], ts, tokens[159], ts,
- tokens[160], ts, tokens[161], ts, tokens[162], ts, tokens[163], ts,
- tokens[164], ts, tokens[165], ts, tokens[166], ts, tokens[167], ts,
- tokens[168], ts, tokens[169], ts, tokens[170], ts, tokens[171], ts,
- tokens[172], ts, tokens[173], ts, tokens[174], ts, tokens[175], ts,
- tokens[176], ts, tokens[177], ts, tokens[178], ts, tokens[179], ts,
- tokens[180], ts, tokens[181], ts, tokens[182], ts, tokens[183], ts,
- tokens[184], ts, tokens[185], ts, tokens[186], ts, tokens[187], ts,
- tokens[188], ts, tokens[189], ts, tokens[190], ts, tokens[191], ts,
- tokens[192], ts, tokens[193], ts, tokens[194], ts, tokens[195], ts,
- tokens[196], ts, tokens[197], ts, tokens[198], ts, tokens[199], ts,
- tokens[200], ts, tokens[201], ts, tokens[202], ts, tokens[203], ts,
- tokens[204], ts, tokens[205], ts, tokens[206], ts, tokens[207], ts,
- tokens[208], ts, tokens[209], ts, tokens[210], ts, tokens[211], ts,
- tokens[212], ts, tokens[213], ts, tokens[214], ts, tokens[215], ts,
- tokens[216], ts, tokens[217], ts, tokens[218], ts, tokens[219], ts,
- tokens[220], ts, tokens[221], ts, tokens[222], ts, tokens[223], ts,
- tokens[224], ts, tokens[225], ts, tokens[226], ts, tokens[227], ts,
- tokens[228], ts, tokens[229], ts, tokens[230], ts, tokens[231], ts,
- tokens[232], ts, tokens[233], ts, tokens[234], ts, tokens[235], ts,
- tokens[236], ts, tokens[237], ts, tokens[238], ts, tokens[239], ts,
- tokens[240], ts, tokens[241], ts, tokens[242], ts, tokens[243], ts,
- tokens[244], ts, tokens[245], ts, tokens[246], ts, tokens[247], ts,
- tokens[248], ts, tokens[249], ts, tokens[250], ts, tokens[251], ts,
- tokens[252], ts, tokens[253], ts, tokens[254], ts, tokens[255], ts);
-
- memcpy(toks, &tokens, sizeof(tokens_t));
-
- i -= i / 2;
- return i;
+ return tux_cmd_parser_get_tokens(src_str, toks, 256, "|");
}
/**
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c 2008-04-22 12:48:24 UTC (rev 1003)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c 2008-04-22 19:29:29 UTC (rev 1004)
@@ -91,7 +91,6 @@
tux_spinning_cmd_speed(char *speed)
{
unsigned char sp = 0;
- unsigned char fs = FINAL_ST_UNDEFINED;
bool ret;
ret = str_to_uint8(speed, &sp);
@@ -101,7 +100,8 @@
return false;
}
- return tux_movement_perform(MOVE_SPIN_R, 0, 0.0, sp, fs, true);
+ return tux_movement_perform(MOVE_SPIN_R, 0, 0.0, sp, FINAL_ST_UNDEFINED,
+ true);
}
@@ -109,7 +109,6 @@
tux_spinning_cmd_on(move_body_part_t movement, char *counter)
{
unsigned char cnt;
- unsigned char fs;
bool ret;
ret = str_to_uint8(counter, &cnt);
@@ -119,7 +118,8 @@
return false;
}
- return tux_movement_perform(movement, cnt, 0.0, 5, fs, false);
+ return tux_movement_perform(movement, cnt, 0.0, 5, FINAL_ST_UNDEFINED,
+ false);
}
/**
|
|
From: remi <c2m...@c2...> - 2008-04-22 12:48:25
|
Author: remi
Date: 2008-04-22 14:48:24 +0200 (Tue, 22 Apr 2008)
New Revision: 1003
Added:
software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.pas
software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.py
Log:
Added a wrapper for pascal and a wrapper for python
Added: software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.pas
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.pas (rev 0)
+++ software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.pas 2008-04-22 12:48:24 UTC (rev 1003)
@@ -0,0 +1,227 @@
+{*
+ * Tux Droid - Driver
+ * 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.
+ *}
+
+unit tux_driver;
+
+interface
+
+uses
+ Windows, classes;
+
+const
+
+ DLL_NAME = 'tux_driver.dll';
+
+ {**
+ * Error codes enumeration.
+ *}
+ E_TUXDRV_BEGIN = 256;
+ E_TUXDRV_NOERROR = 0;
+ E_TUXDRV_PARSERISDISABLED = E_TUXDRV_BEGIN;
+ E_TUXDRV_INVALIDCOMMAND = E_TUXDRV_BEGIN + 1;
+ E_TUXDRV_STACKOVERFLOW = E_TUXDRV_BEGIN + 2;
+ E_TUXDRV_FILEERROR = E_TUXDRV_BEGIN + 3;
+ E_TUXDRV_BADWAVFILE = E_TUXDRV_BEGIN + 4;
+ E_TUXDRV_INVALIDIDENTIFIER = E_TUXDRV_BEGIN + 5;
+ E_TUXDRV_INVALIDNAME = E_TUXDRV_BEGIN + 6;
+ E_TUXDRV_INVALIDPARAMETER = E_TUXDRV_BEGIN + 7;
+ E_TUXDRV_BUSY = E_TUXDRV_BEGIN + 8;
+ E_TUXDRV_WAVSIZEEXCEDED = E_TUXDRV_BEGIN + 9;
+
+ {**
+ * Id enumeration of high level status.
+ *}
+ SW_ID_WINGS_POSITION = 0;
+ SW_ID_WINGS_REMAINING_MVM = 1;
+ SW_ID_SPINNING_DIRECTION = 2;
+ SW_ID_SPINNING_REMAINING_MVM = 3;
+ SW_ID_LEFT_WING_BUTTON = 4;
+ SW_ID_RIGHT_WING_BUTTON = 5;
+ SW_ID_HEAD_BUTTON = 6;
+ SW_ID_REMOTE_BUTTON = 7;
+ SW_ID_MOUTH_POSITION = 8;
+ SW_ID_MOUTH_REMAINING_MVM = 9;
+ SW_ID_EYES_POSITION = 10;
+ SW_ID_EYES_REMAINING_MVM = 11;
+ SW_ID_DESCRIPTOR_COMPLETE = 12;
+ SW_ID_RF_STATE = 13;
+ SW_ID_DONGLE_PLUG = 14;
+ SW_ID_CHARGER_STATE = 15;
+ SW_ID_BATTERY_LEVEL = 16;
+ SW_ID_BATTERY_STATE = 17;
+ SW_ID_LIGHT_LEVEL = 18;
+ SW_ID_LEFT_LED_STATE = 19;
+ SW_ID_RIGHT_LED_STATE = 20;
+ SW_ID_CONNECTION_QUALITY = 21;
+ SW_ID_AUDIO_FLASH_PLAY = 22;
+ SW_ID_AUDIO_GENERAL_PLAY = 23;
+ SW_ID_FLASH_PROG_CURR_TRACK = 24;
+ SW_ID_FLASH_PROG_LAST_TRACK_SIZE = 25;
+ SW_ID_TUXCORE_SYMBOLIC_VERSION = 26;
+ SW_ID_TUXAUDIO_SYMBOLIC_VERSION = 27;
+ SW_ID_FUXUSB_SYMBOLIC_VERSION = 28;
+ SW_ID_FUXRF_SYMBOLIC_VERSION = 29;
+ SW_ID_TUXRF_SYMBOLIC_VERSION = 30;
+ SW_ID_DRIVER_SYMBOLIC_VERSION = 31;
+ SW_ID_SOUND_REFLASH_BEGIN = 32;
+ SW_ID_SOUND_REFLASH_END = 33;
+ SW_ID_SOUND_REFLASH_CURRENT_TRACK = 34;
+
+type
+
+ {**
+ * Simple callback definition.
+ *}
+ drv_simple_callback_t = procedure;
+
+ {**
+ * Status callback definition.
+ *}
+ drv_status_callback_t = procedure(status:PChar); cdecl;
+
+ {**
+ * Logging target
+ *}
+ log_target_t = (
+ LOG_TARGET_TUX = 0,
+ LOG_TARGET_SHELL
+ );
+
+ {**
+ * Logging levels, in increasing priorities
+ *}
+ log_level_t = (
+ LOG_LEVEL_DEBUG = 0,
+ LOG_LEVEL_INFO,
+ LOG_LEVEL_WARNING,
+ LOG_LEVEL_ERROR,
+ LOG_LEVEL_NONE
+ );
+
+ {**
+ * Descriptor structure of a firmaware.
+ *}
+ p_firmware_descriptor_t = ^firmware_descriptor_t;
+ firmware_descriptor_t = packed record
+ cpu_id : integer;
+ version_major : cardinal;
+ version_minor : cardinal;
+ version_update : cardinal;
+ revision : cardinal;
+ rlmmr : cardinal;
+ author : cardinal;
+ variation : cardinal;
+ version_string : packed array[0..255] of char;
+ end;
+
+ {**
+ * Descriptor structure of sound flash.
+ *}
+ p_sound_flash_descriptor_t = ^sound_flash_descriptor_t;
+ sound_flash_descriptor_t = packed record
+ number_of_sounds : cardinal;
+ flash_usage : cardinal;
+ available_record_time : cardinal;
+ end;
+
+ {**
+ * Descriptor structure of ID connection.
+ *}
+ p_id_descriptor_t = ^id_descriptor_t;
+ id_descriptor_t = packed record
+ number : cardinal;
+ end;
+
+ {**
+ * Global descriptor structure of tuxdroid.
+ *}
+ p_tux_descriptor_t = ^tux_descriptor_t;
+ tux_descriptor_t = packed record
+ firmwares : packed record
+ package : p_firmware_descriptor_t;
+ tuxcore : p_firmware_descriptor_t;
+ tuxaudio : p_firmware_descriptor_t;
+ tuxrf : p_firmware_descriptor_t;
+ fuxrf : p_firmware_descriptor_t;
+ fuxusb : p_firmware_descriptor_t;
+ end;
+ driver : packed record
+ version_major : cardinal;
+ version_minor : cardinal;
+ version_update : cardinal;
+ version_build : cardinal;
+ version_state : packed array[0..99] of char;
+ version_string : packed array[0..99] of char;
+ end;
+ sound_flash : p_sound_flash_descriptor_t;
+ id : p_id_descriptor_t;
+ end;
+
+{**
+ * DLL static linkage.
+ *}
+procedure TuxDrv_Start; cdecl;
+ external DLL_NAME name 'TuxDrv_Start';
+procedure TuxDrv_Stop; cdecl;
+ external DLL_NAME name 'TuxDrv_Stop';
+procedure TuxDrv_SetStatusCallback(funct:drv_status_callback_t); cdecl;
+ external DLL_NAME name 'TuxDrv_SetStatusCallback';
+procedure TuxDrv_SetEndCycleCallback(funct:drv_simple_callback_t); cdecl;
+ external DLL_NAME name 'TuxDrv_SetEndCycleCallback';
+procedure TuxDrv_SetDongleConnectedCallback(funct:drv_simple_callback_t); cdecl;
+ external DLL_NAME name 'TuxDrv_SetDongleConnectedCallback';
+procedure TuxDrv_SetDongleDisconnectedCallback(funct:drv_simple_callback_t); cdecl;
+ external DLL_NAME name 'TuxDrv_SetDongleDisconnectedCallback';
+function TuxDrv_PerformCommand(delay:real; cmd_str:PChar):integer; cdecl;
+ external DLL_NAME name 'TuxDrv_PerformCommand';
+function TuxDrv_PerformMacroFile(file_path:PChar):integer; cdecl;
+ external DLL_NAME name 'TuxDrv_PerformMacroFile';
+function TuxDrv_PerformMacroText(macro:PChar):integer; cdecl;
+ external DLL_NAME name 'TuxDrv_PerformMacroText';
+function TuxDrv_GetStatusName(id:integer; name:PChar):integer; cdecl;
+ external DLL_NAME name 'TuxDrv_GetStatusName';
+function TuxDrv_GetStatusValue(id:integer; value:PChar):integer; cdecl;
+ external DLL_NAME name 'TuxDrv_GetStatusValue';
+function TuxDrv_GetStatusId(name:PChar; var id:integer):integer; cdecl;
+ external DLL_NAME name 'TuxDrv_GetStatusId';
+procedure TuxDrv_ClearCommandStack; cdecl;
+ external DLL_NAME name 'TuxDrv_ClearCommandStack';
+function TuxDrv_GetStatusState(id:integer; state:PChar):integer; cdecl;
+ external DLL_NAME name 'TuxDrv_GetStatusState';
+procedure TuxDrv_GetAllStatusState(state:PChar); cdecl;
+ external DLL_NAME name 'TuxDrv_GetAllStatusState';
+function TuxDrv_SoundReflash(tracks:PChar):integer; cdecl;
+ external DLL_NAME name 'TuxDrv_SoundReflash';
+procedure TuxDrv_ResetPositions; cdecl;
+ external DLL_NAME name 'TuxDrv_ResetPositions';
+procedure TuxDrv_ResetDongle; cdecl;
+ external DLL_NAME name 'TuxDrv_ResetDongle';
+procedure TuxDrv_SetLogLevel(level:integer); cdecl;
+ external DLL_NAME name 'TuxDrv_SetLogLevel';
+procedure TuxDrv_SetLogTarget(target:integer); cdecl;
+ external DLL_NAME name 'TuxDrv_SetLogTarget';
+procedure TuxDrv_GetDescriptor(tux_desc:p_tux_descriptor_t); cdecl;
+ external DLL_NAME name 'TuxDrv_GetDescriptor';
+function TuxDrv_StrError(error_code:integer):PChar; cdecl;
+ external DLL_NAME name 'TuxDrv_StrError';
+
+implementation
+
+end.
Added: software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.py
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.py (rev 0)
+++ software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.py 2008-04-22 12:48:24 UTC (rev 1003)
@@ -0,0 +1,383 @@
+# Tux Droid - Driver
+# 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.
+
+from ctypes import *
+import os
+
+E_TUXDRV_BEGIN = 256
+E_TUXDRV_NOERROR = 0
+E_TUXDRV_PARSERISDISABLED = E_TUXDRV_BEGIN
+E_TUXDRV_INVALIDCOMMAND = E_TUXDRV_BEGIN + 1
+E_TUXDRV_STACKOVERFLOW = E_TUXDRV_BEGIN + 2
+E_TUXDRV_FILEERROR = E_TUXDRV_BEGIN + 3
+E_TUXDRV_BADWAVFILE = E_TUXDRV_BEGIN + 4
+E_TUXDRV_INVALIDIDENTIFIER = E_TUXDRV_BEGIN + 5
+E_TUXDRV_INVALIDNAME = E_TUXDRV_BEGIN + 6
+E_TUXDRV_INVALIDPARAMETER = E_TUXDRV_BEGIN + 7
+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_SPINNING_DIRECTION = 2
+SW_ID_SPINNING_REMAINING_MVM = 3
+SW_ID_LEFT_WING_BUTTON = 4
+SW_ID_RIGHT_WING_BUTTON = 5
+SW_ID_HEAD_BUTTON = 6
+SW_ID_REMOTE_BUTTON = 7
+SW_ID_MOUTH_POSITION = 8
+SW_ID_MOUTH_REMAINING_MVM = 9
+SW_ID_EYES_POSITION = 10
+SW_ID_EYES_REMAINING_MVM = 11
+SW_ID_DESCRIPTOR_COMPLETE = 12
+SW_ID_RF_STATE = 13
+SW_ID_DONGLE_PLUG = 14
+SW_ID_CHARGER_STATE = 15
+SW_ID_BATTERY_LEVEL = 16
+SW_ID_BATTERY_STATE = 17
+SW_ID_LIGHT_LEVEL = 18
+SW_ID_LEFT_LED_STATE = 19
+SW_ID_RIGHT_LED_STATE = 20
+SW_ID_CONNECTION_QUALITY = 21
+SW_ID_AUDIO_FLASH_PLAY = 22
+SW_ID_AUDIO_GENERAL_PLAY = 23
+SW_ID_FLASH_PROG_CURR_TRACK = 24
+SW_ID_FLASH_PROG_LAST_TRACK_SIZE = 25
+SW_ID_TUXCORE_SYMBOLIC_VERSION = 26
+SW_ID_TUXAUDIO_SYMBOLIC_VERSION = 27
+SW_ID_FUXUSB_SYMBOLIC_VERSION = 28
+SW_ID_FUXRF_SYMBOLIC_VERSION = 29
+SW_ID_TUXRF_SYMBOLIC_VERSION = 30
+SW_ID_DRIVER_SYMBOLIC_VERSION = 31
+SW_ID_SOUND_REFLASH_BEGIN = 32
+SW_ID_SOUND_REFLASH_END = 33
+
+SW_NAME_DRIVER = [
+ "wings_position",
+ "wings_remaining_movements",
+ "spinning_direction",
+ "spinning_remaining_movements",
+ "left_wing_button",
+ "right_wing_button",
+ "head_button",
+ "remote_button",
+ "mouth_position",
+ "mouth_remaining_movements",
+ "eyes_position",
+ "eyes_remaining_movements",
+ "descriptor_complete",
+ "radio_state",
+ "dongle_plug",
+ "charger_state",
+ "battery_level",
+ "battery_state",
+ "light_level",
+ "left_led_state",
+ "right_led_state",
+ "connection_quality",
+ "audio_flash_play",
+ "audio_general_play",
+ "flash_programming_current_track",
+ "flash_programming_last_track_size",
+ "tuxcore_symbolic_version",
+ "tuxaudio_symbolic_version",
+ "fuxusb_symbolic_version",
+ "fuxrf_symbolic_version",
+ "tuxrf_symbolic_version",
+ "driver_symbolic_version",
+ "sound_reflash_begin",
+ "sound_reflash_end"
+]
+
+LOG_LEVEL_DEBUG = 0
+LOG_LEVEL_INFO = 1
+LOG_LEVEL_WARNING = 2
+LOG_LEVEL_ERROR = 3
+LOG_LEVEL_NONE = 4
+
+LOG_TARGET_TUX = 0
+LOG_TARGET_SHELL = 1
+
+TUX_DRIVER_STATUS_CALLBACK = CFUNCTYPE(None, c_char_p)
+TUX_DRIVER_SIMPLE_CALLBACK = CFUNCTYPE(None)
+
+class TuxDrv(object):
+
+ def __init__(self, library_path):
+ self.__callback_container = []
+ self.tux_driver_lib = None
+ if os.path.isfile(library_path):
+ try:
+ self.tux_driver_lib = CDLL(library_path)
+ except:
+ pass
+
+ def SetStatusCallback(self, funct = None):
+ if self.tux_driver_lib == None:
+ return
+
+ if funct == None:
+ return
+
+ cb = TUX_DRIVER_STATUS_CALLBACK(funct)
+ self.__callback_container.append(cb)
+ self.tux_driver_lib.TuxDrv_SetStatusCallback(cb)
+ return
+
+ def SetEndCycleCallback(self, funct = None):
+ if self.tux_driver_lib == None:
+ return
+
+ if funct == None:
+ return
+
+ cb = TUX_DRIVER_SIMPLE_CALLBACK(funct)
+ self.__callback_container.append(cb)
+ self.tux_driver_lib.TuxDrv_SetEndCycleCallback(cb)
+ return
+
+ def SetDongleConnectedCallback(self, funct = None):
+ if self.tux_driver_lib == None:
+ return
+
+ if funct == None:
+ return
+
+ cb = TUX_DRIVER_SIMPLE_CALLBACK(funct)
+ self.__callback_container.append(cb)
+ self.tux_driver_lib.TuxDrv_SetDongleConnectedCallback(cb)
+ return
+
+ def SetDongleDisconnectedCallback(self, funct = None):
+ if self.tux_driver_lib == None:
+ return
+
+ if funct == None:
+ return
+
+ cb = TUX_DRIVER_SIMPLE_CALLBACK(funct)
+ self.__callback_container.append(cb)
+ self.tux_driver_lib.TuxDrv_SetDongleDisconnectedCallback(cb)
+ return
+
+ def Start(self):
+ if self.tux_driver_lib == None:
+ return
+
+ self.tux_driver_lib.TuxDrv_Start()
+
+ def Stop(self):
+ if self.tux_driver_lib == None:
+ return
+
+ self.tux_driver_lib.TuxDrv_Stop()
+
+
+ def PerformCommand(self, delay, command):
+ if self.tux_driver_lib == None:
+ return E_TUXDRV_PARSERISDISABLED
+
+ ret = self.tux_driver_lib.TuxDrv_PerformCommand(c_double(delay), c_char_p(command))
+
+ return ret
+
+ def PerformMacroFile(self, file_path = ""):
+ if self.tux_driver_lib == None:
+ return E_TUXDRV_PARSERISDISABLED
+
+ ret = self.tux_driver_lib.TuxDrv_PerformMacroFile(c_char_p(file_path))
+
+ return ret
+
+ def PerformMacroText(self, macro = ""):
+ if self.tux_driver_lib == None:
+ return E_TUXDRV_PARSERISDISABLED
+
+ ret = self.tux_driver_lib.TuxDrv_PerformMacroText(c_char_p(macro))
+
+ return ret
+
+ def ClearCommandStack(self):
+ if self.tux_driver_lib == None:
+ return
+
+ self.tux_driver_lib.TuxDrv_ClearCommandStack()
+
+ return
+
+ def SoundReflash(self, tracks = ""):
+ if self.tux_driver_lib == None:
+ return E_TUXDRV_BUSY
+
+ ret = self.tux_driver_lib.TuxDrv_SoundReflash(c_char_p(tracks))
+
+ return ret
+
+ def GetStatusId(self, name = "battery_level"):
+ if self.tux_driver_lib == None:
+ return -1
+
+ idc = c_int(0)
+ idcp = pointer(idc)
+ ret = self.tux_driver_lib.TuxDrv_GetStatusId(c_char_p(name), idcp)
+
+ if ret != E_TUXDRV_NOERROR:
+ idc.value = -1
+
+ return idc.value
+
+ def GetStatusName(self, id = 0):
+ if self.tux_driver_lib == None:
+ return "UNDEFINED"
+
+ result = " " * 256
+ ret = self.tux_driver_lib.TuxDrv_GetStatusName(c_int(id),
+ c_char_p(result))
+ result = result.replace(" ", "")
+
+ if ret == E_TUXDRV_NOERROR:
+ return result
+ else:
+ return "UNDEFINED"
+
+ def SetLogLevel(self, level = LOG_LEVEL_INFO):
+ if self.tux_driver_lib == None:
+ return
+
+ self.tux_driver_lib.TuxDrv_SetLogLevel(c_uint8(level))
+
+ def SetLogTarget(self, target = LOG_TARGET_SHELL):
+ if self.tux_driver_lib == None:
+ return
+
+ self.tux_driver_lib.TuxDrv_SetLogTarget(c_uint8(target))
+
+ def GetStatusState(self, id = 0):
+ if self.tux_driver_lib == None:
+ return "UNDEFINED"
+
+ result = " " * 256
+ ret = self.tux_driver_lib.TuxDrv_GetStatusState(c_int(id),
+ c_char_p(result))
+ result = result.replace(" ", "")
+
+ if ret == E_TUXDRV_NOERROR:
+ return result
+ else:
+ return "UNDEFINED"
+
+ def GetStatusValue(self, id = 0):
+ if self.tux_driver_lib == None:
+ return "UNDEFINED"
+
+ result = " " * 256
+ ret = self.tux_driver_lib.TuxDrv_GetStatusValue(c_int(id),
+ c_char_p(result))
+ result = result.replace(" ", "")
+
+ if ret == E_TUXDRV_NOERROR:
+ return result
+ else:
+ return "UNDEFINED"
+
+ def GetAllStatusState(self):
+ if self.tux_driver_lib == None:
+ return ""
+
+ result = " " * 8182
+ self.tux_driver_lib.TuxDrv_GetAllStatusState(c_char_p(result))
+ result = result.replace(" ", "")
+
+ return result
+
+ def TokenizeStatus(self, status = ""):
+ if self.tux_driver_lib == None:
+ return []
+
+ result = status.split(":")
+ if len(result) == 1:
+ if result[0] == '':
+ result = []
+ return result
+
+ def ResetPositions(self):
+ if self.tux_driver_lib == None:
+ return
+
+ self.tux_driver_lib.TuxDrv_ResetPositions()
+
+ return
+
+ def ResetDongle(self):
+ if self.tux_driver_lib == None:
+ return
+
+ self.tux_driver_lib.TuxDrv_ResetDongle()
+
+ return
+
+ def GetStatusStruct(self, status = ""):
+ result = {'name' : "None", 'value' : None, 'delay' : 0.0}
+
+ if self.tux_driver_lib == None:
+ return result
+
+ status_s = self.TokenizeStatus(status)
+ if len(status_s) == 0:
+ return result
+
+ result['name'] = status_s[0]
+ result['delay'] = status_s[3]
+
+ if status_s[1] in ['uint8', 'int8', 'int', 'float', 'bool']:
+ result['value'] = eval(status_s[2])
+ elif status_s[1] == 'string':
+ result['value'] = status_s[2]
+
+ return result
+
+ def StrError(self, error_code):
+ if self.tux_driver_lib == None:
+ return "Shared library not found"
+
+ result = self.tux_driver_lib.TuxDrv_StrError(c_int(error_code))
+
+ return c_char_p(result).value
+
+if __name__ == "__main__":
+
+ def on_status_event(status):
+ status_struct = tux_drv.GetStatusStruct(status)
+ print status_struct
+
+ def on_dongle_connected():
+ tux_drv.ResetPositions()
+ print tux_drv.GetAllStatusState()
+ print tux_drv.GetStatusName(0)
+ print tux_drv.GetStatusValue(0)
+ print tux_drv.GetStatusState(0)
+
+ if os.name == 'nt':
+ tux_drv = TuxDrv('../win32/tux_driver.dll')
+ else:
+ tux_drv = TuxDrv('../unix/tux_driver.so')
+
+ tux_drv.SetLogLevel(LOG_LEVEL_INFO)
+ tux_drv.SetStatusCallback(on_status_event)
+ tux_drv.SetDongleConnectedCallback(on_dongle_connected)
+ tux_drv.Start()
|
|
From: eFfeM <c2m...@c2...> - 2008-04-21 19:49:38
|
Author: eFfeM
Date: 2008-04-21 21:49:42 +0200 (Mon, 21 Apr 2008)
New Revision: 1002
Modified:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c
Log:
factor out some common code and put it in a local helper function
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c 2008-04-21 19:17:27 UTC (rev 1001)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c 2008-04-21 19:49:42 UTC (rev 1002)
@@ -104,14 +104,12 @@
return tux_movement_perform(MOVE_SPIN_R, 0, 0.0, sp, fs, true);
}
-/**
- *
- */
-LIBLOCAL bool
-tux_spinning_cmd_left_on(char *counter)
+
+static bool
+tux_spinning_cmd_on(move_body_part_t movement, char *counter)
{
- unsigned char cnt = 0;
- unsigned char fs = FINAL_ST_UNDEFINED;
+ unsigned char cnt;
+ unsigned char fs;
bool ret;
ret = str_to_uint8(counter, &cnt);
@@ -121,27 +119,25 @@
return false;
}
- return tux_movement_perform(MOVE_SPIN_L, cnt, 0.0, 5, fs, false);
+ return tux_movement_perform(movement, cnt, 0.0, 5, fs, false);
}
/**
*
*/
LIBLOCAL bool
+tux_spinning_cmd_left_on(char *counter)
+{
+ return tux_spinning_cmd_on(MOVE_SPIN_L, counter);
+}
+
+/**
+ *
+ */
+LIBLOCAL bool
tux_spinning_cmd_right_on(char *counter)
{
- unsigned char cnt = 0;
- unsigned char fs = FINAL_ST_UNDEFINED;
- bool ret;
-
- ret = str_to_uint8(counter, &cnt);
-
- if (!ret)
- {
- return false;
- }
-
- return tux_movement_perform(MOVE_SPIN_R, cnt, 0.0, 5, fs, false);
+ return tux_spinning_cmd_on(MOVE_SPIN_R, counter);
}
/**
|
|
From: eFfeM <c2m...@c2...> - 2008-04-21 19:17:34
|
Author: eFfeM
Date: 2008-04-21 21:17:27 +0200 (Mon, 21 Apr 2008)
New Revision: 1001
Modified:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_error.h
software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.h
software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.h
software_suite_v2/middleware/tuxdriver/trunk/src/usb.h
Log:
converted tabs to spaces
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_error.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_error.h 2008-04-21 19:11:46 UTC (rev 1000)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_error.h 2008-04-21 19:17:27 UTC (rev 1001)
@@ -21,22 +21,22 @@
#ifndef _TUX_ERROR_H_
#define _TUX_ERROR_H_
-#define TUX_ERROR_BEGIN 256
+#define TUX_ERROR_BEGIN 256
typedef int TuxDrvError;
typedef enum
{
- E_TUXDRV_NOERROR = 0,
- E_TUXDRV_PARSERISDISABLED = TUX_ERROR_BEGIN,
- E_TUXDRV_INVALIDCOMMAND,
- E_TUXDRV_STACKOVERFLOW,
- E_TUXDRV_FILEERROR,
- E_TUXDRV_BADWAVFILE,
- E_TUXDRV_INVALIDIDENTIFIER,
- E_TUXDRV_INVALIDNAME,
- E_TUXDRV_INVALIDPARAMETER,
- E_TUXDRV_BUSY,
- E_TUXDRV_WAVSIZEEXCEDED,
+ E_TUXDRV_NOERROR = 0,
+ E_TUXDRV_PARSERISDISABLED = TUX_ERROR_BEGIN,
+ E_TUXDRV_INVALIDCOMMAND,
+ E_TUXDRV_STACKOVERFLOW,
+ E_TUXDRV_FILEERROR,
+ E_TUXDRV_BADWAVFILE,
+ E_TUXDRV_INVALIDIDENTIFIER,
+ E_TUXDRV_INVALIDNAME,
+ E_TUXDRV_INVALIDPARAMETER,
+ E_TUXDRV_BUSY,
+ E_TUXDRV_WAVSIZEEXCEDED,
} tux_drv_error_t;
extern const char *tux_error_strerror(TuxDrvError error_code);
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.h 2008-04-21 19:11:46 UTC (rev 1000)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.h 2008-04-21 19:17:27 UTC (rev 1001)
@@ -29,8 +29,8 @@
#ifdef WIN32
# include <windows.h>
# include <mmsystem.h>
-# define sleep(sec) Sleep(sec * 1000)
-# define usleep(usec) Sleep(usec / 1000)
+# define sleep(sec) Sleep(sec * 1000)
+# define usleep(usec) Sleep(usec / 1000)
# define LIBEXPORT __declspec(dllexport)
# define LIBLOCAL
#else
@@ -40,7 +40,7 @@
/**
- * Callback function prototype for simple event
+ * Callback function prototype for simple event
*/
typedef void(*simple_callback_t)(void);
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.h 2008-04-21 19:11:46 UTC (rev 1000)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.h 2008-04-21 19:17:27 UTC (rev 1001)
@@ -40,7 +40,7 @@
#define MIN_FIRMWARE_VERSION 0x030
#ifdef WIN32
-# define usb_busses usb_get_busses()
+# define usb_busses usb_get_busses()
#endif
typedef int TuxUSBError;
@@ -62,25 +62,25 @@
} tux_usb_error_code_t;
/**
- * Callback function for the frame receiving event
- * @param data A pointer to the frame
+ * Callback function for the frame receiving event
+ * @param data A pointer to the frame
*/
typedef void(*frame_callback_t)(unsigned char *data);
/**
- * Callback function prototype for the RF state event
- * @param state state of rf connection
+ * Callback function prototype for the RF state event
+ * @param state state of rf connection
*/
typedef void(*rf_state_callback_t)(unsigned char state);
/** Initialization of the module
- Some mutex are initialized in this function.
+ Some mutex are initialized in this function.
*/
extern void tux_usb_init_module(void);
/**
- * Finalization of the module
- * Some mutex are finalizaed in this function.
+ * Finalization of the module
+ * Some mutex are finalizaed in this function.
*/
extern void tux_usb_exit_module(void);
@@ -93,13 +93,13 @@
extern TuxUSBError tux_usb_capture(void);
/** Release of the usb handle
- @return An error code indicating the success of the operation.
+ @return An error code indicating the success of the operation.
(TuxUSBNoError | TuxUSBCantReleaseInterface | TuxUSBCantCloseDevice)
*/
extern TuxUSBError tux_usb_release(void);
/** Set the callback function for the frame event.
- @param funct The function will be linked
+ @param funct The function will be linked
*/
extern void tux_usb_set_frame_callback(frame_callback_t funct);
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/usb.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/usb.h 2008-04-21 19:11:46 UTC (rev 1000)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/usb.h 2008-04-21 19:17:27 UTC (rev 1001)
@@ -34,39 +34,39 @@
/*
* Device and/or Interface Class codes
*/
-#define USB_CLASS_PER_INTERFACE 0 /* for DeviceClass */
-#define USB_CLASS_AUDIO 1
-#define USB_CLASS_COMM 2
-#define USB_CLASS_HID 3
-#define USB_CLASS_PRINTER 7
-#define USB_CLASS_MASS_STORAGE 8
-#define USB_CLASS_HUB 9
-#define USB_CLASS_DATA 10
-#define USB_CLASS_VENDOR_SPEC 0xff
+#define USB_CLASS_PER_INTERFACE 0 /* for DeviceClass */
+#define USB_CLASS_AUDIO 1
+#define USB_CLASS_COMM 2
+#define USB_CLASS_HID 3
+#define USB_CLASS_PRINTER 7
+#define USB_CLASS_MASS_STORAGE 8
+#define USB_CLASS_HUB 9
+#define USB_CLASS_DATA 10
+#define USB_CLASS_VENDOR_SPEC 0xff
/*
* Descriptor types
*/
-#define USB_DT_DEVICE 0x01
-#define USB_DT_CONFIG 0x02
-#define USB_DT_STRING 0x03
-#define USB_DT_INTERFACE 0x04
-#define USB_DT_ENDPOINT 0x05
+#define USB_DT_DEVICE 0x01
+#define USB_DT_CONFIG 0x02
+#define USB_DT_STRING 0x03
+#define USB_DT_INTERFACE 0x04
+#define USB_DT_ENDPOINT 0x05
-#define USB_DT_HID 0x21
-#define USB_DT_REPORT 0x22
-#define USB_DT_PHYSICAL 0x23
-#define USB_DT_HUB 0x29
+#define USB_DT_HID 0x21
+#define USB_DT_REPORT 0x22
+#define USB_DT_PHYSICAL 0x23
+#define USB_DT_HUB 0x29
/*
* Descriptor sizes per descriptor type
*/
-#define USB_DT_DEVICE_SIZE 18
-#define USB_DT_CONFIG_SIZE 9
-#define USB_DT_INTERFACE_SIZE 9
-#define USB_DT_ENDPOINT_SIZE 7
-#define USB_DT_ENDPOINT_AUDIO_SIZE 9 /* Audio extension */
-#define USB_DT_HUB_NONVAR_SIZE 7
+#define USB_DT_DEVICE_SIZE 18
+#define USB_DT_CONFIG_SIZE 9
+#define USB_DT_INTERFACE_SIZE 9
+#define USB_DT_ENDPOINT_SIZE 7
+#define USB_DT_ENDPOINT_AUDIO_SIZE 9 /* Audio extension */
+#define USB_DT_HUB_NONVAR_SIZE 7
@@ -93,7 +93,7 @@
};
/* Endpoint descriptor */
-#define USB_MAXENDPOINTS 32
+#define USB_MAXENDPOINTS 32
struct usb_endpoint_descriptor {
unsigned char bLength;
unsigned char bDescriptorType;
@@ -104,21 +104,21 @@
unsigned char bRefresh;
unsigned char bSynchAddress;
- unsigned char *extra; /* Extra descriptors */
+ unsigned char *extra; /* Extra descriptors */
int extralen;
};
-#define USB_ENDPOINT_ADDRESS_MASK 0x0f /* in bEndpointAddress */
-#define USB_ENDPOINT_DIR_MASK 0x80
+#define USB_ENDPOINT_ADDRESS_MASK 0x0f /* in bEndpointAddress */
+#define USB_ENDPOINT_DIR_MASK 0x80
-#define USB_ENDPOINT_TYPE_MASK 0x03 /* in bmAttributes */
-#define USB_ENDPOINT_TYPE_CONTROL 0
-#define USB_ENDPOINT_TYPE_ISOCHRONOUS 1
-#define USB_ENDPOINT_TYPE_BULK 2
-#define USB_ENDPOINT_TYPE_INTERRUPT 3
+#define USB_ENDPOINT_TYPE_MASK 0x03 /* in bmAttributes */
+#define USB_ENDPOINT_TYPE_CONTROL 0
+#define USB_ENDPOINT_TYPE_ISOCHRONOUS 1
+#define USB_ENDPOINT_TYPE_BULK 2
+#define USB_ENDPOINT_TYPE_INTERRUPT 3
/* Interface descriptor */
-#define USB_MAXINTERFACES 32
+#define USB_MAXINTERFACES 32
struct usb_interface_descriptor {
unsigned char bLength;
unsigned char bDescriptorType;
@@ -132,11 +132,11 @@
struct usb_endpoint_descriptor *endpoint;
- unsigned char *extra; /* Extra descriptors */
+ unsigned char *extra; /* Extra descriptors */
int extralen;
};
-#define USB_MAXALTSETTING 128 /* Hard limit */
+#define USB_MAXALTSETTING 128 /* Hard limit */
struct usb_interface {
struct usb_interface_descriptor *altsetting;
@@ -145,7 +145,7 @@
};
/* Configuration descriptor information.. */
-#define USB_MAXCONFIG 8
+#define USB_MAXCONFIG 8
struct usb_config_descriptor {
unsigned char bLength;
unsigned char bDescriptorType;
@@ -158,7 +158,7 @@
struct usb_interface *interface;
- unsigned char *extra; /* Extra descriptors */
+ unsigned char *extra; /* Extra descriptors */
int extralen;
};
@@ -191,39 +191,39 @@
/*
* Standard requests
*/
-#define USB_REQ_GET_STATUS 0x00
-#define USB_REQ_CLEAR_FEATURE 0x01
+#define USB_REQ_GET_STATUS 0x00
+#define USB_REQ_CLEAR_FEATURE 0x01
/* 0x02 is reserved */
-#define USB_REQ_SET_FEATURE 0x03
+#define USB_REQ_SET_FEATURE 0x03
/* 0x04 is reserved */
-#define USB_REQ_SET_ADDRESS 0x05
-#define USB_REQ_GET_DESCRIPTOR 0x06
-#define USB_REQ_SET_DESCRIPTOR 0x07
-#define USB_REQ_GET_CONFIGURATION 0x08
-#define USB_REQ_SET_CONFIGURATION 0x09
-#define USB_REQ_GET_INTERFACE 0x0A
-#define USB_REQ_SET_INTERFACE 0x0B
-#define USB_REQ_SYNCH_FRAME 0x0C
+#define USB_REQ_SET_ADDRESS 0x05
+#define USB_REQ_GET_DESCRIPTOR 0x06
+#define USB_REQ_SET_DESCRIPTOR 0x07
+#define USB_REQ_GET_CONFIGURATION 0x08
+#define USB_REQ_SET_CONFIGURATION 0x09
+#define USB_REQ_GET_INTERFACE 0x0A
+#define USB_REQ_SET_INTERFACE 0x0B
+#define USB_REQ_SYNCH_FRAME 0x0C
-#define USB_TYPE_STANDARD (0x00 << 5)
-#define USB_TYPE_CLASS (0x01 << 5)
-#define USB_TYPE_VENDOR (0x02 << 5)
-#define USB_TYPE_RESERVED (0x03 << 5)
+#define USB_TYPE_STANDARD (0x00 << 5)
+#define USB_TYPE_CLASS (0x01 << 5)
+#define USB_TYPE_VENDOR (0x02 << 5)
+#define USB_TYPE_RESERVED (0x03 << 5)
-#define USB_RECIP_DEVICE 0x00
-#define USB_RECIP_INTERFACE 0x01
-#define USB_RECIP_ENDPOINT 0x02
-#define USB_RECIP_OTHER 0x03
+#define USB_RECIP_DEVICE 0x00
+#define USB_RECIP_INTERFACE 0x01
+#define USB_RECIP_ENDPOINT 0x02
+#define USB_RECIP_OTHER 0x03
/*
* Various libusb API related stuff
*/
-#define USB_ENDPOINT_IN 0x80
-#define USB_ENDPOINT_OUT 0x00
+#define USB_ENDPOINT_IN 0x80
+#define USB_ENDPOINT_OUT 0x00
/* Error codes */
-#define USB_ERROR_BEGIN 500000
+#define USB_ERROR_BEGIN 500000
/*
* This is supposed to look weird. This file is generated from autoconf
@@ -245,7 +245,7 @@
struct usb_device_descriptor descriptor;
struct usb_config_descriptor *config;
- void *dev; /* Darwin support */
+ void *dev; /* Darwin support */
unsigned char devnum;
|
|
From: eFfeM <c2m...@c2...> - 2008-04-21 19:11:47
|
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);
}
/**
|
|
From: remi <c2m...@c2...> - 2008-04-21 08:53:28
|
Author: remi
Date: 2008-04-21 10:53:27 +0200 (Mon, 21 Apr 2008)
New Revision: 999
Modified:
software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.h
software_suite_v2/middleware/tuxdriver/trunk/src/log.c
software_suite_v2/middleware/tuxdriver/trunk/src/threading_uniform.h
software_suite_v2/middleware/tuxdriver/trunk/src/tux_audio.c
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_descriptor.c
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_hw_status.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_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_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_sw_status.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
software_suite_v2/middleware/tuxdriver/trunk/test/main.c
Log:
Replaced tabs by white spaces.
Modified: software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.h 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.h 2008-04-21 08:53:27 UTC (rev 999)
@@ -25,12 +25,12 @@
* extern void TuxDrv_Stop(void);
* extern const char *TuxDrv_StrError(TuxDrvError error_code);
* extern void TuxDrv_GetDescriptor(tux_descriptor_t *tux_desc);
- * extern void TuxDrv_SetStatusCallback(drv_status_callback_t funct);
- * extern void TuxDrv_SetEndCycleCallback(drv_simple_callback_t funct);
- * extern void TuxDrv_SetDongleConnectedCallback(drv_simple_callback_t funct);
- * extern void TuxDrv_SetDongleDisconnectedCallback(drv_simple_callback_t funct);
+ * extern void TuxDrv_SetStatusCallback(drv_status_callback_t funct);
+ * extern void TuxDrv_SetEndCycleCallback(drv_simple_callback_t funct);
+ * extern void TuxDrv_SetDongleConnectedCallback(drv_simple_callback_t funct);
+ * extern void TuxDrv_SetDongleDisconnectedCallback(drv_simple_callback_t funct);
* extern TuxDrvError TuxDrv_PerformCommand(double delay, char *cmd_str);
- * extern void TuxDrv_ClearCommandStack(void);
+ * extern void TuxDrv_ClearCommandStack(void);
* extern TuxDrvError TuxDrv_PerformMacroFile(char *file_path);
* extern TuxDrvError TuxDrv_PerformMacroText(char *macro);
* extern TuxDrvError TuxDrv_SoundReflash(char *tracks);
@@ -40,7 +40,7 @@
* extern TuxDrvError TuxDrv_GetStatusId(char* name, int *id);
* extern TuxDrvError TuxDrv_GetStatusState(int id, char *state);
* extern TuxDrvError TuxDrv_GetStatusValue(int id, char *value);
- * extern void TuxDrv_GetAllStatusState(char *state);
+ * extern void TuxDrv_GetAllStatusState(char *state);
* extern int TuxDrv_TokenizeStatus(char *status, drv_tokens_t *tokens);
* extern void TuxDrv_ResetPositions(void);
* extern void TuxDrv_ResetDongle(void);
@@ -104,21 +104,21 @@
/**
* Error codes
*/
-#define TUX_ERROR_BEGIN 256
+#define TUX_ERROR_BEGIN 256
typedef int TuxDrvError;
typedef enum
{
- E_TUXDRV_NOERROR = 0,
- E_TUXDRV_PARSERISDISABLED = TUX_ERROR_BEGIN,
- E_TUXDRV_INVALIDCOMMAND,
- E_TUXDRV_STACKOVERFLOW,
- E_TUXDRV_FILEERROR,
- E_TUXDRV_BADWAVFILE,
- E_TUXDRV_INVALIDIDENTIFIER,
- E_TUXDRV_INVALIDNAME,
- E_TUXDRV_INVALIDPARAMETER,
- E_TUXDRV_BUSY,
- E_TUXDRV_WAVSIZEEXCEDED,
+ E_TUXDRV_NOERROR = 0,
+ E_TUXDRV_PARSERISDISABLED = TUX_ERROR_BEGIN,
+ E_TUXDRV_INVALIDCOMMAND,
+ E_TUXDRV_STACKOVERFLOW,
+ E_TUXDRV_FILEERROR,
+ E_TUXDRV_BADWAVFILE,
+ E_TUXDRV_INVALIDIDENTIFIER,
+ E_TUXDRV_INVALIDNAME,
+ E_TUXDRV_INVALIDPARAMETER,
+ E_TUXDRV_BUSY,
+ E_TUXDRV_WAVSIZEEXCEDED,
} tux_drv_error_t;
/**
@@ -235,38 +235,38 @@
* Windows arch.
*/
#ifdef WIN32
-# ifndef LOADSYMBOL
+# ifndef LOADSYMBOL
# define LOADSYMBOL GetProcAddress
-# endif
-# ifndef CLOSELIB
-# define CLOSELIB FreeLibrary
-# endif
+# endif
+# ifndef CLOSELIB
+# define CLOSELIB FreeLibrary
+# endif
# ifndef DYNHANDLE
- typedef HMODULE DYNHANDLE;
+ typedef HMODULE DYNHANDLE;
# endif
/**
* Linux and mac arch.
*/
#else
-# ifndef HWND
-# define HWND void*
-# endif
-# ifndef HMODULE
-# define HMODULE void*
-# endif
-# include <dlfcn.h>
-# include <unistd.h>
-# include <stdlib.h>
-# include <string.h>
-# ifndef LOADSYMBOL
-# define LOADSYMBOL dlsym
-# endif
-# ifndef CLOSELIB
+# ifndef HWND
+# define HWND void*
+# endif
+# ifndef HMODULE
+# define HMODULE void*
+# endif
+# include <dlfcn.h>
+# include <unistd.h>
+# include <stdlib.h>
+# include <string.h>
+# ifndef LOADSYMBOL
+# define LOADSYMBOL dlsym
+# endif
+# ifndef CLOSELIB
# define CLOSELIB dlclose
-# endif
-# ifndef DYNHANDLE
- typedef void* DYNHANDLE;
-# endif
+# endif
+# ifndef DYNHANDLE
+ typedef void* DYNHANDLE;
+# endif
#endif
/**
* Common arch.
@@ -279,7 +279,7 @@
#endif
#ifndef DYN
# define DYN(x) x=( LP_##x )LOADSYMBOL(hMod,#x);
-#endif
+#endif
/**
* Function prototypes
@@ -384,20 +384,23 @@
const char *lpsz;
{
- HMODULE hMod = NULL;
+ HMODULE hMod = NULL;
#ifdef WIN32
- hMod = LoadLibrary(lpsz);
- if(!hMod || (hMod < (HMODULE)32))
- return hMod;
+ hMod = LoadLibrary(lpsz);
+ if(!hMod || (hMod < (HMODULE)32))
+ {
+ return hMod;
+ }
#else
- hMod = dlopen(lpsz, RTLD_NOW);
- if(!hMod)
- return NULL;
-
- setenv("TUXDRIVERLIBPATH", lpsz, 1);
+ hMod = dlopen(lpsz, RTLD_NOW);
+ if(!hMod)
+ {
+ return NULL;
+ }
+ setenv("TUXDRIVERLIBPATH", lpsz, 1);
#endif
- LoadFunctions(hMod);
- return hMod;
+ LoadFunctions(hMod);
+ return hMod;
}
/**
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/log.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/log.c 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/log.c 2008-04-21 08:53:27 UTC (rev 999)
@@ -77,9 +77,9 @@
case LOG_TARGET_TUX:
log_file = fopen(LOG_FILE, "at");
if (log_file == NULL)
- {
+ {
return false;
- }
+ }
break;
case LOG_TARGET_SHELL:
@@ -185,9 +185,9 @@
r = strftime(p, size, "%F %T ", localtime(&now));
#endif
if (r == 0)
- {
+ {
return false;
- }
+ }
p += r;
size -= r;
@@ -198,9 +198,9 @@
{
r = snprintf(p, size, "%s: ", level_names[at_level]);
if (r < 0)
- {
+ {
return false;
- }
+ }
p += r;
size -= r;
@@ -211,7 +211,7 @@
va_end(al);
if (r < 0)
{
- return false;
+ return false;
}
switch (log_target)
@@ -222,13 +222,13 @@
case LOG_TARGET_SHELL:
if (at_level == LOG_LEVEL_WARNING || at_level == LOG_LEVEL_ERROR)
- {
+ {
fprintf(stderr, "tux_driver: %s\n", text);
- }
+ }
else
- {
+ {
fprintf(stdout, "tux_driver: %s\n", text);
- }
+ }
break;
}
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/threading_uniform.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/threading_uniform.h 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/threading_uniform.h 2008-04-21 08:53:27 UTC (rev 999)
@@ -4,7 +4,7 @@
* ce code a it par Smeagol(sme...@if...) et revu par
* Jerry Kan (pil...@gm...)
* pour le site
- * http://www.irrlicht.fr/ communautrancaise Irrlicht
+ * http://www.irrlicht.fr/ communautrancaise Irrlicht
*
* retrouvez ce tutoriel et beaucoup d'autres sur notre forum,
*/
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_audio.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_audio.c 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_audio.c 2008-04-21 08:53:27 UTC (rev 999)
@@ -29,7 +29,7 @@
tux_audio_cmd_channel_general(void)
{
unsigned char frame[TUX_SEND_LENGTH - 1] =
- {USB_DONGLE_AUDIO_CMD, 0, 0, 0};
+ {USB_DONGLE_AUDIO_CMD, 0, 0, 0};
return tux_usb_send_to_dongle(frame);
}
@@ -40,7 +40,7 @@
tux_audio_cmd_channel_tts(void)
{
unsigned char frame[TUX_SEND_LENGTH - 1] =
- {USB_DONGLE_AUDIO_CMD, 1, 0, 0};
+ {USB_DONGLE_AUDIO_CMD, 1, 0, 0};
return tux_usb_send_to_dongle(frame);
}
@@ -51,7 +51,7 @@
tux_audio_cmd_mute(char *value)
{
unsigned char frame[TUX_SEND_LENGTH - 1] =
- {AUDIO_MUTE_CMD, 0, 0, 0};
+ {AUDIO_MUTE_CMD, 0, 0, 0};
bool m_value;
if (!str_to_bool(value, &m_value))
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c 2008-04-21 08:53:27 UTC (rev 999)
@@ -59,54 +59,54 @@
{
last_level_for_event = new_level;
if (!hw_status_table.battery.motors_state)
- {
+ {
tux_sw_status_set_value(SW_ID_BATTERY_LEVEL,
(void *)&new_level, true);
- }
+ }
if (new_level >= TUX_BATTERY_FULL_VALUE)
- {
+ {
new_state_str = STRING_VALUE_FULL;
battery_state = FULL;
}
- else
- {
- if ((new_level < TUX_BATTERY_FULL_VALUE) &&
- (new_level >= TUX_BATTERY_HIGH_VALUE))
- {
- new_state_str = STRING_VALUE_HIGH;
- battery_state = HIGH;
- }
- else
- {
- if ((new_level < TUX_BATTERY_HIGH_VALUE) &&
- (new_level >= TUX_BATTERY_LOW_VALUE))
- {
- new_state_str = STRING_VALUE_LOW;
- battery_state = LOW;
- }
- else
- {
- new_state_str = STRING_VALUE_EMPTY;
- battery_state = EMPTY;
- }
- }
+ else
+ {
+ if ((new_level < TUX_BATTERY_FULL_VALUE) &&
+ (new_level >= TUX_BATTERY_HIGH_VALUE))
+ {
+ new_state_str = STRING_VALUE_HIGH;
+ battery_state = HIGH;
+ }
+ else
+ {
+ if ((new_level < TUX_BATTERY_HIGH_VALUE) &&
+ (new_level >= TUX_BATTERY_LOW_VALUE))
+ {
+ new_state_str = STRING_VALUE_LOW;
+ battery_state = LOW;
+ }
+ else
+ {
+ new_state_str = STRING_VALUE_EMPTY;
+ battery_state = EMPTY;
+ }
+ }
}
old_state_str = (char *)tux_sw_status_get_value(SW_ID_BATTERY_STATE);
if (strcmp(new_state_str, old_state_str))
- {
+ {
tux_sw_status_set_value(SW_ID_BATTERY_STATE, (void *)new_state_str,
true);
- }
+ }
}
else
{
if (old_level != new_level)
- {
+ {
tux_sw_status_set_value(SW_ID_BATTERY_LEVEL, (void *)&new_level,
false);
- }
+ }
}
}
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 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_cmd_parser.c 2008-04-21 08:53:27 UTC (rev 999)
@@ -110,24 +110,24 @@
if (p)
{
- while (1)
- {
- pnext = strpbrk(p, ":,");
- if (pnext)
- {
- len = pnext - p;
- strncpy((*toks)[cnt], p,len);
- ((*toks)[cnt])[len] = 0;
- cnt++;
- }
- else
- {
- strcpy((*toks)[cnt], p);
- cnt++;
- break;
- }
- p = pnext+1;
- }
+ while (1)
+ {
+ pnext = strpbrk(p, ":,");
+ if (pnext)
+ {
+ len = pnext - p;
+ strncpy((*toks)[cnt], p,len);
+ ((*toks)[cnt])[len] = 0;
+ cnt++;
+ }
+ else
+ {
+ strcpy((*toks)[cnt], p);
+ cnt++;
+ break;
+ }
+ p = pnext+1;
+ }
}
return(cnt);
}
@@ -197,175 +197,175 @@
{
/* EYES commands */
if (match_token(1, "EYES", 2))
- {
+ {
/* EYES ON */
if (match_token(2, "ON", 5))
- {
+ {
check_result(tux_eyes_cmd_on(tokens[3], tokens[4]));
/* EYES ON_DURING */
} else if (match_token(2, "ON_DURING", 5))
- {
+ {
check_result(tux_eyes_cmd_on_during(tokens[3], tokens[4]));
/* EYES OPEN */
} else if (match_token(2, "OPEN", 3))
- {
+ {
check_result(tux_eyes_cmd_open());
/* EYES CLOSE */
} else if (match_token(2, "CLOSE", 3))
- {
+ {
check_result(tux_eyes_cmd_close());
/* EYES OFF */
} else if (match_token(2, "OFF", 3))
- {
+ {
check_result(tux_eyes_cmd_off());
}
/* MOUTH commands */
} else if (match_token(1, "MOUTH", 2))
- {
+ {
/* MOUTH ON */
if (match_token(2, "ON", 5))
- {
+ {
check_result(tux_mouth_cmd_on(tokens[3], tokens[4]));
/* MOUTH ON_DURING */
} else if (match_token(2, "ON_DURING", 5))
- {
+ {
check_result(tux_mouth_cmd_on_during(tokens[3], tokens[4]));
/* MOUTH OPEN */
} else if (match_token(2, "OPEN", 3))
- {
+ {
check_result(tux_mouth_cmd_open());
/* MOUTH CLOSE */
} else if (match_token(2, "CLOSE", 3))
- {
+ {
check_result(tux_mouth_cmd_close());
/* MOUTH OFF */
} else if (match_token(2, "OFF", 3))
- {
+ {
check_result(tux_mouth_cmd_off());
}
/* WINGS commands */
} else if (match_token(1, "WINGS", 2))
- {
+ {
/* WINGS ON */
if (match_token(2, "ON", 5))
- {
+ {
check_result(tux_wings_cmd_on(tokens[3], tokens[4]));
/* WINGS ON_DURING */
} else if (match_token(2, "ON_DURING", 5))
- {
+ {
check_result(tux_wings_cmd_on_during(tokens[3], tokens[4]));
/* WINGS OPEN */
} else if (match_token(2, "UP", 3))
- {
+ {
check_result(tux_wings_cmd_up());
/* WINGS CLOSE */
} else if (match_token(2, "DOWN", 3))
- {
+ {
check_result(tux_wings_cmd_down());
/* WINGS OFF */
} else if (match_token(2, "OFF", 3))
- {
+ {
check_result(tux_wings_cmd_off());
/* WINGS SPEED */
} else if (match_token(2, "SPEED", 4))
- {
+ {
check_result(tux_wings_cmd_speed(tokens[3]));
}
/* SPINNING commands */
} else if (match_token(1, "SPINNING", 2))
- {
+ {
/* SPINNING SPEED */
if (match_token(2, "SPEED", 4))
- {
+ {
check_result(tux_spinning_cmd_speed(tokens[3]));
/* SPINNING LEFT ON */
} else if (match_token(2, "LEFT_ON", 4))
- {
+ {
check_result(tux_spinning_cmd_left_on(tokens[3]));
/* SPINNING RIGHT ON */
} else if (match_token(2, "RIGHT_ON", 4))
- {
+ {
check_result(tux_spinning_cmd_right_on(tokens[3]));
/* SPINNING LEFT ON DURING */
} else if (match_token(2, "LEFT_ON_DURING", 4))
- {
+ {
check_result(tux_spinning_cmd_left_on_during(tokens[3]));
/* SPINNING RIGHT ON DURING */
} else if (match_token(2, "RIGHT_ON_DURING", 4))
- {
+ {
check_result(tux_spinning_cmd_right_on_during(tokens[3]));
/* SPINNING OFF */
} else if (match_token(2, "OFF", 3))
- {
+ {
check_result(tux_spinning_cmd_off());
}
/* IR commands */
} else if (match_token(1, "IR", 2))
- {
+ {
/* IR ON */
if (match_token(2, "ON", 3))
- {
+ {
check_result(tux_user_inputs_cmd_ir_on());
/* IR OFF */
} else if (match_token(2, "OFF", 3))
- {
+ {
check_result(tux_user_inputs_cmd_ir_off());
/* IR SEND */
} else if (match_token(2, "SEND", 5))
- {
+ {
check_result(tux_user_inputs_cmd_ir_send(tokens[3], tokens[4]));
}
/* LED commands */
} else if (match_token(1, "LED", 2))
- {
+ {
/* LED SET */
if (match_token(2, "SET", 8))
- {
+ {
check_result(tux_leds_cmd_set(tokens[3], tokens[4],
tokens[5], tokens[6], tokens[7]));
/* LED ON */
} else if (match_token(2, "ON", 5))
- {
+ {
check_result(tux_leds_cmd_set(tokens[3], tokens[4], "NONE",
"0", "0"));
/* LED OFF */
} else if (match_token(2, "OFF", 4))
- {
+ {
check_result(tux_leds_cmd_set(tokens[3], "0.0", "NONE",
"0", "0"));
/* LED PULSE */
} else if (match_token(2, "PULSE", 11))
- {
+ {
check_result(tux_leds_cmd_pulse(tokens[3], tokens[4], tokens[5],
tokens[6], tokens[7], tokens[8], tokens[9], tokens[10]));
/* LED BLINK */
} else if (match_token(2, "BLINK", 6))
- {
+ {
check_result(tux_leds_cmd_pulse(tokens[3], "0.0", "1.0",
tokens[4], tokens[5], "NONE", "0", "0"));
}
/* SOUND FLASH commands */
} else if (match_token(1, "SOUND_FLASH", 2))
- {
+ {
/* SOUND FLASH PLAY */
if (match_token(2, "PLAY", 5))
- {
+ {
check_result(tux_sound_flash_cmd_play(tokens[3], tokens[4]));
}
/* AUDIO commands */
} else if (match_token(1, "AUDIO", 2))
- {
+ {
/* CHANNEL GENERAL */
if (match_token(2, "CHANNEL_GENERAL", 3))
- {
+ {
check_result(tux_audio_cmd_channel_general());
/* CHANNEL TTS */
} else if (match_token(2, "CHANNEL_TTS", 3))
- {
+ {
check_result(tux_audio_cmd_channel_tts());
/* MUTE */
} else if (match_token(2, "MUTE", 4))
- {
+ {
check_result(tux_audio_cmd_mute(tokens[3]));
}
}
@@ -395,28 +395,28 @@
if (sys_cmd)
{
for (i = 0; i < NRCMDS; i++)
- {
+ {
if (!strcmp(sys_cmd_stack.cmd_list[i].cmd, ""))
- {
- sprintf(sys_cmd_stack.cmd_list[i].cmd, cmd_str);
- sys_cmd_stack.cmd_list[i].timeout = delay + curtime;
- ret = E_TUXDRV_NOERROR;
+ {
+ sprintf(sys_cmd_stack.cmd_list[i].cmd, cmd_str);
+ sys_cmd_stack.cmd_list[i].timeout = delay + curtime;
+ ret = E_TUXDRV_NOERROR;
break;
}
- }
+ }
}
else
{
for (i = 0; i < NRCMDS; i++)
- {
+ {
if (!strcmp(user_cmd_stack.cmd_list[i].cmd, ""))
- {
- sprintf(user_cmd_stack.cmd_list[i].cmd, cmd_str);
- user_cmd_stack.cmd_list[i].timeout = delay + curtime;
- ret = E_TUXDRV_NOERROR;
+ {
+ sprintf(user_cmd_stack.cmd_list[i].cmd, cmd_str);
+ user_cmd_stack.cmd_list[i].timeout = delay + curtime;
+ ret = E_TUXDRV_NOERROR;
break;
}
- }
+ }
}
#ifdef USE_MUTEX
@@ -445,7 +445,7 @@
for (i = 0; i < NRCMDS; i++)
{
if (strcmp(sys_cmd_stack.cmd_list[i].cmd, ""))
- {
+ {
tux_cmd_parser_parse_command(sys_cmd_stack.cmd_list[i].cmd);
memset(&sys_cmd_stack.cmd_list[i], 0, sizeof(delay_cmd_t));
}
@@ -476,21 +476,21 @@
for (i = 0; i < NRCMDS; i++)
{
if (strcmp(user_cmd_stack.cmd_list[i].cmd, ""))
- {
+ {
if (curtime >= user_cmd_stack.cmd_list[i].timeout)
- {
+ {
tux_cmd_parser_parse_command(user_cmd_stack.cmd_list[i].cmd);
memset(&user_cmd_stack.cmd_list[i], 0, sizeof(delay_cmd_t));
}
- }
+ }
if (strcmp(sys_cmd_stack.cmd_list[i].cmd, ""))
- {
+ {
if (curtime >= sys_cmd_stack.cmd_list[i].timeout)
- {
+ {
tux_cmd_parser_parse_command(sys_cmd_stack.cmd_list[i].cmd);
memset(&sys_cmd_stack.cmd_list[i], 0, sizeof(delay_cmd_t));
}
- }
+ }
}
#ifdef USE_MUTEX
@@ -540,15 +540,15 @@
{
ret = parse_line(line_tmp);
if (ret != E_TUXDRV_NOERROR)
- {
+ {
result = ret;
- }
+ }
while ((line_tmp = strtok(NULL, lex_ret)) != NULL)
- {
+ {
ret = parse_line(line_tmp);
if (ret != E_TUXDRV_NOERROR)
- {
+ {
result = ret;
break;
}
@@ -581,13 +581,13 @@
if (macro_file)
{
while (!feof(macro_file))
- {
+ {
fgets(line, sizeof(line)-2, macro_file);
ret = parse_line(line);
if (ret != E_TUXDRV_NOERROR)
- {
+ {
result = ret;
- }
+ }
}
fclose(macro_file);
}
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_descriptor.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_descriptor.c 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_descriptor.c 2008-04-21 08:53:27 UTC (rev 999)
@@ -72,7 +72,7 @@
tux_id_dump_descriptor(descriptor);
desc_file = fopen(DESCRIPTOR_FILE_PATH, "w");
-
+
if (desc_file)
{
fprintf(desc_file, "%s\n", descriptor);
@@ -80,7 +80,7 @@
}
else
{
- printf("file error %s\n", strerror(errno));
+ printf("file error %s\n", strerror(errno));
}
}
@@ -97,10 +97,10 @@
if (f)
{
if (tux_firmware_check_new_descriptor(false)
- || tux_sound_flash_check_new_descriptor(false))
- {
+ || tux_sound_flash_check_new_descriptor(false))
+ {
tux_usb_reset();
- }
+ }
fclose(f);
}
else
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c 2008-04-21 08:53:27 UTC (rev 999)
@@ -128,7 +128,7 @@
/* Status frames */
case FRAME_HEADER_PORTS:
if (header == ret)
- {
+ {
tux_spinning_update_direction();
tux_mouth_update_position();
tux_eyes_update_position();
@@ -136,7 +136,7 @@
break;
case FRAME_HEADER_POSITION1:
if (header == ret)
- {
+ {
tux_wings_update_movements_remaining();
tux_mouth_update_movements_remaining();
tux_eyes_update_movements_remaining();
@@ -144,14 +144,14 @@
break;
case FRAME_HEADER_POSITION2:
if (header == ret)
- {
+ {
tux_wings_update_position();
tux_spinning_update_movements_remaining();
}
break;
case FRAME_HEADER_SENSORS1:
if (header == ret)
- {
+ {
tux_sound_flash_update_flash_play();
tux_sound_flash_update_general_play();
tux_user_inputs_update_head_button();
@@ -168,19 +168,19 @@
case FRAME_HEADER_BATTERY:
tux_user_inputs_update_charger_state();
if (header == ret)
- {
+ {
tux_battery_update_level();
- }
+ }
break;
case FRAME_HEADER_LIGHT:
if (header == ret)
- {
+ {
tux_light_update_level();
- }
+ }
break;
case FRAME_HEADER_LED:
if (header == ret)
- {
+ {
tux_leds_update_left();
tux_leds_update_right();
}
@@ -188,7 +188,7 @@
/* Don't work ...
case FRAME_HEADER_FLASH_PROG:
if (header == ret)
- {
+ {
tux_sound_flash_update_prog_current_track();
tux_sound_flash_update_prog_last_track_size();
}
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_eyes.c 2008-04-21 08:53:27 UTC (rev 999)
@@ -44,14 +44,14 @@
}
else
{
- if (!hw_status_table.ports.portd.bits.eyes_closed_switch)
- {
- new_position = STRING_VALUE_CLOSE;
- }
- else
- {
- new_position = STRING_VALUE_NDEF;
- }
+ if (!hw_status_table.ports.portd.bits.eyes_closed_switch)
+ {
+ new_position = STRING_VALUE_CLOSE;
+ }
+ else
+ {
+ new_position = STRING_VALUE_NDEF;
+ }
}
old_position = (char *)tux_sw_status_get_value(SW_ID_EYES_POSITION);
@@ -77,7 +77,7 @@
if (new_count != old_count)
{
tux_sw_status_set_value(SW_ID_EYES_REMAINING_MVM,
- (void *)&new_count, true);
+ (void *)&new_count, true);
}
}
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.c 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_firmware.c 2008-04-21 08:53:27 UTC (rev 999)
@@ -189,40 +189,40 @@
char tmp_str[80] = "";
sprintf(tmp_str, " CPU id : \t\t\t%d\n",
- desc->cpu_id);
+ desc->cpu_id);
strcat(descriptor, tmp_str);
sprintf(tmp_str, " CPU name : \t\t\t%s\n",
- cpu_id_to_name(desc->cpu_id));
+ cpu_id_to_name(desc->cpu_id));
strcat(descriptor, tmp_str);
sprintf(tmp_str, " Version major : \t\t%d\n",
- desc->version_major);
+ desc->version_major);
strcat(descriptor, tmp_str);
sprintf(tmp_str, " Version minor : \t\t%d\n",
- desc->version_minor);
+ desc->version_minor);
strcat(descriptor, tmp_str);
sprintf(tmp_str, " Version update : \t\t%d\n",
- desc->version_update);
+ desc->version_update);
strcat(descriptor, tmp_str);
sprintf(tmp_str, " Revision : \t\t\t%d\n",
- desc->revision);
+ desc->revision);
strcat(descriptor, tmp_str);
sprintf(tmp_str, " Released : \t\t\t%s\n",
- desc->release ? "True" : "False");
+ desc->release ? "True" : "False");
strcat(descriptor, tmp_str);
sprintf(tmp_str, " Local modification : \t%s\n",
- desc->local_modification ? "True" : "False");
+ desc->local_modification ? "True" : "False");
strcat(descriptor, tmp_str);
sprintf(tmp_str, " Mixed revisions : \t\t%s\n",
- desc->mixed_revisions ? "True" : "False");
+ desc->mixed_revisions ? "True" : "False");
strcat(descriptor, tmp_str);
sprintf(tmp_str, " Author id : \t\t%d\n",
- desc->author);
+ desc->author);
strcat(descriptor, tmp_str);
sprintf(tmp_str, " Variation : \t\t%d\n",
- desc->variation);
+ desc->variation);
strcat(descriptor, tmp_str);
sprintf(tmp_str, " Symbolic version : \t\t[%s]\n",
- desc->version_string);
+ desc->version_string);
strcat(descriptor, tmp_str);
return;
@@ -241,23 +241,23 @@
if (firmware_release_desc.version_string[0] == '\0')
{
- sprintf(tmp_str, " - %s : \t[%s]\n",
- RELEASE_STR_NAME, UNOFFICIAL_RELEASE_STR);
- strcat(descriptor, tmp_str);
+ sprintf(tmp_str, " - %s : \t[%s]\n",
+ RELEASE_STR_NAME, UNOFFICIAL_RELEASE_STR);
+ strcat(descriptor, tmp_str);
}
else
{
- sprintf(tmp_str, " - %s : \t[%s]\n",
- RELEASE_STR_NAME, firmware_release_desc.version_string);
- strcat(descriptor, tmp_str);
+ sprintf(tmp_str, " - %s : \t[%s]\n",
+ RELEASE_STR_NAME, firmware_release_desc.version_string);
+ strcat(descriptor, tmp_str);
}
-
+
for (i = 0; i < NUMBER_OF_CPU; i++)
{
- sprintf(tmp_str, " - CPU %d\n", i + 1);
- strcat(descriptor, tmp_str);
-
- dump_descriptor_of_cpu(descriptor, &firmwares_desc[i]);
+ sprintf(tmp_str, " - CPU %d\n", i + 1);
+ strcat(descriptor, tmp_str);
+
+ dump_descriptor_of_cpu(descriptor, &firmwares_desc[i]);
}
return;
@@ -382,10 +382,10 @@
else
{
- if (cpu_id == FUXRF_CPU_NUM)
- {
- tux_hw_parse_body_version(fuxrf_version);
- }
+ if (cpu_id == FUXRF_CPU_NUM)
+ {
+ tux_hw_parse_body_version(fuxrf_version);
+ }
}
tux_hw_parse_body_revision(revision);
@@ -470,22 +470,22 @@
{
if (first_rf_ver && ((cpu_num == FUXRF_CPU_NUM) ||
(cpu_num == TUXRF_CPU_NUM)))
- {
+ {
cpu_num ++;
- }
+ }
else
- {
+ {
firmware = &firmwares_desc[cpu_num];
if (!firmware->release)
- {
+ {
/* Firmware is not released -> FAIL */
return;
- }
+ }
if (!test_fw_ver(firmware, t_major, t_minor, t_update))
- {
+ {
/* Firmware have not the same version than the first one */
perfect_package = false;
- }
+ }
cpu_num ++;
}
}
@@ -496,37 +496,37 @@
/* Determine the general version major */
cpu_num = LOWEST_CPU_NUM;
while (cpu_num <= HIGHEST_CPU_NUM)
- {
+ {
firmware = &firmwares_desc[cpu_num];
if (firmware->version_major > major)
- {
+ {
major = firmware->version_major;
- }
+ }
cpu_num ++;
}
/* Determine the general version minor */
cpu_num = LOWEST_CPU_NUM;
while (cpu_num <= HIGHEST_CPU_NUM)
- {
+ {
firmware = &firmwares_desc[cpu_num];
if ((firmware->version_major == major) &&
(firmware->version_minor > minor))
- {
+ {
minor = firmware->version_minor;
- }
+ }
cpu_num ++;
}
/* Determine the general version update */
cpu_num = LOWEST_CPU_NUM;
while (cpu_num <= HIGHEST_CPU_NUM)
- {
+ {
firmware = &firmwares_desc[cpu_num];
if ((firmware->version_major == major) &&
(firmware->version_minor == minor) &&
(firmware->version_update > update))
- {
+ {
update = firmware->version_update;
- }
+ }
cpu_num ++;
}
@@ -534,21 +534,21 @@
/* release 0.3.1, tuxcore and tuxaudio updated to 0.3.1 */
if ((major == 0) && (minor == 3) && (update == 1))
- {
+ {
ret = test_fw_ver(&firmwares_desc[TUXCORE_CPU_NUM], 0, 3, 1);
ret &= test_fw_ver(&firmwares_desc[TUXAUDIO_CPU_NUM], 0, 3, 1);
ret &= test_fw_ver(&firmwares_desc[FUXUSB_CPU_NUM], 0, 3, 0);
if (!ret)
- {
+ {
/* Not official package -> FAIL */
return;
- }
+ }
}
- else
- {
+ else
+ {
/* Not other special case -> FAIL */
return;
- }
+ }
}
else
{
@@ -592,21 +592,21 @@
break;
case INFO_REQ:
if (cpu_num > HIGHEST_CPU_NUM)
- {
+ {
versioning_state = SPECIAL;
break;
}
if (firmwares_desc[cpu_num].version_string[0] == '\0')
- {
+ {
if (!retries)
- {
+ {
cpu_num++;
break;
}
if (!send_firmware_versionning_request(cpu_num))
- {
+ {
retries--;
break;
}
@@ -617,7 +617,7 @@
break;
case INFO_GET:
if (!retries)
- {
+ {
cpu_num++;
retries = TUX_FIRMWARE_RETRY_COUNT;
versioning_state = INFO_REQ;
@@ -625,7 +625,7 @@
}
if (firmwares_desc[cpu_num].version_string[0] != '\0')
- {
+ {
cpu_num++;
retries = TUX_FIRMWARE_RETRY_COUNT;
versioning_state = INFO_REQ;
@@ -635,23 +635,23 @@
break;
case SPECIAL:
if (firmwares_desc[TUXRF_CPU_NUM].version_string[0] == '\0')
- {
+ {
special_old_versionning(TUXRF_CPU_NUM);
- }
+ }
if (firmwares_desc[FUXRF_CPU_NUM].version_string[0] == '\0')
- {
+ {
special_old_versionning(FUXRF_CPU_NUM);
- }
+ }
/* TODO : old FUXUSB cpu */
if ((firmwares_desc[TUXCORE_CPU_NUM].version_string[0] == '\0') ||
(firmwares_desc[TUXAUDIO_CPU_NUM].version_string[0] == '\0'))
- {
+ {
versioning_state = INIT;
- }
+ }
else
- {
+ {
versioning_state = RELEASE;
- }
+ }
break;
case RELEASE:
determine_release_package();
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_status.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_status.c 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_status.c 2008-04-21 08:53:27 UTC (rev 999)
@@ -177,7 +177,7 @@
for (i = 0; i < 16; i++)
{
if ((tux_hw_status_header_counter[i] > 1) && (p_count > 12))
- {
+ {
log_debug("Frames counter (%d) :\n\t%s:[%d]\n\t%s:[%d]\n\
\r\t%s:[%d]\n\t%s:[%d]\n\t%s:[%d]\n\t%s:[%d]\n\t%s:[%d]\n\
\r\t%s:[%d]\n\t%s:[%d]\n\t%s:[%d]\n\t%s:[%d]\n\t%s:[%d]\n\
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.c 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_id.c 2008-04-21 08:53:27 UTC (rev 999)
@@ -60,7 +60,7 @@
tux_id_update_number(void)
{
id_desc.number = (hw_status_table.id.msb_number << 8)
- + hw_status_table.id.lsb_number;
+ + hw_status_table.id.lsb_number;
}
/**
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.c 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.c 2008-04-21 08:53:27 UTC (rev 999)
@@ -139,7 +139,7 @@
if (strcmp(new_right_state, old_right_state))
{
tux_sw_status_set_value(SW_ID_RIGHT_LED_STATE,
- (void *)new_right_state, true);
+ (void *)new_right_state, true);
}
}
@@ -267,7 +267,7 @@
*/
static int
led_configure_effects(leds_t leds, int left_intensity_delta,
- int right_intensity_delta, led_effect_t *effect)
+ int right_intensity_delta, led_effect_t *effect)
{
bool ret = false;
unsigned char frame[TUX_SEND_LENGTH - 1] = {0, 0, 0, 0};
@@ -341,10 +341,10 @@
right_intensity_delta);
}
if (skip)
- {
+ {
/* Nothing to do then. */
return ret;
- }
+ }
}
break;
case FADE_RATE:
@@ -369,19 +369,19 @@
/* Preconditions */
if (effect->step <= 0)
- {
+ {
effect->step = 1;
- }
+ }
if (effect->step > 255)
- {
+ {
effect->step = 255;
- }
+ }
/* We should use effect NONE if we don't want gradient. */
if (effect->speed <= 0)
- {
+ {
effect->speed = 0.1;
- }
+ }
/* Don't divide by zero if there's nothing to do ;-). */
if (leds & LED_LEFT && left_intensity_delta)
@@ -390,9 +390,9 @@
delta = (int)roundf(left_intensity_delta / effect->step);
/* If we can't have as many steps as required. */
if (delta == 0)
- {
+ {
delta = 1;
- }
+ }
ret = config_gradient(LED_LEFT, delta,
effect->speed/effect->step);
}
@@ -402,17 +402,17 @@
delta = (int)roundf(right_intensity_delta / effect->step);
/* If we can't have as many steps as required. */
if (delta == 0)
- {
+ {
delta = 1;
- }
+ }
ret = config_gradient(LED_RIGHT, delta,
effect->speed/effect->step);
}
if (skip)
- {
+ {
/* Nothing to do then. */
return ret;
- }
+ }
}
break;
case GRADIENT_DELTA:
@@ -423,19 +423,19 @@
/* Preconditions */
if (effect->step <= 0)
- {
+ {
effect->step = 1;
- }
+ }
if (effect->step > 255)
- {
+ {
effect->step = 255;
- }
+ }
/* We should use effect NONE if we don't want gradient. */
if (effect->speed <= 0)
- {
+ {
effect->speed = 0.1;
- }
+ }
/* Don't divide by zero if there's nothing to do ;-). */
if (leds & LED_LEFT && left_intensity_delta)
@@ -453,10 +453,10 @@
ret = config_gradient(LED_RIGHT, effect->step, gradient_delay);
}
if (skip)
- {
+ {
/* Nothing to do then. */
return ret;
- }
+ }
}
break;
default:
@@ -489,10 +489,10 @@
}
else
{
- if (leds > LED_BOTH)
- {
- leds = LED_BOTH;
- }
+ if (leds > LED_BOTH)
+ {
+ leds = LED_BOTH;
+ }
}
if (intensity < 0)
@@ -501,10 +501,10 @@
}
else
{
- if (intensity > 255)
- {
- intensity = 255;
- }
+ if (intensity > 255)
+ {
+ intensity = 255;
+ }
}
left_intensity_delta = abs(intensity - hw_status_table.led.left_led_intensity);
@@ -537,7 +537,7 @@
*/
static bool
led_pulse(leds_t leds, int min_intensity, int max_intensity,
- int toggle_count, float pulse_period, led_effect_t *effect)
+ int toggle_count, float pulse_period, led_effect_t *effect)
{
unsigned char frame[TUX_SEND_LENGTH - 1] = {0, 0, 0, 0};
bool ret;
@@ -553,10 +553,10 @@
}
else
{
- if (leds > LED_BOTH)
- {
- leds = LED_BOTH;
- }
+ if (leds > LED_BOTH)
+ {
+ leds = LED_BOTH;
+ }
}
if (min_intensity < 0)
@@ -565,10 +565,10 @@
}
else
{
- if (min_intensity > 255)
- {
- min_intensity = 255;
- }
+ if (min_intensity > 255)
+ {
+ min_intensity = 255;
+ }
}
if (max_intensity < 0)
@@ -577,10 +577,10 @@
}
else
{
- if (max_intensity > 255)
- {
- max_intensity = 255;
- }
+ if (max_intensity > 255)
+ {
+ max_intensity = 255;
+ }
}
if (min_intensity > max_intensity)
@@ -608,10 +608,10 @@
}
else
{
- if (pulse_width > 255)
- {
- pulse_width = 255;
- }
+ if (pulse_width > 255)
+ {
+ pulse_width = 255;
+ }
}
frame[0] = LED_PULSE_RANGE_CMD;
@@ -638,7 +638,7 @@
{
if (!strcmp(conststr, "LED_NONE"))
{
- return 0;
+ return 0;
}
if (!strcmp(conststr, "LED_LEFT"))
{
@@ -701,7 +701,7 @@
*/
LIBLOCAL bool
tux_leds_cmd_set(char *leds, char *intensity, char *effect_type,
- char *effect_speed, char *effect_step)
+ char *effect_speed, char *effect_step)
{
led_effect_t effect;
@@ -734,14 +734,14 @@
}
else
{
- if (intsty > 1.0)
- {
- intsty2 = 255;
- }
- else
- {
- intsty2 = (int)(255 * intsty);
- }
+ if (intsty > 1.0)
+ {
+ intsty2 = 255;
+ }
+ else
+ {
+ intsty2 = (int)(255 * intsty);
+ }
}
return led_set(lds, intsty2, &effect);
@@ -752,8 +752,8 @@
*/
LIBLOCAL bool
tux_leds_cmd_pulse(char *leds, char *min_intensity, char *max_intensity,
- char *pulse_count, char *pulse_period, char *effect_type,
- char *effect_speed, char *effect_step)
+ char *pulse_count, char *pulse_period, char *effect_type,
+ char *effect_speed, char *effect_step)
{
led_effect_t effect;
@@ -793,14 +793,14 @@
}
else
{
- if (min_intsty > 1.0)
- {
- min_intsty2 = 255;
- }
- else
- {
- min_intsty2 = (int)(255 * min_intsty);
- }
+ if (min_intsty > 1.0)
+ {
+ min_intsty2 = 255;
+ }
+ else
+ {
+ min_intsty2 = (int)(255 * min_intsty);
+ }
}
if (max_intsty < 0)
@@ -809,14 +809,14 @@
}
else
{
- if (max_intsty > 1.0)
- {
- max_intsty2 = 255;
- }
- else
- {
- max_intsty2 = (int)(255 * max_intsty);
- }
+ if (max_intsty > 1.0)
+ {
+ max_intsty2 = 255;
+ }
+ else
+ {
+ max_intsty2 = (int)(255 * max_intsty);
+ }
}
return led_pulse(lds, min_intsty2, max_intsty2, p_count,
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_light.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_light.c 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_light.c 2008-04-21 08:53:27 UTC (rev 999)
@@ -61,9 +61,9 @@
else
{
if (new_level != old_level)
- {
+ {
tux_sw_status_set_value(SW_ID_LIGHT_LEVEL, (void *)&new_level,
false);
- }
+ }
}
}
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.c 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.c 2008-04-21 08:53:27 UTC (rev 999)
@@ -54,28 +54,28 @@
if (NULL != tv)
{
- GetSystemTimeAsFileTime(&ft);
+ GetSystemTimeAsFileTime(&ft);
- tmpres |= ft.dwHighDateTime;
- tmpres <<= 32;
- tmpres |= ft.dwLowDateTime;
+ tmpres |= ft.dwHighDateTime;
+ tmpres <<= 32;
+ tmpres |= ft.dwLowDateTime;
- /*converting file time to unix epoch*/
- tmpres -= DELTA_EPOCH_IN_MICROSECS;
- tmpres /= 10; /*convert into microseconds*/
- tv->tv_sec = (long)(tmpres / 1000000UL);
- tv->tv_usec = (long)(tmpres % 1000000UL);
+ /*converting file time to unix epoch*/
+ tmpres -= DELTA_EPOCH_IN_MICROSECS;
+ tmpres /= 10; /*convert into microseconds*/
+ tv->tv_sec = (long)(tmpres / 1000000UL);
+ tv->tv_usec = (long)(tmpres % 1000000UL);
}
if (NULL != tz)
{
- if (!tzflag)
- {
- _tzset();
- tzflag++;
- }
- tz->tz_minuteswest = _timezone / 60;
- tz->tz_dsttime = _daylight;
+ if (!tzflag)
+ {
+ _tzset();
+ tzflag++;
+ }
+ tz->tz_minuteswest = _timezone / 60;
+ tz->tz_dsttime = _daylight;
}
return 0;
@@ -108,7 +108,7 @@
if (r == 1)
{
if ((val >= 0) && (val <= 255))
- {
+ {
*(unsigned char *)dest = val;
return true;
}
@@ -127,7 +127,7 @@
if (r == 1)
{
if ((val >= -128) && (val <= 127))
- {
+ {
*(char *)dest = val;
return true;
}
@@ -162,11 +162,11 @@
}
else
{
- if (!strcmp(str, "False"))
- {
- *(bool *)dest = false;
- return true;
- }
+ if (!strcmp(str, "False"))
+ {
+ *(bool *)dest = false;
+ return true;
+ }
}
return false;
@@ -200,7 +200,7 @@
if (r == 1)
{
if ((val >= 0) && (val <= 255))
- {
+ {
*(unsigned char *)dest = val;
return true;
}
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c 2008-04-21 08:53:27 UTC (rev 999)
@@ -44,14 +44,14 @@
}
else
{
- if (!hw_status_table.ports.portb.bits.mouth_closed_switch)
- {
- new_position = STRING_VALUE_CLOSE;
- }
- else
- {
- new_position = STRING_VALUE_NDEF;
- }
+ if (!hw_status_table.ports.portb.bits.mouth_closed_switch)
+ {
+ new_position = STRING_VALUE_CLOSE;
+ }
+ else
+ {
+ new_position = STRING_VALUE_NDEF;
+ }
}
old_position = (char *)tux_sw_status_get_value(SW_ID_MOUTH_POSITION);
@@ -59,7 +59,7 @@
if (strcmp(new_position, old_position))
{
tux_sw_status_set_value(SW_ID_MOUTH_POSITION,
- (void *)new_position, true);
+ (void *)new_position, true);
}
}
@@ -77,7 +77,7 @@
if (new_count != old_count)
{
tux_sw_status_set_value(SW_ID_MOUTH_REMAINING_MVM,
- (void *)&new_count, true);
+ (void *)&new_count, true);
}
}
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c 2008-04-21 08:53:27 UTC (rev 999)
@@ -105,64 +105,64 @@
{
condition = hw_status_table.ports.portd.bits.eyes_open_switch;
if (value)
- {
+ {
value = movement_status_control(final_state, value, condition);
- }
+ }
else
- {
- if (final_state != FINAL_ST_UNDEFINED)
- {
- single_movement(motor, final_state);
- }
- }
+ {
+ if (final_state != FINAL_ST_UNDEFINED)
+ {
+ single_movement(motor, final_state);
+ }
+ }
break;
}
case (MOVE_MOUTH):
{
condition = hw_status_table.ports.portb.bits.mouth_open_switch;
if (value)
- {
+ {
value = movement_status_control(final_state, value, condition);
- }
+ }
else
- {
- if (final_state != FINAL_ST_UNDEFINED)
- {
+ {
+ if (final_state != FINAL_ST_UNDEFINED)
+ {
single_movement(motor, final_state);
- }
- }
+ }
+ }
break;
}
case (MOVE_FLIPPERS):
{
condition = !hw_status_table.position2.wings_down;
if (value)
- {
+ {
value = movement_status_control(final_state, value, condition);
- }
+ }
else
- {
- if (final_state != FINAL_ST_UNDEFINED)
- {
- single_movement(motor, final_state);
- }
- }
+ {
+ if (final_state != FINAL_ST_UNDEFINED)
+ {
+ single_movement(motor, final_state);
+ }
+ }
break;
}
case (MOVE_SPIN_R):
{
if (!(value) && final_state == FINAL_ST_STOP)
- {
+ {
single_movement(motor, final_state);
- }
+ }
break;
}
case (MOVE_SPIN_L):
{
if (!(value) && final_state == FINAL_ST_STOP)
- {
+ {
single_movement(motor, final_state);
- }
+ }
break;
}
}
@@ -185,12 +185,12 @@
movement_status_control(char final_state, int value, char condition)
{
if ((condition == 2 && final_state == FINAL_ST_OPEN_UP && !(value % 2)) ||
- (condition == 1 && final_state == FINAL_ST_CLOSE_DOWN && value % 2) ||
- (condition == 0 && final_state == FINAL_ST_CLOSE_DOWN && !(value % 2)) ||
- (condition == 0 && final_state == FINAL_ST_OPEN_UP && value % 2)
- )
+ (condition == 1 && final_state == FINAL_ST_CLOSE_DOWN && value % 2) ||
+ (condition == 0 && final_state == FINAL_ST_CLOSE_DOWN && !(value % 2)) ||
+ (condition == 0 && final_state == FINAL_ST_OPEN_UP && value % 2)
+ )
{
- value ++;
+ value ++;
}
return value;
}
@@ -213,77 +213,77 @@
{
case (MOVE_EYES):
if (final_state == FINAL_ST_OPEN_UP)
- {
+ {
frame[0] = EYES_OPEN_CMD;
- }
+ }
else
- {
- if (final_state == FINAL_ST_CLOSE_DOWN)
- {
- frame[0] = EYES_CLOSE_CMD;
- }
- else
- {
- if (final_state == FINAL_ST_STOP)
- {
- frame[0] = EYES_STOP_CMD;
- }
- }
- }
+ {
+ if (final_state == FINAL_ST_CLOSE_DOWN)
+ {
+ frame[0] = EYES_CLOSE_CMD;
+ }
+ else
+ {
+ if (final_state == FINAL_ST_STOP)
+ {
+ frame[0] = EYES_STOP_CMD;
+ }
+ }
+ }
break;
case (MOVE_MOUTH):
if (final_state == FINAL_ST_OPEN_UP)
- {
+ {
frame[0] = MOUTH_OPEN_CMD;
- }
+ }
else
- {
- if (final_state == FINAL_ST_CLOSE_DOWN)
- {
- frame[0] = MOUTH_CLOSE_CMD;
- }
- else
- {
- if (final_state == FINAL_ST_STOP)
- {
- frame[0] = MOUTH_STOP_CMD;
- }
- }
- }
+ {
+ if (final_state == FINAL_ST_CLOSE_DOWN)
+ {
+ frame[0] = MOUTH_CLOSE_CMD;
+ }
+ else
+ {
+ if (final_state == FINAL_ST_STOP)
+ {
+ frame[0] = MOUTH_STOP_CMD;
+ }
+ }
+ }
break;
case (MOVE_FLIPPERS):
if (final_state == FINAL_ST_OPEN_UP)
- {
+ {
frame[0] = WINGS_RAISE_CMD;
- }
+ }
else
- {
- if (final_state == FINAL_ST_CLOSE_DOWN)
- {
- frame[0] = WINGS_LOWER_CMD;
- }
- else
- {
- if (final_state == FINAL_ST_STOP)
- {
- frame[0] = WINGS_STOP_CMD;
- }
- }
- }
+ {
+ if (final_state == FINAL_ST_CLOSE_DOWN)
+ {
+ frame[0] = WINGS_LOWER_CMD;
+ }
+ else
+ {
+ if (final_state == FINAL_ST_STOP)
+ {
+ frame[0] = WINGS_STOP_CMD;
+ }
+ }
+ }
break;
case (MOVE_SPIN_L):
if (final_state == FINAL_ST_STOP)
- {
+ {
frame[0] = SPIN_STOP_CMD;
- }
+ }
break;
case (MOVE_SPIN_R):
if (final_state == FINAL_ST_STOP)
- {
+ {
frame[0] = SPIN_STOP_CMD;
- }
+ }
break;
default:
return;
@@ -321,8 +321,8 @@
*/
LIBLOCAL bool
tux_movement_perform(move_body_part_t movement, unsigned char counter,
- float timeout, move_speed_t speed,
- move_final_state_t final_state, bool refresh)
+ 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};
int value;
@@ -331,10 +331,10 @@
if (movement == (MOVE_SPIN_L) || movement == (MOVE_SPIN_R))
{
- if (final_state != FINAL_ST_STOP)
- {
- final_state = FINAL_ST_UNDEFINED;
- }
+ if (final_state != FINAL_ST_STOP)
+ {
+ final_state = FINAL_ST_UNDEFINED;
+ }
}
/*
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_pong.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_pong.c 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_pong.c 2008-04-21 08:53:27 UTC (rev 999)
@@ -90,15 +90,15 @@
local_average = received_pong * 10.0;
if (local_average > 10.0)
- {
+ {
stack_insert(local_average);
average = stack_average();
last_average = *(float *)tux_sw_status_get_value(SW_ID_CONNECTION_QUALITY);
if (fabs(last_average - average) >= 1.0)
- {
+ {
tux_sw_status_set_value(SW_ID_CONNECTION_QUALITY,
- (void *)&average, true);
- }
+ (void *)&average, true);
+ }
}
received_pong = 0;
}
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c 2008-04-20 19:23:18 UTC (rev 998)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c 2008-04-21 08:53:27 UTC (rev 999)
@@ -97,15 +97,15 @@
strcat(descriptor, "- Sound flash\n");
sprintf(tmp_str, " Number of sounds : %d\n",
- sound_flash_desc.number_of_sounds);
+ sound_flash_desc.number_of_sounds);
strcat(descriptor, tmp_str);
sprintf(tmp_str, " Last used block : %d\n",
- sound_flash_desc.flash_usage);
+ sound_flash_desc.flash_usage);
strcat(descriptor, tmp_str);
sprintf(tmp_str, " Available record time (sec) : %d\n",
- sound_flash_desc.available_record_time);
+ sound_flash_desc.available_record_time);
strcat(descriptor, tmp_str);
return;
@@ -161,7 +161,7 @@
if (strcmp(new_track, old_track))
{
tux_sw_status_set_value(SW_ID_AUDIO_FLASH_PLAY,
- (void *)new_track, true);
+ (void *)new_track, true);
}
}
@@ -180,7 +180,7 @@
if (new_state != old_state)
{
tux_sw_status_set_value(SW_ID_AUDIO_GENERAL_PLAY,
- (void *)&new_state, true);
+ (void *)&new_state, true);
}
}
@@ -311,14 +311,14 @@
}
else
{
- if (vol > 100)
- {
- vol2 = 0;
- }
- else
- {
- vol2 = 7 - (int)(vol * 7.0 / 100.0);
- }
+ if (vol > 100)
+ {
+ vol2 = 0;
+ }
+ else
+ {
+ vol2 = 7 - (int)(vol * 7.0 / 100.0);
+ }
}
frame[1] = t_n;
@@ -349,16 +349,16 @@
{
memset(&wa_device, 0, sizeof(wa_device));
if (waveOutGetDevCapsA(i, &wa_device, sizeof(wa_device)) == 0)
- {
+ {
if (!strcmp(wa_device.szPname, "TuxDroid-Audio"))
- {
+ {
if (waveOutMessage((HWAVEOUT)WAVE_MAPPER,
DRVM_MAPPER_PREFERRED_SET, i, 0) == 0)
{
return true;
}
- }
- }
+ }
+ }
}
return false;
@@ -427,13 +427,13 @@
{
memset(&wa_device, 0, sizeof(wa_device));
if (waveOutGetDevCapsA(i, &wa_device, sizeof(wa_device)) == 0)
- {
+ {
if (!strcmp(wa_device.szPname, name))
- {
+ {
*idx = i;
return true;
}
- }
+ }
}
return false;
@@ -486,9 +486,9 @@
last_card = 255;
last_device = 255;
while (dinfo != NULL)
- {
+ {
if (strncmp(dinfo->d_name, "pcm", 3) == 0)
- {
+ {
count = sscanf(dinfo->d_name, "pcmC%dD%d", &card, &device);
if ((count == 2) && ((last_card != card) ||
(last_device != device)))
@@ -498,19 +498,19 @@
sprintf(filename, "/proc/asound/card%d/usbbus", card);
fp = fopen((const char *)filename, "r");
if(fp != NULL)
- {
+ {
fclose(fp);
sprintf(hw_device, "hw:%d,%d", card, device);
}
sprintf(filename, "/proc/asound/card%d/usbid", card);
fp = fopen((const char *)filename, "r");
if(fp != NULL)
- {
+ {
fgets(line, 81, fp);
sscanf( line, "%4x:%4x", &vid, &pid);
fclose(fp);
if((vid == TUX_VID) && (pid == TUX_PID))
- {
+ {
/* Todo log this */
sprintf(hw_audio_name, "%s", hw_device);
return;
@@ -705,14 +705,14 @@
if (reflash_info.wav_count > 0)
{
for (i = 0; i < reflash_info.wav_count; i++)
- {
+ {
/* open the wav file */
fp = fopen((char *)reflash_info.wav_path[i], "rb");
/* if wav_path not accessible then exit */
if (fp == NULL)
- {
+ {
return E_TUXDRV_BADWAVFILE;
- }
+ }
/* Get the size of file */
fseek(fp, 0, SEEK_END);
reflash_info.wav_size[i] = ftell(fp) - 44;
@@ -721,9 +721,9 @@
/* Get the needed blocks number for this sound */
tmp_bc = (int)(reflash_info.wav_size[i] / 4000);
if ((int)(reflash_info.wav_size[i] % 4000) > 0)
- {
+ {
tmp_bc++;
- }
+ }
/* Add to global blocks cou...
[truncated message content] |
|
From: eFfeM <c2m...@c2...> - 2008-04-20 19:23:13
|
Author: eFfeM Date: 2008-04-20 21:23:18 +0200 (Sun, 20 Apr 2008) New Revision: 998 Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_audio.c software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.c software_suite_v2/middleware/tuxdriver/trunk/src/tux_light.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_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: removed more unused includes (mostly <stdio.h> Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_audio.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_audio.c 2008-04-20 19:18:09 UTC (rev 997) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_audio.c 2008-04-20 19:23:18 UTC (rev 998) @@ -18,9 +18,6 @@ * 02111-1307, USA. */ -#include <stdio.h> -#include <string.h> - #include "tux_audio.h" #include "tux_hw_cmd.h" #include "tux_usb.h" Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c 2008-04-20 19:18:09 UTC (rev 997) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_battery.c 2008-04-20 19:23:18 UTC (rev 998) @@ -19,7 +19,6 @@ */ #include <math.h> -#include <stdio.h> #include <string.h> #include "tux_battery.h" Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c 2008-04-20 19:18:09 UTC (rev 997) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c 2008-04-20 19:23:18 UTC (rev 998) @@ -19,6 +19,7 @@ */ #include <stdio.h> + #include "log.h" #include "tux_battery.h" #include "tux_cmd_parser.h" Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.c 2008-04-20 19:18:09 UTC (rev 997) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.c 2008-04-20 19:23:18 UTC (rev 998) @@ -19,7 +19,6 @@ */ #include <math.h> -#include <stdio.h> #include <stdlib.h> #include <string.h> Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_light.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_light.c 2008-04-20 19:18:09 UTC (rev 997) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_light.c 2008-04-20 19:23:18 UTC (rev 998) @@ -19,7 +19,6 @@ */ #include <math.h> -#include <stdio.h> #include <string.h> #include "tux_hw_status.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 19:18:09 UTC (rev 997) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c 2008-04-20 19:23:18 UTC (rev 998) @@ -18,7 +18,6 @@ * 02111-1307, USA. */ -#include <stdio.h> #include <string.h> #include "tux_cmd_parser.h" Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c 2008-04-20 19:18:09 UTC (rev 997) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c 2008-04-20 19:23:18 UTC (rev 998) @@ -1,5 +1,5 @@ /* - * Tux Droid - Mouth + * Tux Droid - Movements * Copyright (C) 2008 C2ME Sa * * This program is free software; you can redistribute it and/or modify @@ -18,8 +18,6 @@ * 02111-1307, USA. */ -#include <math.h> -#include <stdio.h> #include <string.h> #include "tux_hw_cmd.h" Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c 2008-04-20 19:18:09 UTC (rev 997) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c 2008-04-20 19:23:18 UTC (rev 998) @@ -18,7 +18,6 @@ * 02111-1307, USA. */ -#include <stdio.h> #include <string.h> #include "tux_cmd_parser.h" Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c 2008-04-20 19:18:09 UTC (rev 997) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c 2008-04-20 19:23:18 UTC (rev 998) @@ -19,7 +19,6 @@ */ #include <errno.h> -#include <stdio.h> #include <string.h> #include "log.h" Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.c 2008-04-20 19:18:09 UTC (rev 997) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.c 2008-04-20 19:23:18 UTC (rev 998) @@ -18,7 +18,6 @@ * 02111-1307, USA. */ -#include <stdio.h> #include <string.h> #include "tux_hw_cmd.h" 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:18:09 UTC (rev 997) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_wings.c 2008-04-20 19:23:18 UTC (rev 998) @@ -18,7 +18,6 @@ * 02111-1307, USA. */ -#include <stdio.h> #include <string.h> #include "tux_cmd_parser.h" |
|
From: eFfeM <c2m...@c2...> - 2008-04-20 19:18:07
|
Author: eFfeM
Date: 2008-04-20 21:18:09 +0200 (Sun, 20 Apr 2008)
New Revision: 997
Modified:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c
Log:
curlies
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c 2008-04-20 19:12:47 UTC (rev 996)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c 2008-04-20 19:18:09 UTC (rev 997)
@@ -22,6 +22,7 @@
#include <stdio.h>
#include <string.h>
+#include "log.h"
#ifdef WIN32
# include "usb.h"
#else
@@ -32,7 +33,6 @@
#ifdef USE_MUTEX
# include "threading_uniform.h"
#endif
-#include "log.h"
static usb_dev_handle *tux_handle = NULL;
static struct usb_device *tux_device = NULL;
@@ -191,21 +191,28 @@
mutex_lock(__connected_mutex);
#endif
usb_connected = value;
- if (value) {
+ if (value)
+ {
#ifdef USE_MUTEX
mutex_lock(__callback_mutex);
#endif
if (dongle_connect_function)
+ {
dongle_connect_function();
+ }
#ifdef USE_MUTEX
mutex_unlock(__callback_mutex);
#endif
- } else {
+ }
+ else
+ {
#ifdef USE_MUTEX
mutex_lock(__callback_mutex);
#endif
if (dongle_disconnect_function)
+ {
dongle_disconnect_function();
+ }
#ifdef USE_MUTEX
mutex_unlock(__callback_mutex);
#endif
@@ -255,14 +262,19 @@
tux_dev2 = NULL;
for (bus = usb_busses; bus; bus = bus->next)
+ {
for (tux_dev = bus->devices; tux_dev; tux_dev = tux_dev->next)
+ {
if (tux_dev->descriptor.idVendor == TUX_VID
&& tux_dev->descriptor.idProduct == TUX_PID)
{
if (tux_dev->config->bNumInterfaces > 1)
+ {
tux_dev2 = tux_dev;
+ }
}
-
+ }
+ }
return tux_dev2;
}
@@ -280,7 +292,9 @@
tux_hdl = usb_open(tux_dev);
if (!tux_hdl)
+ {
return NULL;
+ }
/* Setting configuration is normally not necessary as the snd-usb-audio
* will already have that done at this point. But in case we don't have usb
@@ -291,10 +305,12 @@
/* Claim device interface */
print_usb_debug("usb_claim_interface(tux_hdl, TUX_INTERFACE)");
error = usb_claim_interface(tux_hdl, TUX_INTERFACE);
- if (error != 0) {
+ if (error != 0)
+ {
print_usb_debug("usb_claim_interface(tux_hdl, TUX_INTERFACE)");
error = usb_claim_interface(tux_hdl, TUX_INTERFACE);
- if (error != 0) {
+ if (error != 0)
+ {
usb_reset(tux_hdl);
return NULL;
}
@@ -312,15 +328,17 @@
read_error_counter = 0;
tux_device = usb_find_TuxDroid();
- if (!tux_device) {
+ if (!tux_device)
+ {
log_error("Fux not found");
return TuxUSBFuxNotFound;
- }
+ }
/* Old firmware should be discarded here */
#ifndef USB_DEBUG
print_usb_debug("read tux_device->descriptor.bcdDevice");
- if (tux_device->descriptor.bcdDevice < MIN_FIRMWARE_VERSION) {
+ if (tux_device->descriptor.bcdDevice < MIN_FIRMWARE_VERSION)
+ {
log_error("Your fux firmware is too old");
return TuxUSBFirmwareTooOld;
}
@@ -328,7 +346,8 @@
/* Get Device handle */
tux_handle = usb_open_TuxDroid(tux_device);
- if (tux_handle == NULL) {
+ if (tux_handle == NULL)
+ {
log_error("Can't open the USB device");
return TuxUSBHandleNotOpen;
}
@@ -345,13 +364,15 @@
tux_usb_release(void)
{
print_usb_debug("usb_release_interface(tux_handle, TUX_INTERFACE)");
- if (usb_release_interface(tux_handle, TUX_INTERFACE) < 0) {
+ if (usb_release_interface(tux_handle, TUX_INTERFACE) < 0)
+ {
log_error("TuxUSBCantReleaseInterface");
return TuxUSBCantReleaseInterface;
}
print_usb_debug("usb_close(tux_handle)");
- if (usb_close(tux_handle) < 0) {
+ if (usb_close(tux_handle) < 0)
+ {
log_error("Can't close the USB device");
return TuxUSBCantCloseDevice;
}
@@ -413,7 +434,8 @@
unsigned char dest;
#endif
- if (!tux_usb_connected()) {
+ if (!tux_usb_connected())
+ {
log_error("Fux USB device not connected");
return TuxUSBNotConnected;
}
@@ -424,10 +446,12 @@
#ifndef USB_DEBUG
/* If rf state is offline, don't send the command */
- if (!last_knowed_rf_state) {
+ if (!last_knowed_rf_state)
+ {
buff2 = (void *)buff;
dest = *(unsigned char *)buff2++;
- if (dest == 0) {
+ if (dest == 0)
+ {
#ifdef USE_MUTEX
mutex_unlock(__read_write_mutex);
#endif
@@ -442,15 +466,17 @@
mutex_unlock(__read_write_mutex);
#endif
- if (ret != TUX_SEND_LENGTH) {
- if (is_error_no_device(ret)) {
- set_connected(false);
- tux_usb_release();
- log_error("Fux is disconnected");
- return TuxUSBDisconnected;
- }
- log_error("Failed to write on USB device (%d)", ret);
- return TuxUSBWriteError;
+ if (ret != TUX_SEND_LENGTH)
+ {
+ if (is_error_no_device(ret))
+ {
+ set_connected(false);
+ tux_usb_release();
+ log_error("Fux is disconnected");
+ return TuxUSBDisconnected;
+ }
+ log_error("Failed to write on USB device (%d)", ret);
+ return TuxUSBWriteError;
}
return TuxUSBNoError;
}
@@ -485,21 +511,27 @@
data_buf = (char *)data;
data_buf += 4;
- if (last_knowed_rf_state != rf_state) {
+ if (last_knowed_rf_state != rf_state)
+ {
last_knowed_rf_state = rf_state;
#ifdef USE_MUTEX
mutex_lock(__callback_mutex);
#endif
if (rf_state_callback_function)
+ {
rf_state_callback_function(last_knowed_rf_state);
+ }
#ifdef USE_MUTEX
mutex_unlock(__callback_mutex);
#endif
}
- for (i = 0; i < packet_count; i++) {
+ for (i = 0; i < packet_count; i++)
+ {
for (j = 0; j < 4; j++)
+ {
packet_data[j] = (unsigned char)data_buf[j];
+ }
#ifdef USE_MUTEX
mutex_lock(__callback_mutex);
#endif
@@ -521,7 +553,8 @@
{
int ret;
- if (!tux_usb_connected()) {
+ if (!tux_usb_connected())
+ {
log_error("Fux USB device not connected");
return TuxUSBNotConnected;
}
@@ -532,11 +565,13 @@
mutex_lock(__read_write_mutex);
#endif
ret = usb_write_TuxDroid(frame_status_request, TUX_SEND_LENGTH);
- if (ret != TUX_SEND_LENGTH) {
+ if (ret != TUX_SEND_LENGTH)
+ {
#ifdef USE_MUTEX
mutex_unlock(__read_write_mutex);
#endif
- if (is_error_no_device(ret)) { /* USB device error */
+ if (is_error_no_device(ret))
+ { /* USB device error */
set_connected(false);
tux_usb_release();
log_error("Fux is disconnected");
@@ -551,8 +586,10 @@
mutex_unlock(__read_write_mutex);
#endif
- if (ret != TUX_RECEIVE_LENGTH) { /* Frame not have 64 bytes */
- if (is_error_no_device(ret)) { /* USB device error */
+ if (ret != TUX_RECEIVE_LENGTH)
+ { /* Frame not have 64 bytes */
+ if (is_error_no_device(ret))
+ { /* USB device error */
set_connected(false);
tux_usb_release();
log_error("Fux is disconnected");
@@ -560,8 +597,11 @@
}
log_error("Failed to read on USB device (%d)", ret);
return TuxUSBReadError;
- } else
+ }
+ else
+ {
read_error_counter = 0;
+ }
process_usb_frame((char *)buf);
@@ -616,20 +656,27 @@
set_read_loop_started(true);
- while (tux_usb_connected()) {
+ while (tux_usb_connected())
+ {
current_timeout += TUX_READ_LOOP_INTERVAL;
if (!tux_usb_connected())
+ {
break;
+ }
tux_usb_read(data);
tux_usb_read(data);
if (loop_cycle_complete_function)
+ {
loop_cycle_complete_function();
+ }
while (get_time() < current_timeout)
+ {
usleep(1000);
+ }
}
set_read_loop_started(false);
@@ -644,11 +691,15 @@
int ret;
if (get_read_loop_started())
+ {
return TuxUSBAlreadyStarted;
+ }
ret = tux_usb_capture();
if (ret != TuxUSBNoError)
+ {
return ret;
+ }
last_knowed_rf_state = 0;
@@ -667,7 +718,9 @@
int ret;
if (!tux_usb_connected())
+ {
return TuxUSBNoError;
+ }
set_connected(false);
@@ -675,7 +728,9 @@
ret = tux_usb_release();
if (ret != TuxUSBNoError)
+ {
return ret;
+ }
return TuxUSBNoError;
}
@@ -705,9 +760,13 @@
usleep(10000);
if (ret != TuxUSBNoError)
+ {
return false;
+ }
else
+ {
return true;
+ }
}
/**
@@ -726,9 +785,13 @@
usleep(10000);
if (ret != TuxUSBNoError)
+ {
return false;
+ }
else
+ {
return true;
+ }
}
/**
@@ -745,7 +808,11 @@
usleep(10000);
if (ret != TuxUSBNoError)
+ {
return false;
+ }
else
+ {
return true;
+ }
}
|
|
From: eFfeM <c2m...@c2...> - 2008-04-20 19:12:42
|
Author: eFfeM
Date: 2008-04-20 21:12:47 +0200 (Sun, 20 Apr 2008)
New Revision: 996
Modified:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.c
Log:
curlies
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.c 2008-04-20 19:08:48 UTC (rev 995)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.c 2008-04-20 19:12:47 UTC (rev 996)
@@ -21,11 +21,11 @@
#include <stdio.h>
#include <string.h>
+#include "tux_hw_cmd.h"
#include "tux_hw_status.h"
#include "tux_sw_status.h"
-#include "tux_hw_cmd.h"
+#include "tux_usb.h"
#include "tux_user_inputs.h"
-#include "tux_usb.h"
static bool ir_received = false;
static bool ir_has_not_yet_been_used = true;
@@ -58,8 +58,10 @@
old_state = *(unsigned char *)tux_sw_status_get_value(SW_ID_LEFT_WING_BUTTON);
if (new_state != old_state)
+ {
tux_sw_status_set_value(SW_ID_LEFT_WING_BUTTON,
(void *)&new_state, true);
+ }
}
/**
@@ -74,8 +76,10 @@
old_state = *(unsigned char *)tux_sw_status_get_value(SW_ID_RIGHT_WING_BUTTON);
if (new_state != old_state)
+ {
tux_sw_status_set_value(SW_ID_RIGHT_WING_BUTTON,
(void *)&new_state, true);
+ }
}
/**
@@ -90,7 +94,9 @@
old_state = *(unsigned char *)tux_sw_status_get_value(SW_ID_HEAD_BUTTON);
if (new_state != old_state)
+ {
tux_sw_status_set_value(SW_ID_HEAD_BUTTON, (void *)&new_state, true);
+ }
}
/**
@@ -203,10 +209,13 @@
{
char *code_str = "";
- if (rc5_on_receiving) {
- if (!ir_received) {
+ if (rc5_on_receiving)
+ {
+ if (!ir_received)
+ {
rc5_timeout_counter++;
- if (rc5_timeout_counter >= RC5_TIMEOUT) {
+ if (rc5_timeout_counter >= RC5_TIMEOUT)
+ {
/* remote button is released */
code_str = RC5_code_to_str(K_DUMMY_RELEASE);
tux_sw_status_set_value(SW_ID_REMOTE_BUTTON,
@@ -215,24 +224,34 @@
rc5_timeout_counter = 0;
rc5_on_receiving = false;
}
- } else
+ }
+ else
+ {
rc5_timeout_counter = 0;
+ }
- if (rc5_last_toggle != hw_status_table.ir.rc5_code.bits.toggle) {
+ if (rc5_last_toggle != hw_status_table.ir.rc5_code.bits.toggle)
+ {
/* remote button is released */
code_str = RC5_code_to_str(K_DUMMY_RELEASE);
tux_sw_status_set_value(SW_ID_REMOTE_BUTTON,
(void *)code_str, true);
/* remote button is pressed */
- if (hw_status_table.ir.rc5_code.bits.command <= LAST_VALID_K) {
+ if (hw_status_table.ir.rc5_code.bits.command <= LAST_VALID_K)
+ {
code_str = RC5_code_to_str(hw_status_table.ir.rc5_code.bits.command);
tux_sw_status_set_value(SW_ID_REMOTE_BUTTON,
(void *)code_str, true);
- } else
+ }
+ else
+ {
rc5_on_receiving = 0;
+ }
}
- } else { /* not in receiving */
+ }
+ else
+ { /* not in receiving */
if ((ir_received) &&
((rc5_last_toggle != hw_status_table.ir.rc5_code.bits.toggle) ||
ir_has_not_yet_been_used))
@@ -242,12 +261,16 @@
rc5_on_receiving = true;
/* remote button is pressed */
- if (hw_status_table.ir.rc5_code.bits.command <= LAST_VALID_K) {
+ if (hw_status_table.ir.rc5_code.bits.command <= LAST_VALID_K)
+ {
code_str = RC5_code_to_str(hw_status_table.ir.rc5_code.bits.command);
tux_sw_status_set_value(SW_ID_REMOTE_BUTTON,
(void *)code_str, true);
- } else
+ }
+ else
+ {
rc5_on_receiving = false;
+ }
}
}
@@ -276,22 +299,40 @@
old_state = (char *)tux_sw_status_get_value(SW_ID_CHARGER_STATE);
- if (!hw_status_table.sensors1.sensors.bits.power_plug_insertion_switch) {
+ if (!hw_status_table.sensors1.sensors.bits.power_plug_insertion_switch)
+ {
new_state = STRING_VALUE_UNPLUGGED;
- } else if (hw_status_table.sensors1.sensors.bits.charger_led_status) {
- new_state = STRING_VALUE_CHARGING;
- } else {
- if (hw_status_table.ports.portb.bits.charger_inhibit_signal) {
- new_state = STRING_VALUE_INHIBITED;
- } else
- if (strcmp(STRING_VALUE_UNPLUGGED, old_state))
- new_state = STRING_VALUE_TRICKLE;
- else
- new_state = STRING_VALUE_UNPLUGGED;
}
+ else
+ {
+ if (hw_status_table.sensors1.sensors.bits.charger_led_status)
+ {
+ new_state = STRING_VALUE_CHARGING;
+ }
+ else
+ {
+ if (hw_status_table.ports.portb.bits.charger_inhibit_signal)
+ {
+ new_state = STRING_VALUE_INHIBITED;
+ }
+ else
+ {
+ if (strcmp(STRING_VALUE_UNPLUGGED, old_state))
+ {
+ new_state = STRING_VALUE_TRICKLE;
+ }
+ else
+ {
+ new_state = STRING_VALUE_UNPLUGGED;
+ }
+ }
+ }
+ }
if (strcmp(new_state, old_state))
+ {
tux_sw_status_set_value(SW_ID_CHARGER_STATE, (void *)new_state, true);
+ }
}
/**
@@ -331,7 +372,9 @@
ret &= str_to_uint8(command, &cmd);
if (!ret)
+ {
return false;
+ }
frame[1] = add;
frame[2] = cmd;
|
|
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:
|
|
From: eFfeM <c2m...@c2...> - 2008-04-20 19:06:04
|
Author: eFfeM
Date: 2008-04-20 21:06:08 +0200 (Sun, 20 Apr 2008)
New Revision: 994
Modified:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
Log:
curlies, layout
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 19:01:59 UTC (rev 993)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c 2008-04-20 19:06:08 UTC (rev 994)
@@ -26,11 +26,11 @@
# include "threading_uniform.h"
#endif
-#include "version.h"
#include "tux_firmware.h"
#include "tux_hw_status.h"
#include "tux_misc.h"
#include "tux_sw_status.h"
+#include "version.h"
static const char *SW_NAME[] = {
"wings_position",
@@ -125,7 +125,9 @@
set_value_doc(int id, char *value_doc)
{
if ((id < 0) || (id >= SW_STATUS_NUMBER))
+ {
return;
+ }
#ifdef USE_MUTEX
mutex_lock(__status_mutex);
#endif
@@ -326,7 +328,8 @@
LIBLOCAL TuxDrvError
tux_sw_status_name_from_id(int id, char *name)
{
- if ((id < 0) || (id >= SW_STATUS_NUMBER)) {
+ if ((id < 0) || (id >= SW_STATUS_NUMBER))
+ {
sprintf(name, "UNKNOW");
return E_TUXDRV_INVALIDIDENTIFIER;
}
@@ -347,13 +350,16 @@
mutex_lock(__status_mutex);
#endif
for (i = 0; i < SW_STATUS_NUMBER; i++)
- if (!(strcmp(name, sw_status_table[i].name))) {
- *(int *)id = i;
+ {
+ if (!(strcmp(name, sw_status_table[i].name)))
+ {
+ *id = i;
#ifdef USE_MUTEX
mutex_unlock(__status_mutex);
#endif
return E_TUXDRV_NOERROR;
}
+ }
#ifdef USE_MUTEX
mutex_unlock(__status_mutex);
#endif
@@ -400,9 +406,13 @@
switch (sw_status_table[id].value_fmt) {
case ID_FMT_BOOL:
if (*(unsigned char *)sw_status_table[id].value)
+ {
sprintf(str, "%s", bool_true);
+ }
else
+ {
sprintf(str, "%s", bool_false);
+ }
break;
case ID_FMT_UINT8:
sprintf(str, "%d",
@@ -450,7 +460,9 @@
#endif
err = tux_sw_status_name_from_id(id, name_str);
if (err != E_TUXDRV_NOERROR)
+ {
return err;
+ }
get_status_value_str(id, value_str);
sprintf(state, "%s:%s:%s:%.3f",
@@ -468,7 +480,8 @@
LIBLOCAL TuxDrvError
tux_sw_status_get_value_str(int id, char *value)
{
- if ((id < 0) || (id >= SW_STATUS_NUMBER)) {
+ if ((id < 0) || (id >= SW_STATUS_NUMBER))
+ {
sprintf(value, "NULL");
return E_TUXDRV_INVALIDIDENTIFIER;
}
@@ -488,11 +501,15 @@
char tmp_str[256] = "";
int i;
- for (i = 0; i < SW_STATUS_NUMBER; i++) {
+ for (i = 0; i < SW_STATUS_NUMBER; i++)
+ {
tux_sw_status_get_state_str(i, tmp_state);
if (i == 0)
+ {
sprintf(state, "%s\n", tmp_state);
- else {
+ }
+ else
+ {
sprintf(tmp_str, "%s\n", tmp_state);
strcat(state, tmp_str);
}
@@ -537,9 +554,13 @@
tux_sw_status_get_state_str(id, state_str);
- if (make_event)
+ if (make_event)
+ {
if (event_funct)
+ {
event_funct(state_str);
+ }
+ }
#ifdef USE_MUTEX
mutex_lock(__status_mutex);
@@ -616,7 +637,8 @@
sprintf(tmp_str, "--------------------------\n\n");
strcat(status_doc, tmp_str);
- for (i = 0; i < SW_STATUS_NUMBER; i++) {
+ for (i = 0; i < SW_STATUS_NUMBER; i++)
+ {
sprintf(tmp_str, "Status %.2d:\n", i);
strcat(status_doc, tmp_str);
sprintf(tmp_str, " ID : %d\n", i);
@@ -635,11 +657,14 @@
}
doc_file = fopen(STATUS_DOC_FILE_PATH, "w");
- if (doc_file) {
+ if (doc_file)
+ {
fprintf(doc_file, "%s\n", status_doc);
fclose(doc_file);
- } else {
- printf("file error %s\n", strerror(errno));
- }
+ }
+ else
+ {
+ printf("file error %s\n", strerror(errno));
+ }
}
|
|
From: eFfeM <c2m...@c2...> - 2008-04-20 19:01:54
|
Author: eFfeM Date: 2008-04-20 21:01:59 +0200 (Sun, 20 Apr 2008) New Revision: 993 Modified: software_suite_v2/middleware/tuxdriver/trunk/src/usb.h Log: layout Modified: software_suite_v2/middleware/tuxdriver/trunk/src/usb.h =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/usb.h 2008-04-20 18:59:46 UTC (rev 992) +++ software_suite_v2/middleware/tuxdriver/trunk/src/usb.h 2008-04-20 19:01:59 UTC (rev 993) @@ -62,11 +62,11 @@ * Descriptor sizes per descriptor type */ #define USB_DT_DEVICE_SIZE 18 -#define USB_DT_CONFIG_SIZE 9 -#define USB_DT_INTERFACE_SIZE 9 -#define USB_DT_ENDPOINT_SIZE 7 -#define USB_DT_ENDPOINT_AUDIO_SIZE 9 /* Audio extension */ -#define USB_DT_HUB_NONVAR_SIZE 7 +#define USB_DT_CONFIG_SIZE 9 +#define USB_DT_INTERFACE_SIZE 9 +#define USB_DT_ENDPOINT_SIZE 7 +#define USB_DT_ENDPOINT_AUDIO_SIZE 9 /* Audio extension */ +#define USB_DT_HUB_NONVAR_SIZE 7 @@ -109,13 +109,13 @@ }; #define USB_ENDPOINT_ADDRESS_MASK 0x0f /* in bEndpointAddress */ -#define USB_ENDPOINT_DIR_MASK 0x80 +#define USB_ENDPOINT_DIR_MASK 0x80 #define USB_ENDPOINT_TYPE_MASK 0x03 /* in bmAttributes */ #define USB_ENDPOINT_TYPE_CONTROL 0 -#define USB_ENDPOINT_TYPE_ISOCHRONOUS 1 +#define USB_ENDPOINT_TYPE_ISOCHRONOUS 1 #define USB_ENDPOINT_TYPE_BULK 2 -#define USB_ENDPOINT_TYPE_INTERRUPT 3 +#define USB_ENDPOINT_TYPE_INTERRUPT 3 /* Interface descriptor */ #define USB_MAXINTERFACES 32 |
|
From: eFfeM <c2m...@c2...> - 2008-04-20 18:59:42
|
Author: eFfeM
Date: 2008-04-20 20:59:46 +0200 (Sun, 20 Apr 2008)
New Revision: 992
Modified:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c
Log:
curlies
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c 2008-04-20 18:57:15 UTC (rev 991)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_spinning.c 2008-04-20 18:59:46 UTC (rev 992)
@@ -21,12 +21,12 @@
#include <stdio.h>
#include <string.h>
+#include "tux_cmd_parser.h"
#include "tux_hw_status.h"
#include "tux_hw_cmd.h"
-#include "tux_sw_status.h"
-#include "tux_cmd_parser.h"
#include "tux_movements.h"
#include "tux_spinning.h"
+#include "tux_sw_status.h"
#include "tux_usb.h"
/**
@@ -42,17 +42,29 @@
(!hw_status_table.ports.portb.bits.spin_motor_backward))
{
new_direction = STRING_VALUE_NONE;
- } else if (hw_status_table.ports.portb.bits.spin_motor_forward) {
- new_direction = STRING_VALUE_LEFT;
- } else if (hw_status_table.ports.portb.bits.spin_motor_backward) {
- new_direction = STRING_VALUE_RIGHT;
- }
+ }
+ else
+ {
+ if (hw_status_table.ports.portb.bits.spin_motor_forward)
+ {
+ new_direction = STRING_VALUE_LEFT;
+ }
+ else
+ {
+ if (hw_status_table.ports.portb.bits.spin_motor_backward)
+ {
+ new_direction = STRING_VALUE_RIGHT;
+ }
+ }
+ }
old_direction = (char *)tux_sw_status_get_value(SW_ID_SPINNING_DIRECTION);
if (strcmp(new_direction, old_direction))
+ {
tux_sw_status_set_value(SW_ID_SPINNING_DIRECTION,
(void *)new_direction, true);
+ }
}
/**
@@ -67,8 +79,10 @@
old_count = *(unsigned char *)tux_sw_status_get_value(SW_ID_SPINNING_REMAINING_MVM);
if (new_count != old_count)
+ {
tux_sw_status_set_value(SW_ID_SPINNING_REMAINING_MVM,
(void *)&new_count, true);
+ }
}
/**
@@ -84,7 +98,9 @@
ret = str_to_uint8(speed, &sp);
if (!ret)
+ {
return false;
+ }
return tux_movement_perform(MOVE_SPIN_R, 0, 0.0, sp, fs, true);
}
@@ -102,7 +118,9 @@
ret = str_to_uint8(counter, &cnt);
if (!ret)
+ {
return false;
+ }
return tux_movement_perform(MOVE_SPIN_L, cnt, 0.0, 5, fs, false);
}
@@ -120,7 +138,9 @@
ret = str_to_uint8(counter, &cnt);
if (!ret)
+ {
return false;
+ }
return tux_movement_perform(MOVE_SPIN_R, cnt, 0.0, 5, fs, false);
}
@@ -139,16 +159,22 @@
ret = str_to_float(timeout, &to);
if (!ret)
+ {
return false;
+ }
/* Short movements */
if (to < 0.3)
+ {
return tux_movement_perform(MOVE_SPIN_L, 0, to, 5, fs, false);
+ }
/* Long movements */
ret = tux_usb_send_to_tux(frame);
if (!ret)
+ {
return false;
+ }
ret = tux_cmd_parser_insert_delay_command(to,
"TUX_CMD:SPINNING:OFF", true);
@@ -170,16 +196,22 @@
ret = str_to_float(timeout, &to);
if (!ret)
+ {
return false;
+ }
/* Short movements */
if (to < 0.3)
+ {
return tux_movement_perform(MOVE_SPIN_R, 0, to, 5, fs, false);
+ }
/* Long movements */
ret = tux_usb_send_to_tux(frame);
if (!ret)
+ {
return false;
+ }
ret = tux_cmd_parser_insert_delay_command(to,
"TUX_CMD:SPINNING:OFF", true);
|
|
From: eFfeM <c2m...@c2...> - 2008-04-20 18:57:15
|
Author: eFfeM
Date: 2008-04-20 20:57:15 +0200 (Sun, 20 Apr 2008)
New Revision: 991
Modified:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c
Log:
curlies, layout
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c 2008-04-20 12:19:11 UTC (rev 990)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c 2008-04-20 18:57:15 UTC (rev 991)
@@ -23,14 +23,14 @@
#include <stdlib.h>
#include <string.h>
+#include "log.h"
+#include "tux_cmd_parser.h"
#include "tux_hw_status.h"
#include "tux_hw_cmd.h"
+#include "tux_leds.h"
#include "tux_sw_status.h"
#include "tux_sound_flash.h"
#include "tux_usb.h"
-#include "tux_cmd_parser.h"
-#include "tux_leds.h"
-#include "log.h"
LIBLOCAL sound_flash_descriptor_t sound_flash_desc;
@@ -94,19 +94,19 @@
{
char tmp_str[80] = "";
- strcat(descriptor, "- Sound flash\n");
+ strcat(descriptor, "- Sound flash\n");
+
+ sprintf(tmp_str, " Number of sounds : %d\n",
+ sound_flash_desc.number_of_sounds);
+ strcat(descriptor, tmp_str);
- sprintf(tmp_str, " Number of sounds : %d\n",
- sound_flash_desc.number_of_sounds);
- strcat(descriptor, tmp_str);
-
- sprintf(tmp_str, " Last used block : %d\n",
- sound_flash_desc.flash_usage);
- strcat(descriptor, tmp_str);
-
- sprintf(tmp_str, " Available record time (sec) : %d\n",
- sound_flash_desc.available_record_time);
- strcat(descriptor, tmp_str);
+ sprintf(tmp_str, " Last used block : %d\n",
+ sound_flash_desc.flash_usage);
+ strcat(descriptor, tmp_str);
+
+ sprintf(tmp_str, " Available record time (sec) : %d\n",
+ sound_flash_desc.available_record_time);
+ strcat(descriptor, tmp_str);
return;
}
@@ -131,7 +131,7 @@
LIBLOCAL void
tux_sound_flash_get_descripor(void)
{
- /* Currently, the status are sended by tuxaudio when then
+ /* Currently, the status are sent by tuxaudio when then
* the versionning is requested */
}
@@ -146,8 +146,11 @@
char track[10] = "";
if (!hw_status_table.sensors1.play_internal_sound)
+ {
new_track = STRING_VALUE_STOP;
- else {
+ }
+ else
+ {
sprintf(track, "TRACK_%.3d",
hw_status_table.sensors1.play_internal_sound);
new_track = track;
@@ -156,8 +159,10 @@
old_track = (char *)tux_sw_status_get_value(SW_ID_AUDIO_FLASH_PLAY);
if (strcmp(new_track, old_track))
+ {
tux_sw_status_set_value(SW_ID_AUDIO_FLASH_PLAY,
(void *)new_track, true);
+ }
}
/**
@@ -173,8 +178,10 @@
old_state = *(unsigned char *)tux_sw_status_get_value(SW_ID_AUDIO_GENERAL_PLAY);
if (new_state != old_state)
+ {
tux_sw_status_set_value(SW_ID_AUDIO_GENERAL_PLAY,
(void *)&new_state, true);
+ }
}
/**
@@ -189,8 +196,10 @@
old_track = *(unsigned char *)tux_sw_status_get_value(SW_ID_FLASH_PROG_CURR_TRACK);
if (new_track != old_track)
+ {
tux_sw_status_set_value(SW_ID_FLASH_PROG_CURR_TRACK,
(void *)&new_track, true);
+ }
}
/**
@@ -205,8 +214,10 @@
old_size = *(int *)tux_sw_status_get_value(SW_ID_FLASH_PROG_LAST_TRACK_SIZE);
if (new_size != old_size)
+ {
tux_sw_status_set_value(SW_ID_FLASH_PROG_LAST_TRACK_SIZE,
(void *)&new_size, true);
+ }
}
/**
@@ -217,15 +228,15 @@
{
#ifdef LOCK_TUX
FILE *f;
- char ret_str[3] = "\n";
char *ret_c;
f = fopen("./track_num", "r");
- if (f) {
+ if (f)
+ {
fgets(knowed_track_num, sizeof(knowed_track_num)-2, f);
- ret_c = strstr(knowed_track_num, ret_str);
- *(char *)ret_c = '\0';
+ ret_c = strchr(knowed_track_num, '\n');
+ *ret_c = '\0';
fclose(f);
}
#endif
@@ -242,7 +253,8 @@
f = fopen("./track_num", "w");
- if (f) {
+ if (f)
+ {
fprintf(f, "%d\n", sound_flash_desc.number_of_sounds);
fclose(f);
}
@@ -263,10 +275,14 @@
sprintf(track_num_str, "%d", sound_flash_desc.number_of_sounds);
if (strcmp(knowed_track_num, track_num_str))
+ {
ret = true;
+ }
if (save)
+ {
save_knowed_track_num();
+ }
return ret;
#else
@@ -280,8 +296,7 @@
LIBLOCAL bool
tux_sound_flash_cmd_play(char *track_num, char *volume)
{
- unsigned char frame[TUX_SEND_LENGTH - 1] = {PLAY_SOUND_CMD,
- 0, 0, 0};
+ unsigned char frame[TUX_SEND_LENGTH - 1] = {PLAY_SOUND_CMD, 0, 0, 0};
unsigned char t_n = 1;
float vol = 0;
unsigned char vol2 = 0;
@@ -291,11 +306,20 @@
ret &= str_to_float(volume, &vol);
if (vol < 0)
+ {
vol2 = 7;
- else if (vol > 100)
- vol2 = 0;
+ }
else
- vol2 = 7 - (int)(vol * 7.0 / 100.0);
+ {
+ if (vol > 100)
+ {
+ vol2 = 0;
+ }
+ else
+ {
+ vol2 = 7 - (int)(vol * 7.0 / 100.0);
+ }
+ }
frame[1] = t_n;
frame[2] = vol2;
@@ -317,17 +341,24 @@
WAVEOUTCAPSA wa_device;
if (!waveOutGetNumDevs())
+ {
return false;
+ }
- for (i = 0; i < waveOutGetNumDevs(); i++) {
+ for (i = 0; i < waveOutGetNumDevs(); i++)
+ {
memset(&wa_device, 0, sizeof(wa_device));
if (waveOutGetDevCapsA(i, &wa_device, sizeof(wa_device)) == 0)
+ {
if (!strcmp(wa_device.szPname, "TuxDroid-Audio"))
+ {
if (waveOutMessage((HWAVEOUT)WAVE_MAPPER,
DRVM_MAPPER_PREFERRED_SET, i, 0) == 0)
{
return true;
}
+ }
+ }
}
return false;
@@ -346,7 +377,8 @@
err = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET,
(DWORD)&po, (DWORD)&pf);
- if (err == 0) {
+ if (err == 0)
+ {
*(int *)idx = po;
return true;
}
@@ -364,9 +396,12 @@
int def_idx = -1;
if (!get_default_playback_idx(&def_idx))
+ {
return false;
+ }
- if (waveOutGetDevCapsA(def_idx, &wa_device, sizeof(wa_device)) == 0) {
+ if (waveOutGetDevCapsA(def_idx, &wa_device, sizeof(wa_device)) == 0)
+ {
sprintf(name, "%s", wa_device.szPname);
return true;
}
@@ -384,15 +419,21 @@
WAVEOUTCAPSA wa_device;
if (!waveOutGetNumDevs())
+ {
return false;
+ }
- for (i = 0; i < waveOutGetNumDevs(); i++) {
+ for (i = 0; i < waveOutGetNumDevs(); i++)
+ {
memset(&wa_device, 0, sizeof(wa_device));
if (waveOutGetDevCapsA(i, &wa_device, sizeof(wa_device)) == 0)
- if (!strcmp(wa_device.szPname, name)) {
- *(int *)idx = i;
+ {
+ if (!strcmp(wa_device.szPname, name))
+ {
+ *idx = i;
return true;
}
+ }
}
return false;
@@ -435,14 +476,19 @@
unsigned int vid, pid;
dir = opendir("/dev/snd");
- if (dir == NULL) {
+ if (dir == NULL)
+ {
printf("No sound device directory\n");
- } else {
+ }
+ else
+ {
dinfo = readdir(dir);
last_card = 255;
last_device = 255;
- while (dinfo != NULL) {
- if (strncmp(dinfo->d_name, "pcm", 3) == 0) {
+ while (dinfo != NULL)
+ {
+ if (strncmp(dinfo->d_name, "pcm", 3) == 0)
+ {
count = sscanf(dinfo->d_name, "pcmC%dD%d", &card, &device);
if ((count == 2) && ((last_card != card) ||
(last_device != device)))
@@ -451,17 +497,20 @@
last_device = device;
sprintf(filename, "/proc/asound/card%d/usbbus", card);
fp = fopen((const char *)filename, "r");
- if(fp != NULL) {
+ if(fp != NULL)
+ {
fclose(fp);
sprintf(hw_device, "hw:%d,%d", card, device);
}
sprintf(filename, "/proc/asound/card%d/usbid", card);
fp = fopen((const char *)filename, "r");
- if(fp != NULL) {
+ if(fp != NULL)
+ {
fgets(line, 81, fp);
sscanf( line, "%4x:%4x", &vid, &pid);
fclose(fp);
- if((vid == TUX_VID) && (pid == TUX_PID)) {
+ if((vid == TUX_VID) && (pid == TUX_PID))
+ {
/* Todo log this */
sprintf(hw_audio_name, "%s", hw_device);
return;
@@ -491,16 +540,24 @@
get_default_playback_name(def_dev_name);
if (!set_tux_as_default_playback())
+ {
return false;
+ }
if (sndPlaySound(wav_path, SND_SYNC) != true)
+ {
ret = false;
+ }
if (!get_idx_playback_from_name(&def_idx, def_dev_name))
+ {
return false;
+ }
if (!set_default_playback(def_idx))
+ {
return false;
+ }
#else /* UNIX */
int r;
@@ -508,7 +565,8 @@
ret = false;
- if (hw_audio_name[0] != '\0') {
+ if (hw_audio_name[0] != '\0')
+ {
sprintf(cmd, "aplay -D %s %s", hw_audio_name, wav_path);
r = system(cmd);
if (r == 0)
@@ -544,7 +602,9 @@
int i;
for (i = 0; i < 256; i++)
+ {
strncat(reg_ex, tok, sizeof(tok) - 1);
+ }
i = sscanf(src_str, reg_ex,
tokens[0], ts, tokens[1], ts, tokens[2], ts, tokens[3], ts,
@@ -630,21 +690,29 @@
int tmp_bc = 0;
if (reflash_info.current_state != SRS_STDBY)
+ {
return E_TUXDRV_BUSY;
+ }
init_reflash_info();
reflash_info.wav_count = parse_wavs(tracks, &reflash_info.wav_path);
if (!reflash_info.wav_count)
+ {
return E_TUXDRV_BADWAVFILE;
+ }
if (reflash_info.wav_count > 0)
- for (i = 0; i < reflash_info.wav_count; i++) {
+ {
+ for (i = 0; i < reflash_info.wav_count; i++)
+ {
/* open the wav file */
fp = fopen((char *)reflash_info.wav_path[i], "rb");
/* if wav_path not accessible then exit */
if (fp == NULL)
+ {
return E_TUXDRV_BADWAVFILE;
+ }
/* Get the size of file */
fseek(fp, 0, SEEK_END);
reflash_info.wav_size[i] = ftell(fp) - 44;
@@ -653,14 +721,19 @@
/* Get the needed blocks number for this sound */
tmp_bc = (int)(reflash_info.wav_size[i] / 4000);
if ((int)(reflash_info.wav_size[i] % 4000) > 0)
+ {
tmp_bc++;
+ }
/* Add to global blocks count */
block_count += tmp_bc;
}
+ }
/* If needed blocks exceeds 127 then fail */
if (block_count > 127)
+ {
return E_TUXDRV_WAVSIZEEXCEDED;
+ }
reflash_info.current_state = SRS_INIT;
@@ -681,9 +754,11 @@
unsigned char curr_track_for_event = 0;
/* Check fux connection and radio connection */
- if (reflash_info.current_state != SRS_STDBY) {
+ if (reflash_info.current_state != SRS_STDBY)
+ {
rf_state = *(bool *)tux_sw_status_get_value(SW_ID_RF_STATE);
- if ((!tux_usb_connected()) || (!rf_state)) {
+ if ((!tux_usb_connected()) || (!rf_state))
+ {
reflash_info.error = SRE_RF_OFFLINE;
reflash_info.current_state = SRS_FINISH;
}
@@ -713,7 +788,8 @@
/* Send erase cmd */
log_info("Sound reflash: Erasing");
frame[0] = ERASE_FLASH_CMD;
- if (!tux_usb_send_to_tux(frame)) {
+ if (!tux_usb_send_to_tux(frame))
+ {
reflash_info.error = SRE_USB_ERROR;
reflash_info.current_state = SRS_FINISH;
break;
@@ -731,7 +807,8 @@
reflash_info.current_wav + 1,
reflash_info.wav_count);
frame[0] = STORE_SOUND_CMD;
- if (!tux_usb_send_to_tux(frame)) {
+ if (!tux_usb_send_to_tux(frame))
+ {
reflash_info.error = SRE_USB_ERROR;
reflash_info.current_state = SRS_FINISH;
break;
@@ -741,10 +818,12 @@
(void *)&curr_track_for_event, true);
usleep(200000);
/* Play current wav track */
- if (!play_wav(reflash_info.wav_path[reflash_info.current_wav])) {
+ if (!play_wav(reflash_info.wav_path[reflash_info.current_wav]))
+ {
frame[0] = CONFIRM_STORAGE_CMD;
frame[1] = 0;
- if (!tux_usb_send_to_tux(frame)) {
+ if (!tux_usb_send_to_tux(frame))
+ {
reflash_info.error = SRE_USB_ERROR;
reflash_info.current_state = SRS_FINISH;
break;
@@ -757,7 +836,8 @@
usleep(200000);
frame[0] = CONFIRM_STORAGE_CMD;
frame[1] = 1;
- if (!tux_usb_send_to_tux(frame)) {
+ if (!tux_usb_send_to_tux(frame))
+ {
reflash_info.error = SRE_USB_ERROR;
reflash_info.current_state = SRS_FINISH;
break;
@@ -767,7 +847,9 @@
reflash_info.current_wav += 1;
/* If the next track is out of limit, Goto SRS_FINISH state */
if (reflash_info.current_wav >= reflash_info.wav_count)
+ {
reflash_info.current_state = SRS_FINISH;
+ }
break;
case SRS_FINISH:
/* Enabling commands parsing */
|
|
From: eFfeM <c2m...@c2...> - 2008-04-20 12:19:08
|
Author: eFfeM
Date: 2008-04-20 14:19:11 +0200 (Sun, 20 Apr 2008)
New Revision: 990
Modified:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_pong.c
Log:
cleanup, removed unneeded includes
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_pong.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_pong.c 2008-04-20 12:16:51 UTC (rev 989)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_pong.c 2008-04-20 12:19:11 UTC (rev 990)
@@ -19,14 +19,12 @@
*/
#include <math.h>
-#include <stdio.h>
-#include <string.h>
#include "tux_hw_status.h"
#include "tux_hw_cmd.h"
+#include "tux_pong.h"
#include "tux_sw_status.h"
#include "tux_usb.h"
-#include "tux_pong.h"
static unsigned char received_pong = 0;
static float average_stack[10];
@@ -41,13 +39,17 @@
stack_insert(float value)
{
if (value > 100.0)
+ {
value = 100.0;
+ }
average_stack[stack_idx] = value;
stack_idx++;
if (stack_fill_count < 10)
+ {
stack_fill_count++;
+ }
stack_idx %= 10;
}
@@ -62,7 +64,9 @@
float average = 0.0;
for (i = 0; i < stack_fill_count; i++)
+ {
average += average_stack[i];
+ }
return (average / (stack_fill_count * 1.0));
}
@@ -81,20 +85,23 @@
received_pong++;
new_pending = hw_status_table.pong.pongs_pending_number;
- if (new_pending <= 190) {
+ if (new_pending <= 190)
+ {
local_average = received_pong * 10.0;
- if (local_average > 10.0) {
+ if (local_average > 10.0)
+ {
stack_insert(local_average);
average = stack_average();
last_average = *(float *)tux_sw_status_get_value(SW_ID_CONNECTION_QUALITY);
if (fabs(last_average - average) >= 1.0)
+ {
tux_sw_status_set_value(SW_ID_CONNECTION_QUALITY,
- (void *)&average, true);
+ (void *)&average, true);
+ }
}
received_pong = 0;
}
-
}
/**
@@ -103,13 +110,13 @@
LIBLOCAL void
tux_pong_get(void)
{
- unsigned char frame[TUX_SEND_LENGTH - 1] = {TUX_PONG_PING_CMD,
- 200,
- 0, 0};
+ unsigned char frame[TUX_SEND_LENGTH - 1] = { TUX_PONG_PING_CMD,
+ 200, 0, 0};
get_count++;
- if (get_count >= 40) {
+ if (get_count >= 40)
+ {
get_count = 0;
tux_usb_send_to_tux(frame);
}
|
|
From: eFfeM <c2m...@c2...> - 2008-04-20 12:16:47
|
Author: eFfeM
Date: 2008-04-20 14:16:51 +0200 (Sun, 20 Apr 2008)
New Revision: 989
Modified:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c
Log:
layout
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c 2008-04-20 12:06:32 UTC (rev 988)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_movements.c 2008-04-20 12:16:51 UTC (rev 989)
@@ -31,10 +31,10 @@
/*
* Prototypes
*/
-int static movement_status_control(char final_state, int value, char condition);
-int static control_final_state(char motor, char final_state, int value);
-int static compute_value(char motor, float timeout);
-void static single_movement(char motor, char final_state);
+static int movement_status_control(char final_state, int value, char condition);
+static int control_final_state(char motor, char final_state, int value);
+static int compute_value(char motor, float timeout);
+static void single_movement(char motor, char final_state);
/**
@@ -51,7 +51,7 @@
*
* The time of each movement has been measured, and defined in movements.h.
*/
-int static
+static int
compute_value(char motor, float timeout)
{
int value = 0;
@@ -75,7 +75,9 @@
}
if (value > 255)
+ {
value = 255;
+ }
return value;
}
@@ -105,39 +107,64 @@
{
condition = hw_status_table.ports.portd.bits.eyes_open_switch;
if (value)
+ {
value = movement_status_control(final_state, value, condition);
- else if (final_state != FINAL_ST_UNDEFINED)
- single_movement(motor, final_state);
+ }
+ else
+ {
+ if (final_state != FINAL_ST_UNDEFINED)
+ {
+ single_movement(motor, final_state);
+ }
+ }
break;
}
case (MOVE_MOUTH):
{
condition = hw_status_table.ports.portb.bits.mouth_open_switch;
if (value)
+ {
value = movement_status_control(final_state, value, condition);
- else if (final_state != FINAL_ST_UNDEFINED)
- single_movement(motor, final_state);
+ }
+ else
+ {
+ if (final_state != FINAL_ST_UNDEFINED)
+ {
+ single_movement(motor, final_state);
+ }
+ }
break;
}
case (MOVE_FLIPPERS):
{
condition = !hw_status_table.position2.wings_down;
if (value)
+ {
value = movement_status_control(final_state, value, condition);
- else if (final_state != FINAL_ST_UNDEFINED)
- single_movement(motor, final_state);
+ }
+ else
+ {
+ if (final_state != FINAL_ST_UNDEFINED)
+ {
+ single_movement(motor, final_state);
+ }
+ }
break;
}
case (MOVE_SPIN_R):
{
if (!(value) && final_state == FINAL_ST_STOP)
+ {
single_movement(motor, final_state);
+ }
break;
}
case (MOVE_SPIN_L):
{
if (!(value) && final_state == FINAL_ST_STOP)
+ {
single_movement(motor, final_state);
+ }
break;
}
}
@@ -159,14 +186,14 @@
int static
movement_status_control(char final_state, int value, char condition)
{
- if (condition == 1 && final_state == FINAL_ST_OPEN_UP && !(value % 2))
- value ++;
- else if (condition == 1 && final_state == FINAL_ST_CLOSE_DOWN && value % 2)
- value ++;
- else if (condition == 0 && final_state == FINAL_ST_CLOSE_DOWN && !(value % 2))
- value ++;
- else if (condition == 0 && final_state == FINAL_ST_OPEN_UP && value % 2)
- value ++;
+ if ((condition == 2 && final_state == FINAL_ST_OPEN_UP && !(value % 2)) ||
+ (condition == 1 && final_state == FINAL_ST_CLOSE_DOWN && value % 2) ||
+ (condition == 0 && final_state == FINAL_ST_CLOSE_DOWN && !(value % 2)) ||
+ (condition == 0 && final_state == FINAL_ST_OPEN_UP && value % 2)
+ )
+ {
+ value ++;
+ }
return value;
}
@@ -188,37 +215,77 @@
{
case (MOVE_EYES):
if (final_state == FINAL_ST_OPEN_UP)
+ {
frame[0] = EYES_OPEN_CMD;
- else if (final_state == FINAL_ST_CLOSE_DOWN)
- frame[0] = EYES_CLOSE_CMD;
- else if (final_state == FINAL_ST_STOP)
- frame[0] = EYES_STOP_CMD;
+ }
+ else
+ {
+ if (final_state == FINAL_ST_CLOSE_DOWN)
+ {
+ frame[0] = EYES_CLOSE_CMD;
+ }
+ else
+ {
+ if (final_state == FINAL_ST_STOP)
+ {
+ frame[0] = EYES_STOP_CMD;
+ }
+ }
+ }
break;
case (MOVE_MOUTH):
if (final_state == FINAL_ST_OPEN_UP)
+ {
frame[0] = MOUTH_OPEN_CMD;
- else if (final_state == FINAL_ST_CLOSE_DOWN)
- frame[0] = MOUTH_CLOSE_CMD;
- else if (final_state == FINAL_ST_STOP)
- frame[0] = MOUTH_STOP_CMD;
+ }
+ else
+ {
+ if (final_state == FINAL_ST_CLOSE_DOWN)
+ {
+ frame[0] = MOUTH_CLOSE_CMD;
+ }
+ else
+ {
+ if (final_state == FINAL_ST_STOP)
+ {
+ frame[0] = MOUTH_STOP_CMD;
+ }
+ }
+ }
break;
case (MOVE_FLIPPERS):
if (final_state == FINAL_ST_OPEN_UP)
+ {
frame[0] = WINGS_RAISE_CMD;
- else if (final_state == FINAL_ST_CLOSE_DOWN)
- frame[0] = WINGS_LOWER_CMD;
- else if (final_state == FINAL_ST_STOP)
- frame[0] = WINGS_STOP_CMD;
+ }
+ else
+ {
+ if (final_state == FINAL_ST_CLOSE_DOWN)
+ {
+ frame[0] = WINGS_LOWER_CMD;
+ }
+ else
+ {
+ if (final_state == FINAL_ST_STOP)
+ {
+ frame[0] = WINGS_STOP_CMD;
+ }
+ }
+ }
break;
case (MOVE_SPIN_L):
if (final_state == FINAL_ST_STOP)
+ {
frame[0] = SPIN_STOP_CMD;
+ }
break;
case (MOVE_SPIN_R):
if (final_state == FINAL_ST_STOP)
+ {
frame[0] = SPIN_STOP_CMD;
+ }
break;
default:
return;
@@ -265,8 +332,12 @@
char type = 0;
if (movement == (MOVE_SPIN_L) || movement == (MOVE_SPIN_R))
+ {
if (final_state != FINAL_ST_STOP)
+ {
final_state = FINAL_ST_UNDEFINED;
+ }
+ }
/*
* Refresh has the maximum priority. If it's set, only the command to
@@ -340,26 +411,48 @@
tux_movement_conststr_to_val(char *conststr)
{
if (!strcmp(conststr, "VERYLOW"))
+ {
return 1;
+ }
if (!strcmp(conststr, "LOW"))
+ {
return 2;
+ }
if (!strcmp(conststr, "MEDIUM"))
+ {
return 3;
+ }
if (!strcmp(conststr, "MIDHIGH"))
+ {
return 4;
+ }
if (!strcmp(conststr, "HIGH"))
+ {
return 5;
+ }
if (!strcmp(conststr, "UNDEFINED"))
+ {
return 0;
+ }
if (!strcmp(conststr, "OPEN"))
+ {
return 1;
+ }
if (!strcmp(conststr, "UP"))
+ {
return 1;
+ }
if (!strcmp(conststr, "CLOSE"))
+ {
return 2;
+ }
if (!strcmp(conststr, "DOWN"))
+ {
return 2;
+ }
if (!strcmp(conststr, "STOP"))
+ {
return 3;
+ }
return 0;
}
|
|
From: eFfeM <c2m...@c2...> - 2008-04-20 12:06:28
|
Author: eFfeM
Date: 2008-04-20 14:06:32 +0200 (Sun, 20 Apr 2008)
New Revision: 988
Modified:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c
Log:
curlies
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c 2008-04-20 12:03:48 UTC (rev 987)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_mouth.c 2008-04-20 12:06:32 UTC (rev 988)
@@ -39,19 +39,29 @@
char *new_position = "";
char *old_position = "";
- if (!hw_status_table.ports.portb.bits.mouth_open_switch) {
+ if (!hw_status_table.ports.portb.bits.mouth_open_switch)
+ {
new_position = STRING_VALUE_OPEN;
}
- else if (!hw_status_table.ports.portb.bits.mouth_closed_switch) {
- new_position = STRING_VALUE_CLOSE;
- } else
- new_position = STRING_VALUE_NDEF;
+ else
+ {
+ if (!hw_status_table.ports.portb.bits.mouth_closed_switch)
+ {
+ new_position = STRING_VALUE_CLOSE;
+ }
+ else
+ {
+ new_position = STRING_VALUE_NDEF;
+ }
+ }
old_position = (char *)tux_sw_status_get_value(SW_ID_MOUTH_POSITION);
if (strcmp(new_position, old_position))
+ {
tux_sw_status_set_value(SW_ID_MOUTH_POSITION,
(void *)new_position, true);
+ }
}
/**
@@ -66,8 +76,10 @@
old_count = *(unsigned char *)tux_sw_status_get_value(SW_ID_MOUTH_REMAINING_MVM);
if (new_count != old_count)
+ {
tux_sw_status_set_value(SW_ID_MOUTH_REMAINING_MVM,
(void *)&new_count, true);
+ }
}
/**
@@ -77,15 +89,17 @@
tux_mouth_cmd_on(char *counter, char *final_state)
{
unsigned char cnt = 0;
- unsigned char fs = FINAL_ST_UNDEFINED;
+ unsigned char fs;
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_MOUTH, cnt, 0.0, 5, fs, false);
}
@@ -101,19 +115,25 @@
unsigned char frame[TUX_SEND_LENGTH - 1] = {MOUTH_MOVE_CMD, 0, 0, 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_MOUTH, 0, to, 5, fs, false);
+ }
/* Long movements */
ret = tux_usb_send_to_tux(frame);
if (!ret)
+ {
return false;
+ }
switch (fs) {
case FINAL_ST_UNDEFINED:
|
|
From: eFfeM <c2m...@c2...> - 2008-04-20 12:03:43
|
Author: eFfeM
Date: 2008-04-20 14:03:48 +0200 (Sun, 20 Apr 2008)
New Revision: 987
Modified:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.c
Log:
curlies, layout
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.c 2008-04-20 12:01:05 UTC (rev 986)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_misc.c 2008-04-20 12:03:48 UTC (rev 987)
@@ -48,34 +48,37 @@
static int
gettimeofday(struct timeval *tv, struct timezone *tz)
{
- FILETIME ft;
- unsigned __int64 tmpres = 0;
- static int tzflag;
-
- if (NULL != tv) {
- GetSystemTimeAsFileTime(&ft);
-
- tmpres |= ft.dwHighDateTime;
- tmpres <<= 32;
- tmpres |= ft.dwLowDateTime;
-
- /*converting file time to unix epoch*/
- tmpres -= DELTA_EPOCH_IN_MICROSECS;
- tmpres /= 10; /*convert into microseconds*/
- tv->tv_sec = (long)(tmpres / 1000000UL);
- tv->tv_usec = (long)(tmpres % 1000000UL);
- }
-
- if (NULL != tz) {
- if (!tzflag) {
- _tzset();
- tzflag++;
+ FILETIME ft;
+ unsigned __int64 tmpres = 0;
+ static int tzflag;
+
+ if (NULL != tv)
+ {
+ GetSystemTimeAsFileTime(&ft);
+
+ tmpres |= ft.dwHighDateTime;
+ tmpres <<= 32;
+ tmpres |= ft.dwLowDateTime;
+
+ /*converting file time to unix epoch*/
+ tmpres -= DELTA_EPOCH_IN_MICROSECS;
+ tmpres /= 10; /*convert into microseconds*/
+ tv->tv_sec = (long)(tmpres / 1000000UL);
+ tv->tv_usec = (long)(tmpres % 1000000UL);
}
- tz->tz_minuteswest = _timezone / 60;
- tz->tz_dsttime = _daylight;
- }
-
- return 0;
+
+ if (NULL != tz)
+ {
+ if (!tzflag)
+ {
+ _tzset();
+ tzflag++;
+ }
+ tz->tz_minuteswest = _timezone / 60;
+ tz->tz_dsttime = _daylight;
+ }
+
+ return 0;
}
#endif /* WIN32 */
@@ -102,8 +105,10 @@
r = sscanf(str, "%d", &val);
- if (r == 1) {
- if ((val >= 0) && (val <= 255)) {
+ if (r == 1)
+ {
+ if ((val >= 0) && (val <= 255))
+ {
*(unsigned char *)dest = val;
return true;
}
@@ -119,8 +124,10 @@
r = sscanf(str, "%d", &val);
- if (r == 1) {
- if ((val >= -128) && (val <= 127)) {
+ if (r == 1)
+ {
+ if ((val >= -128) && (val <= 127))
+ {
*(char *)dest = val;
return true;
}
@@ -136,7 +143,8 @@
r = sscanf(str, "%d", &val);
- if (r == 1) {
+ if (r == 1)
+ {
*(int *)dest = val;
return true;
}
@@ -147,13 +155,19 @@
LIBLOCAL bool
str_to_bool(char *str, bool *dest)
{
- if (!strcmp(str, "True")) {
+ if (!strcmp(str, "True"))
+ {
*(bool *)dest = true;
return true;
- } else if (!strcmp(str, "False")) {
- *(bool *)dest = false;
- return true;
}
+ else
+ {
+ if (!strcmp(str, "False"))
+ {
+ *(bool *)dest = false;
+ return true;
+ }
+ }
return false;
}
@@ -166,7 +180,8 @@
r = sscanf(str, "%f", &val);
- if (r == 1) {
+ if (r == 1)
+ {
*(float *)dest = val;
return true;
}
@@ -182,8 +197,10 @@
r = sscanf(str, "0x%2x", &val);
- if (r == 1) {
- if ((val >= 0) && (val <= 255)) {
+ if (r == 1)
+ {
+ if ((val >= 0) && (val <= 255))
+ {
*(unsigned char *)dest = val;
return true;
}
|
|
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
|
|
From: eFfeM <c2m...@c2...> - 2008-04-20 11:49:08
|
Author: eFfeM Date: 2008-04-20 13:49:13 +0200 (Sun, 20 Apr 2008) New Revision: 985 Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.h Log: changed include from misc.h to <stdbool.h> Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.h =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.h 2008-04-20 11:45:51 UTC (rev 984) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_leds.h 2008-04-20 11:49:13 UTC (rev 985) @@ -21,7 +21,7 @@ #ifndef _TUX_LEDS_H_ #define _TUX_LEDS_H_ -#include "tux_misc.h" +#include <stdbool.h> /* * Structure definitions, constants and custom types. |
|
From: eFfeM <c2m...@c2...> - 2008-04-20 11:45:46
|
Author: eFfeM
Date: 2008-04-20 13:45:51 +0200 (Sun, 20 Apr 2008)
New Revision: 984
Modified:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_light.c
software_suite_v2/middleware/tuxdriver/trunk/src/tux_light.h
Log:
cleanup, removed unneeded includes
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:43:46 UTC (rev 983)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_light.c 2008-04-20 11:45:51 UTC (rev 984)
@@ -23,8 +23,8 @@
#include <string.h>
#include "tux_hw_status.h"
+#include "tux_light.h"
#include "tux_sw_status.h"
-#include "tux_light.h"
static float last_level_for_event = 0.0;
@@ -43,7 +43,9 @@
light_value += hw_status_table.light.low_level;
if (hw_status_table.light.mode == 0)
+ {
light_value = light_value / 8 + 1000;
+ }
light_value = 1128 - light_value;
@@ -51,11 +53,17 @@
old_level = *(float *)tux_sw_status_get_value(SW_ID_LIGHT_LEVEL);
- if (fabs(new_level - last_level_for_event) > 1.0) {
+ if (fabs(new_level - last_level_for_event) > 1.0)
+ {
last_level_for_event = new_level;
tux_sw_status_set_value(SW_ID_LIGHT_LEVEL, (void *)&new_level, true);
- } else
+ }
+ else
+ {
if (new_level != old_level)
+ {
tux_sw_status_set_value(SW_ID_LIGHT_LEVEL, (void *)&new_level,
false);
+ }
+ }
}
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_light.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_light.h 2008-04-20 11:43:46 UTC (rev 983)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_light.h 2008-04-20 11:45:51 UTC (rev 984)
@@ -21,8 +21,6 @@
#ifndef _TUX_LIGHT_H_
#define _TUX_LIGHT_H_
-#include "tux_misc.h"
-
extern void tux_light_update_level(void);
#endif /* _TUX_LIGHT_H_ */
|
|
From: eFfeM <c2m...@c2...> - 2008-04-20 11:43:41
|
Author: eFfeM Date: 2008-04-20 13:43:46 +0200 (Sun, 20 Apr 2008) New Revision: 983 Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_pong.h Log: removed includes Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_pong.h =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_pong.h 2008-04-20 11:43:15 UTC (rev 982) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_pong.h 2008-04-20 11:43:46 UTC (rev 983) @@ -21,9 +21,6 @@ #ifndef _TUX_PONG_H_ #define _TUX_PONG_H_ -#include "tux_misc.h" -#include "tux_usb.h" - extern void tux_pong_update(void); extern void tux_pong_get(void); |
|
From: eFfeM <c2m...@c2...> - 2008-04-20 11:43:10
|
Author: eFfeM Date: 2008-04-20 13:43:15 +0200 (Sun, 20 Apr 2008) New Revision: 982 Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c Log: removed duplicated include Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c 2008-04-20 11:41:47 UTC (rev 981) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c 2008-04-20 11:43:15 UTC (rev 982) @@ -29,7 +29,6 @@ #include "tux_sound_flash.h" #include "tux_usb.h" #include "tux_cmd_parser.h" -#include "tux_usb.h" #include "tux_leds.h" #include "log.h" |
1 message has been excluded from this view by a project administrator.
