[tuxdroid-svn] r1330 - / firmware/fuxusb/branches/usb_cleanup/bootloader firmware/fuxusb/trunk firmware/fuxusb/trunk/src software_suite_v1 software_suite_v1/api software_suite_v2/middleware/tuxdriver/trunk/unix

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

Author: Paul_R
Date: 2008-07-16 12:46:15 +0200 (Wed, 16 Jul 2008)
New Revision: 1330

Added:
   software_suite_v1/
   software_suite_v1/api/
   software_suite_v1/api/python/
   software_suite_v1/daemon/
   software_suite_v1/software/
Removed:
   api/
   daemon/
   software/
   software_suite_v1/api/python/
Modified:
   firmware/fuxusb/branches/usb_cleanup/bootloader/twi.h
   firmware/fuxusb/trunk/fuxusb.Opt
   firmware/fuxusb/trunk/src/usb_commands.c
   firmware/fuxusb/trunk/src/version.h
   software_suite_v2/middleware/tuxdriver/trunk/unix/Makefile
Log:
* Moved daemon, api and software into a new directory 'software_suite_v1'


Modified: firmware/fuxusb/branches/usb_cleanup/bootloader/twi.h
===================================================================
--- firmware/fuxusb/branches/usb_cleanup/bootloader/twi.h	2008-07-16 08:26:54 UTC (rev 1329)
+++ firmware/fuxusb/branches/usb_cleanup/bootloader/twi.h	2008-07-16 10:46:15 UTC (rev 1330)
@@ -1,4 +1,4 @@
-/* $Id:$ */
+/* $Id$ */
 
 #ifndef _LIBMCU_TWI_H_
 #define _LIBMCU_TWI_H_ 1

Modified: firmware/fuxusb/trunk/fuxusb.Opt
===================================================================
(Binary files differ)

Modified: firmware/fuxusb/trunk/src/usb_commands.c
===================================================================
--- firmware/fuxusb/trunk/src/usb_commands.c	2008-07-16 08:26:54 UTC (rev 1329)
+++ firmware/fuxusb/trunk/src/usb_commands.c	2008-07-16 10:46:15 UTC (rev 1330)
@@ -97,13 +97,20 @@
 void prepare_status(void)
 {
     uint8_t data i;
+    /* XXX
+     * This counter is only used for debug. 
+     * With the new driver, sometimes, the RF status is online but no statuses
+     * are present on the frame. 
+     * This counter is incremented each time a status frame is sent, to 
+     * determine if the commands are correclty executed. */
+    static uint8_t debug_counter = 0;
             
     if((status_requested) && (CMD_IN_Bank_Nb < 2))
     {
         Usb_select_ep(EP_CMD_IN);
 
         /* Write header */
-        Usb_write_byte(0);
+        Usb_write_byte(debug_counter++);
         Usb_write_byte(RF_OFFLINE ? 0 : 1);
         Usb_write_byte(RF_Status);
         Usb_write_byte(FifoIn_STT_Idx ? (FifoIn_STT_Idx / 4) : 0);

Modified: firmware/fuxusb/trunk/src/version.h
===================================================================
--- firmware/fuxusb/trunk/src/version.h	2008-07-16 08:26:54 UTC (rev 1329)
+++ firmware/fuxusb/trunk/src/version.h	2008-07-16 10:46:15 UTC (rev 1330)
@@ -19,7 +19,7 @@
  * KySoH iTux agent created on 2005/10/20 by David Bourgeois
  */
 
-/* $Id:$ */
+/* $Id$ */
 
 #ifndef _VERSION_H_
 #define _VERSION_H_

Copied: software_suite_v1/api (from rev 1328, api)

Copied: software_suite_v1/api/python (from rev 1329, api/python)

Copied: software_suite_v1/daemon (from rev 1329, daemon)

Copied: software_suite_v1/software (from rev 1329, software)

Modified: software_suite_v2/middleware/tuxdriver/trunk/unix/Makefile
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/unix/Makefile	2008-07-16 08:26:54 UTC (rev 1329)
+++ software_suite_v2/middleware/tuxdriver/trunk/unix/Makefile	2008-07-16 10:46:15 UTC (rev 1330)
@@ -10,7 +10,7 @@
 TARGET = libtuxdriver.so
 C_INCLUDE_DIRS = -I"../../../../../../../usr/local/include" 
 C_PREPROC = 
-CFLAGS = -pipe -std=gnu99 -DUSE_MUTEX -Wall -g0 -O2 -fPIC 
+CFLAGS = -pipe -std=gnu99 -DUSE_MUTEX -Wall -g0 -O2 -fPIC  -DUSB_IDFRAME -DUSB_DEBUG
 LIB_DIRS = 
 LIBS = -lpthread -lm 
 LDFLAGS = -pipe -shared