[tuxdroid-svn] r999 - in software_suite_v2/middleware/tuxdriver/trunk: include src test
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r999 - in software_suite_v2/middleware/tuxdriver/trunk: include src test
|
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] |
