Author: remi
Date: 2008-07-01 10:39:18 +0200 (Tue, 01 Jul 2008)
New Revision: 1289
Modified:
software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.h
software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.pas
software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.py
software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.h
Log:
* added the motor statuses in the high level structures.
Modified: software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.h
2008-07-01 08:20:59 UTC (rev 1288)
+++ software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.h
2008-07-01 08:39:18 UTC (rev 1289)
@@ -62,6 +62,11 @@
SW_ID_SOUND_REFLASH_BEGIN,
SW_ID_SOUND_REFLASH_END,
SW_ID_SOUND_REFLASH_CURRENT_TRACK,
+ SW_ID_EYES_MOTOR_ON,
+ SW_ID_MOUTH_MOTOR_ON,
+ SW_ID_FLIPPERS_MOTOR_ON,
+ SW_ID_SPIN_LEFT_MOTOR_ON,
+ SW_ID_SPIN_RIGHT_MOTOR_ON,
} SW_ID_DRIVER;
#if defined(__cplusplus)
Modified: software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.pas
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.pas
2008-07-01 08:20:59 UTC (rev 1288)
+++ software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.pas
2008-07-01 08:39:18 UTC (rev 1289)
@@ -83,6 +83,11 @@
SW_ID_SOUND_REFLASH_BEGIN = 32;
SW_ID_SOUND_REFLASH_END = 33;
SW_ID_SOUND_REFLASH_CURRENT_TRACK = 34;
+ SW_ID_EYES_MOTOR_ON = 35;
+ SW_ID_MOUTH_MOTOR_ON = 36;
+ SW_ID_FLIPPERS_MOTOR_ON = 37;
+ SW_ID_SPIN_LEFT_MOTOR_ON = 38;
+ SW_ID_SPIN_RIGHT_MOTOR_ON = 39;
type
Modified: software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.py
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.py
2008-07-01 08:20:59 UTC (rev 1288)
+++ software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.py
2008-07-01 08:39:18 UTC (rev 1289)
@@ -66,6 +66,12 @@
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
+SW_ID_EYES_MOTOR_ON = 35
+SW_ID_MOUTH_MOTOR_ON = 36
+SW_ID_FLIPPERS_MOTOR_ON = 37
+SW_ID_SPIN_LEFT_MOTOR_ON = 38
+SW_ID_SPIN_RIGHT_MOTOR_ON = 39
SW_NAME_DRIVER = [
"wings_position",
@@ -101,7 +107,13 @@
"tuxrf_symbolic_version",
"driver_symbolic_version",
"sound_reflash_begin",
- "sound_reflash_end"
+ "sound_reflash_end",
+ "sound_reflash_current_track",
+ "eyes_motor_on",
+ "mouth_motor_on",
+ "flippers_motor_on",
+ "spin_left_motor_on",
+ "spin_right_motor_on"
]
LOG_LEVEL_DEBUG = 0
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
2008-07-01 08:20:59 UTC (rev 1288)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
2008-07-01 08:39:18 UTC (rev 1289)
@@ -189,6 +189,21 @@
INIT_INTID(SW_ID_SOUND_REFLASH_CURRENT_TRACK, ID_FMT_UINT8,
"sound_reflash_current_track", "range[0..255]", 0, 1)
+
+ INIT_INTID(SW_ID_EYES_MOTOR_ON, ID_FMT_BOOL,
+ "eyes_motor_on", "False|True", 0, 1)
+
+ INIT_INTID(SW_ID_MOUTH_MOTOR_ON, ID_FMT_BOOL,
+ "mouth_motor_on", "False|True", 0, 1)
+
+ INIT_INTID(SW_ID_FLIPPERS_MOTOR_ON, ID_FMT_BOOL,
+ "flippers_motor_on", "False|True", 0, 1)
+
+ INIT_INTID(SW_ID_SPIN_LEFT_MOTOR_ON, ID_FMT_BOOL,
+ "spin_left_motor_on", "False|True", 0, 1)
+
+ INIT_INTID(SW_ID_SPIN_RIGHT_MOTOR_ON, ID_FMT_BOOL,
+ "spin_right_motor_on", "False|True", 0, 1)
};
/**
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.h
2008-07-01 08:20:59 UTC (rev 1288)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.h
2008-07-01 08:39:18 UTC (rev 1289)
@@ -89,6 +89,11 @@
SW_ID_SOUND_REFLASH_BEGIN,
SW_ID_SOUND_REFLASH_END,
SW_ID_SOUND_REFLASH_CURRENT_TRACK,
+ SW_ID_EYES_MOTOR_ON,
+ SW_ID_MOUTH_MOTOR_ON,
+ SW_ID_FLIPPERS_MOTOR_ON,
+ SW_ID_SPIN_LEFT_MOTOR_ON,
+ SW_ID_SPIN_RIGHT_MOTOR_ON,
SW_STATUS_NUMBER // SW_STATUS_NUMBER must be last and may not be removed !!
} SW_ID;
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
