[tuxdroid-svn] r1056 - software_suite_v2/middleware/tuxdriver/trunk/src
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r1056 - software_suite_v2/middleware/tuxdriver/trunk/src
|
From: eFfeM <c2m...@c2...> - 2008-04-30 17:52:26
|
Author: eFfeM
Date: 2008-04-30 19:52:28 +0200 (Wed, 30 Apr 2008)
New Revision: 1056
Modified:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
Log:
removed SW_NAME, merged name into init function (field was there already)
this avoids potential problems when a new status is added
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-30 15:21:24 UTC (rev 1055)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c 2008-04-30 17:52:28 UTC (rev 1056)
@@ -32,44 +32,6 @@
#include "tux_sw_status.h"
#include "version.h"
-static const char *SW_NAME[] = {
- "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",
- "sound_reflash_current_track"
-};
-
LIBLOCAL sw_status_table_t sw_status_table;
#ifdef USE_MUTEX
@@ -122,7 +84,7 @@
*
*/
static void
-init_status_struct(int id, int value_fmt, char *value_doc)
+init_status_struct(int id, int value_fmt, char *name, char *value_doc)
{
if ((id < 0) || (id >= SW_STATUS_NUMBER))
{
@@ -133,6 +95,7 @@
#endif
sw_status_table[id].id = id;
sw_status_table[id].value_fmt = value_fmt;
+ strcpy(sw_status_table[id].name, name);
sw_status_table[id].lu_time = get_time();
tux_sw_status_name_from_id(id, sw_status_table[id].name);
// do we want this define or not?
@@ -167,144 +130,144 @@
VER_ARCH);
init_status_struct(SW_ID_WINGS_POSITION, ID_FMT_STRING,
- "DOWN|UP");
+ "wings_position", "DOWN|UP");
tux_sw_status_set_value(SW_ID_WINGS_POSITION, STRING_VALUE_DOWN,
false);
init_status_struct(SW_ID_WINGS_REMAINING_MVM, ID_FMT_UINT8,
- "range[0..255]");
+ "wings_remaining_movements", "range[0..255]");
init_status_struct(SW_ID_SPINNING_DIRECTION, ID_FMT_STRING,
- "NONE|LEFT|RIGHT");
+ "spinning_direction", "NONE|LEFT|RIGHT");
tux_sw_status_set_value(SW_ID_SPINNING_DIRECTION, STRING_VALUE_NONE,
false);
init_status_struct(SW_ID_SPINNING_REMAINING_MVM, ID_FMT_UINT8,
- "range[0..255]");
+ "spinning_remaining_movements", "range[0..255]");
init_status_struct(SW_ID_LEFT_WING_BUTTON, ID_FMT_BOOL,
- "False|True");
+ "left_wing_button", "False|True");
init_status_struct(SW_ID_RIGHT_WING_BUTTON, ID_FMT_BOOL,
- "False|True");
+ "right_wing_button", "False|True");
init_status_struct(SW_ID_HEAD_BUTTON, ID_FMT_BOOL,
- "False|True");
+ "head_button", "False|True");
init_status_struct(SW_ID_REMOTE_BUTTON, ID_FMT_STRING,
- "K_<remote button>|RELEASE");
+ "remote_button", "K_<remote button>|RELEASE");
tux_sw_status_set_value(SW_ID_REMOTE_BUTTON, STRING_VALUE_RELEASE,
false);
init_status_struct(SW_ID_MOUTH_POSITION, ID_FMT_STRING,
- "OPEN|CLOSE|NDEF");
+ "mouth_position", "OPEN|CLOSE|NDEF");
tux_sw_status_set_value(SW_ID_MOUTH_POSITION, STRING_VALUE_CLOSE,
false);
init_status_struct(SW_ID_MOUTH_REMAINING_MVM, ID_FMT_UINT8,
- "range[0..255]");
+ "mouth_remaining_movements", "range[0..255]");
init_status_struct(SW_ID_EYES_POSITION, ID_FMT_STRING,
- "OPEN|CLOSE|NDEF");
+ "eyes_position", "OPEN|CLOSE|NDEF");
tux_sw_status_set_value(SW_ID_EYES_POSITION, STRING_VALUE_CLOSE,
false);
init_status_struct(SW_ID_EYES_REMAINING_MVM, ID_FMT_UINT8,
- "range[0..255]");
+ "eyes_remaining_movements", "range[0..255]");
init_status_struct(SW_ID_DESCRIPTOR_COMPLETE, ID_FMT_BOOL,
- "True");
+ "descriptor_complete", "True");
init_status_struct(SW_ID_RF_STATE, ID_FMT_BOOL,
- "False|True");
+ "radio_state", "False|True");
init_status_struct(SW_ID_DONGLE_PLUG, ID_FMT_BOOL,
- "False|True");
+ "dongle_plug", "False|True");
init_status_struct(SW_ID_CHARGER_STATE, ID_FMT_STRING,
-
+ "charger_state",
"UNPLUGGED|CHARGING|PLUGGED_NO_POWER|TRICKLE|INHIBITED");
tux_sw_status_set_value(SW_ID_CHARGER_STATE, STRING_VALUE_UNPLUGGED,
false);
init_status_struct(SW_ID_BATTERY_LEVEL, ID_FMT_FLOAT,
- "range[4.0..6.5]");
+ "battery_level", "range[4.0..6.5]");
init_status_struct(SW_ID_BATTERY_STATE, ID_FMT_STRING,
- "EMPTY|LOW|HIGH|FULL");
+ "battery_state", "EMPTY|LOW|HIGH|FULL");
tux_sw_status_set_value(SW_ID_BATTERY_STATE, STRING_VALUE_EMPTY,
false);
init_status_struct(SW_ID_LIGHT_LEVEL, ID_FMT_FLOAT,
- "range[0.0..100.0]");
+ "light_level", "range[0.0..100.0]");
init_status_struct(SW_ID_LEFT_LED_STATE, ID_FMT_STRING,
- "ON|OFF|CHANGING");
+ "left_led_state", "ON|OFF|CHANGING");
tux_sw_status_set_value(SW_ID_LEFT_LED_STATE, STRING_VALUE_OFF,
false);
init_status_struct(SW_ID_RIGHT_LED_STATE, ID_FMT_STRING,
- "ON|OFF|CHANGING");
+ "right_led_state", "ON|OFF|CHANGING");
tux_sw_status_set_value(SW_ID_RIGHT_LED_STATE, STRING_VALUE_OFF,
false);
+
init_status_struct(SW_ID_CONNECTION_QUALITY, ID_FMT_FLOAT,
- "range[0.0..100.0]");
+ "connection_quality", "range[0.0..100.0]");
init_status_struct(SW_ID_AUDIO_FLASH_PLAY, ID_FMT_STRING,
- "TRACK_<range[0..255]>|STOP");
+ "audio_flash_play", "TRACK_<range[0..255]>|STOP");
tux_sw_status_set_value(SW_ID_AUDIO_FLASH_PLAY, STRING_VALUE_STOP,
false);
init_status_struct(SW_ID_AUDIO_GENERAL_PLAY, ID_FMT_BOOL,
- "False|True");
+ "audio_general_play", "False|True");
init_status_struct(SW_ID_FLASH_PROG_CURR_TRACK, ID_FMT_UINT8,
- "range[0..255]");
+ "flash_programming_current_track", "range[0..255]");
init_status_struct(SW_ID_FLASH_PROG_LAST_TRACK_SIZE, ID_FMT_INT,
- "<track size>");
+ "flash_programming_last_track_size", "<track size>");
init_status_struct(SW_ID_TUXCORE_SYMBOLIC_VERSION, ID_FMT_STRING,
- "<string>");
+ "tuxcore_symbolic_version", "<string>");
tux_sw_status_set_value(SW_ID_TUXCORE_SYMBOLIC_VERSION,
knowed_tuxcore_symbolic_version, false);
init_status_struct(SW_ID_TUXAUDIO_SYMBOLIC_VERSION, ID_FMT_STRING,
- "<string>");
+ "tuxaudio_symbolic_version", "<string>");
tux_sw_status_set_value(SW_ID_TUXAUDIO_SYMBOLIC_VERSION,
knowed_tuxaudio_symbolic_version, false);
init_status_struct(SW_ID_FUXUSB_SYMBOLIC_VERSION, ID_FMT_STRING,
- "<string>");
+ "fuxusb_symbolic_version", "<string>");
tux_sw_status_set_value(SW_ID_FUXUSB_SYMBOLIC_VERSION,
knowed_fuxusb_symbolic_version, false);
- init_status_struct(SW_ID_TUXRF_SYMBOLIC_VERSION, ID_FMT_STRING,
- "<string>");
- tux_sw_status_set_value(SW_ID_TUXRF_SYMBOLIC_VERSION,
- knowed_tuxrf_symbolic_version, false);
-
init_status_struct(SW_ID_FUXRF_SYMBOLIC_VERSION, ID_FMT_STRING,
- "<string>");
+ "fuxrf_symbolic_version", "<string>");
tux_sw_status_set_value(SW_ID_FUXRF_SYMBOLIC_VERSION,
knowed_fuxrf_symbolic_version, false);
+ init_status_struct(SW_ID_TUXRF_SYMBOLIC_VERSION, ID_FMT_STRING,
+ "tuxrf_symbolic_version", "<string>");
+ tux_sw_status_set_value(SW_ID_TUXRF_SYMBOLIC_VERSION,
+ knowed_tuxrf_symbolic_version, false);
+
init_status_struct(SW_ID_DRIVER_SYMBOLIC_VERSION, ID_FMT_STRING,
- "<string>");
+ "driver_symbolic_version", "<string>");
tux_sw_status_set_value(SW_ID_DRIVER_SYMBOLIC_VERSION,
driver_symbolic_version, false);
init_status_struct(SW_ID_SOUND_REFLASH_BEGIN, ID_FMT_FLOAT,
- "<seconds>");
+ "sound_reflash_begin", "<seconds>");
init_status_struct(SW_ID_SOUND_REFLASH_END, ID_FMT_STRING,
-
- "NO_ERROR|ERROR_RF_OFFLINE|ERROR_WAV|ERROR_USB");
+ "sound_reflash_end", "NO_ERROR|ERROR_RF_OFFLINE|ERROR_WAV|ERROR_USB");
tux_sw_status_set_value(SW_ID_SOUND_REFLASH_END,
STRING_VALUE_NO_ERROR, false);
init_status_struct(SW_ID_SOUND_REFLASH_CURRENT_TRACK, ID_FMT_UINT8,
- "range[0..255]");
+ "sound_reflash_current_track", "range[0..255]");
#ifdef GENERATE_DOC
tux_sw_status_dump_status_doc();
@@ -323,7 +286,7 @@
return E_TUXDRV_INVALIDIDENTIFIER;
}
- strcpy(name, SW_NAME[id]);
+ strcpy(name, sw_status_table[id].name);
return E_TUXDRV_NOERROR;
}
|
