[tuxdroid-svn] r1172 - software_suite_v2/middleware/tuxdriver/trunk/src

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

Author: eFfeM
Date: 2008-05-18 16:48:24 +0200 (Sun, 18 May 2008)
New Revision: 1172

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.h
Log:
added a function to export rf state
fixed two spots in sound_flash that were still open


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c	2008-05-18 11:35:08 UTC (rev 1171)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sound_flash.c	2008-05-18 14:48:24 UTC (rev 1172)
@@ -137,18 +137,25 @@
 tux_sound_flash_update_flash_play(void)
 {
     char *new_track = ""; 
-    char track[10] = "";
+    static char track[2][10];
+    static int tracktoggle = 0;
     
+    /* 
+       the thing with track is a little bit wicked,
+       set_strvalue will compare on pointer so the array must be static
+       also we need two arrays and toggle between them otherwise we 
+       will not get the event.
+    */
+    tracktoggle = !tracktoggle;
     if (!hw_status_table.sensors1.play_internal_sound)
     {
         new_track = STRING_VALUE_STOP;
     }
     else
     {
-    // FIX THIS
-        sprintf(track, "TRACK_%.3d", 
+        sprintf(track[tracktoggle], "TRACK_%.3d", 
             hw_status_table.sensors1.play_internal_sound);
-        new_track = track;
+        new_track = track[tracktoggle];
     }
     
     tux_sw_status_set_strvalue(SW_ID_AUDIO_FLASH_PLAY, new_track, true);
@@ -606,9 +613,7 @@
     /* Check fux connection and radio connection */
     if (reflash_info.current_state != SRS_STDBY)
     {
-        // FIX THIS
-        //rf_state = *(bool *)tux_sw_status_get_value(SW_ID_RF_STATE);
-        rf_state = true;
+        rf_state = tux_usb_get_rf_state();
         if ((!tux_usb_connected()) || (!rf_state))
         {
             reflash_info.error = SRE_RF_OFFLINE;

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c	2008-05-18 11:35:08 UTC (rev 1171)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c	2008-05-18 14:48:24 UTC (rev 1172)
@@ -605,3 +605,13 @@
 
     return tux_usb_send_raw(frame);
 }
+
+/**
+ *  Get the rf state
+ *  @param data 4 bytes array
+ */
+LIBLOCAL bool 
+tux_usb_get_rf_state(void)
+{
+    return last_knowed_rf_state;
+}

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.h	2008-05-18 11:35:08 UTC (rev 1171)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.h	2008-05-18 14:48:24 UTC (rev 1172)
@@ -190,4 +190,10 @@
  */
 extern bool tux_usb_send_raw(const unsigned char *data);
 
+/**
+ *  Get the rf state
+ *  @param data 4 bytes array
+ */
+extern bool tux_usb_get_rf_state(void);
+
 #endif /* _TUX_USB_H_ */