diff --git a/.gitignore b/.gitignore
index 6e22c007026..91fcea346b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
*.out
*~
+*.swp
*.pyc
@@ -16,6 +17,24 @@
*.aux
+# Debian related files
+*.deb
+*.dsc
+*.changes
+*.substvars
+*.debhelper.log
+*-stamp
+/debian/control
+/debian/changelog
+/debian/files
+/debian/paparazzi-arm7
+/debian/paparazzi-avr
+/debian/paparazzi-dev
+/debian/paparazzi-bin
+/sw/lib/ocaml/ivy/debian/changelog
+/sw/lib/ocaml/ivy/debian/files
+/sw/lib/ocaml/ivy/debian/ivy-ocaml
+
/var
/dox
@@ -89,3 +108,17 @@
# /sw/tools/
/sw/tools/fp_parser.ml
/sw/tools/wiki_gen/wiki_gen
+
+# /sw/ground_segment/joystick
+/sw/ground_segment/joystick/test_stick
+
+# /sw/airborne/arch/lpc21/test/bootloader
+/sw/airborne/arch/lpc21/test/bootloader/bl.dmp
+/sw/airborne/arch/lpc21/test/bootloader/bl.hex
+/sw/airborne/arch/lpc21/test/bootloader/bl.map
+/sw/airborne/arch/lpc21/test/bootloader/bl.elf
+/sw/airborne/arch/lpc21/test/bootloader/bl_ram.dmp
+/sw/airborne/arch/lpc21/test/bootloader/bl_ram.hex
+/sw/airborne/arch/lpc21/test/bootloader/bl_ram.map
+/sw/airborne/arch/lpc21/test/bootloader/bl_ram.elf
+/sw/airborne/arch/lpc21/test/bootloader/crt.lst
diff --git a/conf/airframes/ENAC/quadrotor/booz2_g1.xml b/conf/airframes/ENAC/quadrotor/booz2_g1.xml
index 0df16e15f00..b1405b39313 100644
--- a/conf/airframes/ENAC/quadrotor/booz2_g1.xml
+++ b/conf/airframes/ENAC/quadrotor/booz2_g1.xml
@@ -16,7 +16,7 @@
-
+
@@ -29,7 +29,9 @@
-
+
+
+
diff --git a/sw/lib/ocaml/ivy/cglibivy.c b/sw/lib/ocaml/ivy/cglibivy.c
index 228246d85fc..8241b70fc22 100644
--- a/sw/lib/ocaml/ivy/cglibivy.c
+++ b/sw/lib/ocaml/ivy/cglibivy.c
@@ -20,8 +20,8 @@ value ivy_GtkmainLoop(value unit)
}
extern void cb_delete_channel(void *delete_read);
-extern void cb_read_channel(Channel ch, HANDLE fd, void *closure);
-extern void cb_write_channel(Channel ch, HANDLE fd, void *closure);
+extern void cb_read_channel(Channel ch, IVY_HANDLE fd, void *closure);
+extern void cb_write_channel(Channel ch, IVY_HANDLE fd, void *closure);
value ivy_GtkchannelSetUp(value fd, value closure_name)
{
@@ -29,9 +29,9 @@ value ivy_GtkchannelSetUp(value fd, value closure_name)
value * closure = caml_named_value(String_val(closure_name));
#if IVYMINOR_VERSION == 8
- c = IvyChannelAdd((HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel);
+ c = IvyChannelAdd((IVY_HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel);
#else
- c = IvyChannelAdd((HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel, cb_write_channel);
+ c = IvyChannelAdd((IVY_HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel, cb_write_channel);
#endif
return Val_int(c);
}
diff --git a/sw/lib/ocaml/ivy/civy.c b/sw/lib/ocaml/ivy/civy.c
index 15561182d4f..563f7ec517b 100644
--- a/sw/lib/ocaml/ivy/civy.c
+++ b/sw/lib/ocaml/ivy/civy.c
@@ -83,11 +83,11 @@ void cb_delete_channel(void *delete_read)
{
}
-void cb_write_channel(Channel ch, HANDLE fd, void *closure)
+void cb_write_channel(Channel ch, IVY_HANDLE fd, void *closure)
{
}
-void cb_read_channel(Channel ch, HANDLE fd, void *closure)
+void cb_read_channel(Channel ch, IVY_HANDLE fd, void *closure)
{
callback(*(value*)closure, Val_int(ch));
}
diff --git a/sw/lib/ocaml/ivy/civyloop.c b/sw/lib/ocaml/ivy/civyloop.c
index 4ff0a9311f8..083b104ee15 100644
--- a/sw/lib/ocaml/ivy/civyloop.c
+++ b/sw/lib/ocaml/ivy/civyloop.c
@@ -39,8 +39,8 @@ value ivy_timerRepeatafter(value nb_ticks,value delay, value closure_name)
read closures */
extern void cb_delete_channel(void *delete_read);
-extern void cb_read_channel(Channel ch, HANDLE fd, void *closure);
-extern void cb_write_channel(Channel ch, HANDLE fd, void *closure);
+extern void cb_read_channel(Channel ch, IVY_HANDLE fd, void *closure);
+extern void cb_write_channel(Channel ch, IVY_HANDLE fd, void *closure);
value ivy_channelSetUp(value fd, value closure_name)
@@ -49,9 +49,9 @@ value ivy_channelSetUp(value fd, value closure_name)
value * closure = caml_named_value(String_val(closure_name));
#if IVYMINOR_VERSION == 8
- c = IvyChannelAdd((HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel);
+ c = IvyChannelAdd((IVY_HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel);
#else
- c = IvyChannelAdd((HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel, cb_write_channel);
+ c = IvyChannelAdd((IVY_HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel, cb_write_channel);
#endif
return Val_int(c);
}
diff --git a/sw/lib/ocaml/ivy/ctkivy.c b/sw/lib/ocaml/ivy/ctkivy.c
index ae31560816e..87b7eb617d9 100644
--- a/sw/lib/ocaml/ivy/ctkivy.c
+++ b/sw/lib/ocaml/ivy/ctkivy.c
@@ -11,7 +11,7 @@
#include "ivytcl.h"
extern void cb_delete_channel(void *delete_read);
-extern void cb_read_channel(Channel ch, HANDLE fd, void *closure);
+extern void cb_read_channel(Channel ch, IVY_HANDLE fd, void *closure);
value ivy_TclmainLoop(value unit)
{
@@ -25,7 +25,7 @@ value ivy_TclchannelSetUp(value fd, value closure_name)
Channel c;
value * closure = caml_named_value(String_val(closure_name));
- c = IvyTclChannelSetUp((HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel);
+ c = IvyTclChannelSetUp((IVY_HANDLE)Int_val(fd), (void*)closure, cb_delete_channel, cb_read_channel);
return Val_int(c);
}
diff --git a/sw/lib/ocaml/ivy/debian/changelog.3.11.2 b/sw/lib/ocaml/ivy/debian/changelog.3.11.2
index eb649f9b77e..e365e339215 100644
--- a/sw/lib/ocaml/ivy/debian/changelog.3.11.2
+++ b/sw/lib/ocaml/ivy/debian/changelog.3.11.2
@@ -1,3 +1,9 @@
+ivy-ocaml (1.1-12) unstable; urgency=low
+
+ * Support for ivy-c_3.11.8
+
+ -- Gautier Hattenberger Wed, 02 Feb 2011 17:49:31 +0100
+
ivy-ocaml (1.1-11) unstable; urgency=low
* Support of ivy-c_3.11.6, OSX and Linux 64bit