[paparazzi-commits] [4909] cube fixes

[Martin Mueller]

Revision: 4909
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4909
Author:   mmm
Date:     2010-05-15 13:27:48 +0000 (Sat, 15 May 2010)
Log Message:
-----------
cube fixes

Modified Paths:
--------------
    paparazzi3/trunk/conf/settings/nav_cube.xml
    paparazzi3/trunk/sw/airborne/main_logger.c
    paparazzi3/trunk/sw/airborne/nav_cube.h

Added Paths:
-----------
    paparazzi3/trunk/conf/airframes/mm/extra/quiet.xml

Added: paparazzi3/trunk/conf/airframes/mm/extra/quiet.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/mm/extra/quiet.xml                          
(rev 0)
+++ paparazzi3/trunk/conf/airframes/mm/extra/quiet.xml  2010-05-15 13:27:48 UTC 
(rev 4909)
@@ -0,0 +1,31 @@
+<!DOCTYPE airframe SYSTEM "airframe.dtd">
+
+<!--
+      just remain quiet
+-->
+
+<airframe name="Logger">
+
+ <makefile>
+
+CONFIG = \"tiny_2_1_1_usb.h\"
+
+include $(PAPARAZZI_SRC)/conf/autopilot/tiny.makefile
+
+FLASH_MODE=IAP
+
+ap.CFLAGS += -DBOARD_CONFIG=$(CONFIG)
+ap.srcs = sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c 
main_logger.c
+
+#choose one
+ap.CFLAGS += -DLOG_XBEE
+
+#set the speed
+ap.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B57600 -DUSE_UART0_RX_ONLY
+ap.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 -DUSE_UART1_RX_ONLY
+ap.srcs += $(SRC_ARCH)/uart_hw.c
+
+  </makefile>
+
+</airframe>
+

Modified: paparazzi3/trunk/conf/settings/nav_cube.xml
===================================================================
--- paparazzi3/trunk/conf/settings/nav_cube.xml 2010-05-11 14:26:35 UTC (rev 
4908)
+++ paparazzi3/trunk/conf/settings/nav_cube.xml 2010-05-15 13:27:48 UTC (rev 
4909)
@@ -7,14 +7,14 @@
       <dl_setting MIN="1" MAX="12"  STEP="1" VAR="cube_sect"    
module="nav_cube" handler="SetSect"/>
       <dl_setting MIN="1" MAX="50"  STEP="1" VAR="cube_grid_x"  
module="nav_cube" handler="SetGridX"/>
       <dl_setting MIN="1" MAX="50"  STEP="1" VAR="cube_grid_z"  
module="nav_cube" handler="SetGridZ"/>
-      <dl_setting MIN="-200" MAX="200" STEP="1" VAR="cube_offs_x"  
module="nav_cube" handler="SetOffsX"/>
-      <dl_setting MIN="-200" MAX="200" STEP="1" VAR="cube_offs_y"  
module="nav_cube" handler="SetOffsY"/>
-      <dl_setting MIN="-200" MAX="200" STEP="1" VAR="cube_offs_z"  
module="nav_cube" handler="SetOffsZ"/>
-      <dl_setting MIN="1" MAX="500" STEP="1" VAR="cube_size_x"  
module="nav_cube" handler="SetSizeX"/>
-      <dl_setting MIN="1" MAX="500" STEP="1" VAR="cube_size_y"  
module="nav_cube" handler="SetSizeY"/>
-      <dl_setting MIN="1" MAX="500" STEP="1" VAR="cube_size_z"  
module="nav_cube" handler="SetSizeZ"/>
-      <dl_setting MIN="1" MAX="8"   STEP="1" VAR="cube_nsect_x" 
module="nav_cube" handler="SetNSectX"/>
-      <dl_setting MIN="1" MAX="8"   STEP="1" VAR="cube_nsect_z" 
module="nav_cube" handler="SetNSectZ"/>
+      <dl_setting MIN="-200" MAX="200" STEP="10" VAR="cube_offs_x"  
module="nav_cube" handler="SetOffsX"/>
+      <dl_setting MIN="-400" MAX="200" STEP="10" VAR="cube_offs_y"  
module="nav_cube" handler="SetOffsY"/>
+      <dl_setting MIN="-200" MAX="200" STEP="10" VAR="cube_offs_z"  
module="nav_cube" handler="SetOffsZ"/>
+      <dl_setting MIN="1" MAX="500" STEP="10" VAR="cube_size_x"  
module="nav_cube" handler="SetSizeX"/>
+      <dl_setting MIN="1" MAX="500" STEP="10" VAR="cube_size_y"  
module="nav_cube" handler="SetSizeY"/>
+      <dl_setting MIN="1" MAX="500" STEP="10" VAR="cube_size_z"  
module="nav_cube" handler="SetSizeZ"/>
+      <dl_setting MIN="1" MAX="8"   STEP="1"  VAR="cube_nsect_x" 
module="nav_cube" handler="SetNSectX"/>
+      <dl_setting MIN="1" MAX="8"   STEP="1"  VAR="cube_nsect_z" 
module="nav_cube" handler="SetNSectZ"/>
     </dl_settings>
   </dl_settings>
 </settings>

Modified: paparazzi3/trunk/sw/airborne/main_logger.c
===================================================================
--- paparazzi3/trunk/sw/airborne/main_logger.c  2010-05-11 14:26:35 UTC (rev 
4908)
+++ paparazzi3/trunk/sw/airborne/main_logger.c  2010-05-15 13:27:48 UTC (rev 
4909)
@@ -101,8 +101,8 @@
 #define TRUE (!FALSE)
 #endif
 
-/* BUTTON that stops logging (BUTTON = P0.7, INT1 = P0.14) */
-#define STOP_KEY 14
+/* BUTTON that stops logging (BUTTON = P0.7, DTR = P0.13, INT1 = P0.14) */
+#define STOP_KEY 13
 
 /* USB Vbus (= P0.23) */
 #define VBUS_PIN 23
@@ -391,8 +391,8 @@
 
         max11040_data = MAX11040_IDLE;
 
-        log_buffer[LOG_DATA_OFFSET+0] = 100; // sender_id;
-        log_buffer[LOG_DATA_OFFSET+1] = 61;  // message_id;
+        log_buffer[LOG_DATA_OFFSET+0] = AC_ID;  // sender_id
+        log_buffer[LOG_DATA_OFFSET+1] = 61;     // message_id 
(DL_TURB_PRESSURE_RAW)
 
        while(max11040_buf_in != max11040_buf_out) {
           for (i=0; i<16; i++) {

Modified: paparazzi3/trunk/sw/airborne/nav_cube.h
===================================================================
--- paparazzi3/trunk/sw/airborne/nav_cube.h     2010-05-11 14:26:35 UTC (rev 
4908)
+++ paparazzi3/trunk/sw/airborne/nav_cube.h     2010-05-15 13:27:48 UTC (rev 
4909)
@@ -94,8 +94,8 @@
    --------->                    -           -
                                  | (grid_z)  |
    --------->                    -           |
-                                 | (offs_z)  | (size_z)
-   --------->                    |           | 
+                                 -           | (size_z)
+   --------->                    | (offs_z)  | 
                       o [alt]    -           |
    --------->                                -