[tuxdroid-svn] r1404 - in software_suite_v2/middleware/tuxdriver/trunk: include src

[remi <c2m...@c2...>]

Author: remi
Date: 2008-07-28 13:50:18 +0200 (Mon, 28 Jul 2008)
New Revision: 1404

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_sound_flash.c
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.h
Log:
* added a new status "sound_flash_count"

Modified: software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.h	2008-07-28 09:54:44 UTC (rev 1403)
+++ software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.h	2008-07-28 11:50:18 UTC (rev 1404)
@@ -67,6 +67,7 @@
     SW_ID_FLIPPERS_MOTOR_ON,
     SW_ID_SPIN_LEFT_MOTOR_ON,
     SW_ID_SPIN_RIGHT_MOTOR_ON,
+    SW_ID_FLASH_SOUND_COUNT,
 } 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-28 09:54:44 UTC (rev 1403)
+++ software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.pas	2008-07-28 11:50:18 UTC (rev 1404)
@@ -88,6 +88,7 @@
   SW_ID_FLIPPERS_MOTOR_ON           = 37;
   SW_ID_SPIN_LEFT_MOTOR_ON          = 38;
   SW_ID_SPIN_RIGHT_MOTOR_ON         = 39;
+  SW_ID_FLASH_SOUND_COUNT           = 40;
 
 type
 

Modified: software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.py
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.py	2008-07-28 09:54:44 UTC (rev 1403)
+++ software_suite_v2/middleware/tuxdriver/trunk/include/tux_driver.py	2008-07-28 11:50:18 UTC (rev 1404)
@@ -72,6 +72,7 @@
 SW_ID_FLIPPERS_MOTOR_ON             = 37
 SW_ID_SPIN_LEFT_MOTOR_ON            = 38
 SW_ID_SPIN_RIGHT_MOTOR_ON           = 39
+SW_ID_FLASH_SOUND_COUNT             = 40
 
 SW_NAME_DRIVER = [
     "flippers_position",
@@ -113,7 +114,8 @@
     "mouth_motor_on",
     "flippers_motor_on",
     "spin_left_motor_on",
-    "spin_right_motor_on"
+    "spin_right_motor_on",
+    "sound_flash_count"
 ]
 
 LOG_LEVEL_DEBUG             = 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-07-28 09:54:44 UTC (rev 1403)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c	2008-07-28 11:50:18 UTC (rev 1404)
@@ -101,7 +101,7 @@
         sound_flash_desc.number_of_sounds,
         sound_flash_desc.flash_usage,
         sound_flash_desc.available_record_time
-   );
+    );
 
     return p;
 }
@@ -118,6 +118,8 @@
     sf_desc->number_of_sounds = hw_status_table.sound_var.number_of_sounds;
     sf_desc->flash_usage = hw_status_table.sound_var.flash_usage;
     sf_desc->available_record_time = (int)((128 - sf_desc->flash_usage) * 0.5);
+    
+    tux_sw_status_set_intvalue(SW_ID_FLASH_SOUND_COUNT, sf_desc->number_of_sounds, true);
 }
 
 /**

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-28 09:54:44 UTC (rev 1403)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c	2008-07-28 11:50:18 UTC (rev 1404)
@@ -76,7 +76,7 @@
     { id, name, value_fmt, {.strvalue = initval}, threshold, value_doc, 0.0 },
     
 sw_status_t sw_status_table[SW_STATUS_NUMBER] = {
-   INIT_STRINGID(SW_ID_FLIPPERS_POSITION, ID_FMT_STRING,
+    INIT_STRINGID(SW_ID_FLIPPERS_POSITION, ID_FMT_STRING,
         "flippers_position", "DOWN|UP", STRING_VALUE_DOWN, 1) 
         
     INIT_INTID(SW_ID_FLIPPERS_REMAINING_MVM, ID_FMT_UINT8,
@@ -204,6 +204,9 @@
         
     INIT_INTID(SW_ID_SPIN_RIGHT_MOTOR_ON, ID_FMT_BOOL,
         "spin_right_motor_on", "False|True", 0, 1)
+        
+    INIT_INTID(SW_ID_FLASH_SOUND_COUNT, ID_FMT_UINT8,
+        "sound_flash_count", "range[0..255]", 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-28 09:54:44 UTC (rev 1403)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.h	2008-07-28 11:50:18 UTC (rev 1404)
@@ -94,6 +94,7 @@
     SW_ID_FLIPPERS_MOTOR_ON,
     SW_ID_SPIN_LEFT_MOTOR_ON,
     SW_ID_SPIN_RIGHT_MOTOR_ON,
+    SW_ID_FLASH_SOUND_COUNT,
     SW_STATUS_NUMBER // SW_STATUS_NUMBER must be last and may not be removed !!
 } SW_ID;