Pulled Master

.gitignore

@@ -59,6 +59,8 @@
 /sw/ground_segment/cockpit/gtk_setting_time.ml
 /sw/ground_segment/cockpit/gcs
 /sw/ground_segment/cockpit/gtk_strip.ml
+/sw/ground_segment/cockpit/ant_track
+
 
 # /sw/ground_segment/lpc21iap/
 /sw/ground_segment/lpc21iap/lpc21iap
@@ -81,11 +83,15 @@
 /sw/ground_segment/tmtc/server
 /sw/ground_segment/tmtc/diadec
 /sw/ground_segment/misc/ivy2serial
+/sw/ground_segment/tmtc/GSM/SMS_GS
 
 # /sw/ground_segment/joystick
 /sw/ground_segment/joystick/input2ivy
 /sw/ground_segment/joystick/test_stick
 
+/sw/in_progress/fdm/fdm_step
+/sw/in_progress/fdm/fms_steps_attitude
+
 # /sw/lib/ocaml/
 /sw/lib/ocaml/gtk_papget_editor.ml
 /sw/lib/ocaml/gtk_papget_text_editor.ml
@@ -103,6 +109,13 @@
 /sw/logalizer/gtk_export.ml
 /sw/logalizer/sd2log
 /sw/logalizer/plotprofile
+/sw/logalizer/ahrsview
+/sw/logalizer/ctrlstick
+/sw/logalizer/ffjoystick
+/sw/logalizer/imuview
+/sw/logalizer/ivy_example
+/sw/logalizer/motor_bench
+/sw/logalizer/tmclient
 
 # /sw/simulator/
 /sw/simulator/gaia

Makefile

@@ -61,14 +61,23 @@ UBX_XML = $(CONF)/ubx.xml
 MTK_XML = $(CONF)/mtk.xml
 XSENS_XML = $(CONF)/xsens_MTi-G.xml
 TOOLS=$(PAPARAZZI_SRC)/sw/tools
+OCAML=$(shell which ocaml)
+OCAMLRUN=$(shell which ocamlrun)
+
+# try to find the paparazzi multilib toolchain
+TOOLCHAIN_DIR=$(shell find -L /opt/paparazzi/arm-multilib ~/sat -maxdepth 1 -type d -name arm-none-eabi 2>/dev/null | head -n 1 | xargs dirname )
+ifneq ($(TOOLCHAIN_DIR),)
+#found the compiler from the paparazzi multilib package
+ARMGCC=$(TOOLCHAIN_DIR)/bin/arm-none-eabi-gcc
+else
+#try picking up the arm-none-eabi compiler from the path, otherwise use arm-elf
 HAVE_ARM_NONE_EABI_GCC := $(shell which arm-none-eabi-gcc)
 ifeq ($(strip $(HAVE_ARM_NONE_EABI_GCC)),)
 ARMGCC=$(shell which arm-elf-gcc)
 else
 ARMGCC=$(HAVE_ARM_NONE_EABI_GCC)
 endif
-OCAML=$(shell which ocaml)
-OCAMLRUN=$(shell which ocamlrun)
+endif
 
 all: conf commands static
 

Makefile.ac

@@ -71,8 +71,9 @@ endif
 
 
 all_ac_h: $(AIRFRAME_H) $(MODULES_H) $(SETTINGS_H) $(TUNING_H) $(MAKEFILE_AC) $(PERIODIC_H)
-	@echo "TARGET: " $(TARGET) "\n" > $(ACINCLUDE)/$(TARGET)_srcs.list
-	@echo "CFLAGS: " $($(TARGET).CFLAGS) "\n"  >> $(ACINCLUDE)/$(TARGET)_srcs.list
+	@echo "TARGET: " $(TARGET)"\n" > $(ACINCLUDE)/$(TARGET)_srcs.list
+	@echo "CFLAGS: " $($(TARGET).CFLAGS)"\n"  >> $(ACINCLUDE)/$(TARGET)_srcs.list
+	@echo "LDFLAGS: " $($(TARGET).LDFLAGS)"\n"  >> $(ACINCLUDE)/$(TARGET)_srcs.list
 	@echo "srcs: " $($(TARGET).srcs) >> $(ACINCLUDE)/$(TARGET)_srcs.list
 
 radio_ac_h : $(RADIO_H)

conf/Makefile.jsbsim

@@ -1,5 +1,5 @@
 # Hey Emacs, this is a -*- makefile -*-
-# 
+#
 #   $Id: Makefile.sim 3505 2009-06-17 12:59:32Z hecto $
 #   Copyright (C) 2006 Pascal Brisset, Antoine Drouin
 #
@@ -18,8 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with paparazzi; see the file COPYING.  If not, write to
 # the Free Software Foundation, 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.  
-# 
+# Boston, MA 02111-1307, USA.
+#
 
 #
 # This is the Makefile for the JSBSim target.
@@ -93,8 +93,8 @@ $(OBJDIR)/.depend:
 	@echo DEPEND $@
 	$(Q)$(CC) -MM -MG $(CFLAGS) $($(TARGET).srcs) | sed 's|\([^\.]*\.o\)|$(OBJDIR)/\1|' > $@
 
-ifneq ($(MAKECMDGOALS),clean) 
-ifneq ($(MAKECMDGOALS),erase) 
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(MAKECMDGOALS),erase)
 -include $(OBJDIR)/.depend
 endif
 endif

conf/Makefile.lpc21

@@ -31,25 +31,51 @@
 # only define here or elsewhere?
 SRC_ARCH = arch/lpc21
 
-# Define programs and commands.
+
+# Programs location
+# try to find the paparazzi multilib toolchain
+TOOLCHAIN_DIR=$(shell find -L /opt/paparazzi/arm-multilib ~/sat -maxdepth 1 -type d -name arm-none-eabi 2>/dev/null | head -n 1 | xargs dirname )
+
+#
+# found the new paparazzi toolchain, use it
+#
+ifneq ($(TOOLCHAIN_DIR),)
+GCC_BIN_DIR=$(TOOLCHAIN_DIR)/bin
+GCC_LIB_DIR=$(TOOLCHAIN_DIR)/arm-none-eabi/lib
+GCC_BIN_PREFIX=$(GCC_BIN_DIR)/arm-none-eabi
+CC      = $(GCC_BIN_PREFIX)-gcc
+LD      = $(GCC_BIN_PREFIX)-gcc
+OBJCOPY = $(GCC_BIN_PREFIX)-objcopy
+OBJDUMP = $(GCC_BIN_PREFIX)-objdump
+NM      = $(GCC_BIN_PREFIX)-nm
+SIZE    = $(GCC_BIN_PREFIX)-size
+OOCD    = $(TOOLCHAIN_DIR)/bin/openocd
+
+#
+# If we can't find the toolchain (in /opt/paparazzi/arm-multilib or ~/sat) then try picking up the compilers from the path
+#
+else
+
+# see if we can find the new arm-none-eabi, otherwise use the older arm-elf
 HAVE_ARM_NONE_EABI_GCC := $(shell which arm-none-eabi-gcc)
 ifeq ($(strip $(HAVE_ARM_NONE_EABI_GCC)),)
-CC		= arm-elf-gcc
-LD		= $(CC)
-SHELL = sh
-OBJCOPY = arm-elf-objcopy
-OBJDUMP = arm-elf-objdump
-SIZE = arm-elf-size
-NM = arm-elf-nm
+GCC_PREFIX = arm-elf
 else
-CC		= arm-none-eabi-gcc
-LD		= $(CC)
-SHELL = sh
-OBJCOPY = arm-none-eabi-objcopy
-OBJDUMP = arm-none-eabi-objdump
-SIZE = arm-none-eabi-size
-NM = arm-none-eabi-nm
+GCC_PREFIX = arm-none-eabi
+GCC_LIB_DIR=$(shell dirname `which arm-none-eabi-gcc`)/../arm-none-eabi/lib
 endif
+
+CC      = $(shell which $(GCC_PREFIX)-gcc)
+LD      = $(shell which $(GCC_PREFIX)-gcc)
+OBJCOPY = $(shell which $(GCC_PREFIX)-objcopy)
+OBJDUMP = $(shell which $(GCC_PREFIX)-objdump)
+NM      = $(shell which $(GCC_PREFIX)-nm)
+SIZE    = $(shell which $(GCC_PREFIX)-size)
+OOCD    = $(shell which openocd)
+endif
+
+# Define some other programs and commands.
+SHELL = sh
 REMOVE = rm -f
 COPY = cp
 
@@ -87,7 +113,7 @@ CINCS = $(INCLUDES) -I $(SRC_ARCH)/include
 CFLAGS = $(CINCS)
 CFLAGS += -O$(OPT)
 # CFLAGS += -malignment-traps
-CFLAGS += -Wall -Wcast-qual -Wimplicit -Wcast-align -Winline
+CFLAGS += -Wall -Wcast-qual -Wimplicit -Wcast-align
 CFLAGS += -Wpointer-arith -Wswitch
 CFLAGS += -Wredundant-decls -Wreturn-type -Wshadow -Wunused
 CFLAGS += -Wa,-adhlns=$(OBJDIR)/$(notdir $(subst $(suffix $<),.lst,$<))

conf/Makefile.omap

@@ -18,8 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with paparazzi; see the file COPYING.  If not, write to
 # the Free Software Foundation, 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.  
-# 
+# Boston, MA 02111-1307, USA.
+#
 
 # Define programs and commands.
 
@@ -56,17 +56,17 @@ CFLAGS += -Wredundant-decls -Wreturn-type -Wshadow -Wunused
 
 # flags only for C
 CFLAGS + = -Wstrict-prototypes -Wmissing-declarations
-CFLAGS += -Wmissing-prototypes -Wnested-externs 
+CFLAGS += -Wmissing-prototypes -Wnested-externs
 CFLAGS += $(CSTANDARD)
-CFLAGS += $($(TARGET).CFLAGS)		
+CFLAGS += $($(TARGET).CFLAGS)
 
 
 CXX = /opt/paparazzi/omap/overo-oe/tmp/sysroots/i686-linux/usr/armv7a/bin/arm-angstrom-linux-gnueabi-g++
 CXXFLAGS = -pipe -O3 -fshow-column -ffast-math -fPIC
-CXXFLAGS += -g -ffunction-sections -fdata-sections 
+CXXFLAGS += -g -ffunction-sections -fdata-sections
 CXXFLAGS += -mfloat-abi=softfp -mtune=cortex-a8 -mfpu=vfp -march=armv7-a
 CXXFLAGS += -Wall -Wextra
-CXXFLAGS += $($(TARGET).CXXFLAGS)	
+CXXFLAGS += $($(TARGET).CXXFLAGS)
 
 
 SRC_C_OMAP  = $($(TARGET).srcs)
@@ -81,7 +81,7 @@ build: elf
 
 elf: $(OBJDIR)/$(TARGET).elf
 
-# Program the device.  
+# Program the device.
 load upload program: $(OBJDIR)/$(TARGET).elf
 	scp $(OBJDIR)/$(TARGET).elf $(USER)@$(HOST):$(TARGET_DIR)
 
@@ -91,20 +91,20 @@ load upload program: $(OBJDIR)/$(TARGET).elf
 %.elf:   $(OBJ_C_OMAP) $(OBJ_CPP_OMAP)
 	@echo LD $@
 	$(Q)if (expr "$($(TARGET).cpp_srcs)"); \
-          then $(CXX) $(CXXFLAGS) $(OBJ_CPP_OMAP) $(OBJ_C_OMAP) --output $@ $(LDFLAGS) $($(TARGET).LDFLAGS); \
-          else $(CC) $(CFLAGS) $(OBJ_C_OMAP) --output $@ $(LDFLAGS) $($(TARGET).LDFLAGS); fi
+		  then $(CXX) $(CXXFLAGS) $(OBJ_CPP_OMAP) $(OBJ_C_OMAP) --output $@ $(LDFLAGS) $($(TARGET).LDFLAGS); \
+		  else $(CC) $(CFLAGS) $(OBJ_C_OMAP) --output $@ $(LDFLAGS) $($(TARGET).LDFLAGS); fi
 
 # Compile: create object files from C source files
 $(OBJDIR)/%.o : %.c $(OBJDIR)/../Makefile.ac
 	@echo CC $@
 	$(Q)test -d $(dir $@) || mkdir -p $(dir $@)
-	$(Q)$(CC) -c $(CFLAGS) $< -o $@ 
+	$(Q)$(CC) -c $(CFLAGS) $< -o $@
 
 # Compile: create object files from C++ source files
 $(OBJDIR)/%.o : %.cpp $(OBJDIR)/../Makefile.ac
 	@echo CXX $@
 	$(Q)test -d $(dir $@) || mkdir -p $(dir $@)
-	$(Q)$(CXX) -c $(CXXFLAGS) $< -o $@ 
+	$(Q)$(CXX) -c $(CXXFLAGS) $< -o $@
 
 # Listing of phony targets.
 .PHONY : all build elf clean clean_list
@@ -118,8 +118,8 @@ $(OBJDIR)/.depend:
 	@test -d $(OBJDIR) || mkdir -p $(OBJDIR)
 	$(Q)$(CC) -MM -MG $(CFLAGS) $($(TARGET).CFLAGS) $($(TARGET).srcs) | sed 's|\([^\.]*\.o\)|$(OBJDIR)/\1|' > $@
 
-ifneq ($(MAKECMDGOALS),clean) 
-ifneq ($(MAKECMDGOALS),erase) 
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(MAKECMDGOALS),erase)
 -include $(OBJDIR)/.depend
 endif
 endif

conf/Makefile.pentium-m

@@ -18,8 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with paparazzi; see the file COPYING.  If not, write to
 # the Free Software Foundation, 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.  
-# 
+# Boston, MA 02111-1307, USA.
+#
 
 # Define programs and commands.
 CC		= gcc
@@ -54,9 +54,9 @@ CFLAGS += -m32
 
 # flags only for C
 CFLAGS += -Wstrict-prototypes -Wmissing-declarations
-CFLAGS += -Wmissing-prototypes -Wnested-externs 
+CFLAGS += -Wmissing-prototypes -Wnested-externs
 CFLAGS += $(CSTANDARD)
-CFLAGS += $($(TARGET).CFLAGS) $(LOCAL_CFLAGS)		
+CFLAGS += $($(TARGET).CFLAGS) $(LOCAL_CFLAGS)
 
 #Additional libraries.
 MATH_LIB = -lm
@@ -72,7 +72,7 @@ build: elf
 
 elf: $(OBJDIR)/$(TARGET).elf
 
-# Program the device.  
+# Program the device.
 load upload program: $(OBJDIR)/$(TARGET).elf
 ifdef USER
 	ssh $(USER)@$(HOST) "sudo mount -o remount,rw /"
@@ -93,7 +93,7 @@ endif
 $(OBJDIR)/%.o : %.c $(OBJDIR)/../Makefile.ac
 	@echo CC $@
 	$(Q)test -d $(dir $@) || mkdir -p $(dir $@)
-	$(Q)$(CC) -c $(CFLAGS) $< -o $@ 
+	$(Q)$(CC) -c $(CFLAGS) $< -o $@
 
 # Listing of phony targets.
 .PHONY : all build elf clean clean_list
@@ -107,8 +107,8 @@ $(OBJDIR)/.depend:
 	@test -d $(OBJDIR) || mkdir -p $(OBJDIR)
 	$(Q)$(CC) -MM -MG $(CFLAGS) $($(TARGET).CFLAGS) $($(TARGET).srcs) | sed 's|\([^\.]*\.o\)|$(OBJDIR)/\1|' > $@
 
-ifneq ($(MAKECMDGOALS),clean) 
-ifneq ($(MAKECMDGOALS),erase) 
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(MAKECMDGOALS),erase)
 -include $(OBJDIR)/.depend
 endif
 endif

conf/Makefile.stm32

@@ -38,7 +38,7 @@ OPT   = s
 #OPT   = 0
 
 # Programs location
-TOOLCHAIN_DIR=$(shell find -L ~/sat /opt/paparazzi/stm32 -maxdepth 1 -type d -name arm-none-eabi 2>/dev/null | head -n 1 | xargs dirname )
+TOOLCHAIN_DIR=$(shell find -L /opt/paparazzi/arm-multilib ~/sat /opt/paparazzi/stm32 -maxdepth 1 -type d -name arm-none-eabi 2>/dev/null | head -n 1 | xargs dirname )
 GCC_BIN_DIR=$(TOOLCHAIN_DIR)/bin
 GCC_LIB_DIR=$(TOOLCHAIN_DIR)/arm-none-eabi/lib
 
@@ -254,8 +254,8 @@ endif
 
 start_gdb:
 	xterm -e "$(OOCD) -f interface/$(OOCD_INTERFACE).cfg  -f target/$(OOCD_TARGET).cfg" &
-	xterm -e "/opt/paparazzi/stm32/bin/openocd -f interface/lisa-l.cfg -f board/lisa-l.cfg"&
-	xterm -e "/opt/paparazzi/stm32/bin/openocd -f interface/flossjtag.cfg -f board/lisa-l.cfg"&
+	xterm -e "$(OOCD) -f interface/lisa-l.cfg -f board/lisa-l.cfg"&
+	xterm -e "$(OOCD) -f interface/flossjtag.cfg -f board/lisa-l.cfg"&
 
 start_telnet:
 	xterm -e "telnet localhost 4444" &

conf/airframes/Poine/turntable.xml

@@ -5,14 +5,16 @@ ARCH=lpc21
 
 FLASH_MODE = IAP
 
-MB=motor_bench
+MB=firmwares/motor_bench
 
 main.ARCHDIR = $(ARCH)
 
 main.CFLAGS += -DBOARD_CONFIG=\"boards/olimex_lpc_h2148.h\" -I$(MB)
 main.CFLAGS += -DPERIPHERALS_AUTO_INIT
 main.srcs = $(MB)/main_turntable.c
 main.srcs += $(SRC_ARCH)/armVIC.c
+main.srcs += mcu.c
+main.srcs += $(SRC_ARCH)/mcu_arch.c
 
 main.CFLAGS += -DUSE_LED
 main.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./512.))' -DTIME_LED=1
@@ -25,6 +27,7 @@ main.srcs += sys_time.c $(MB)/turntable_systime.c
 #main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UsbS
 
 main.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B115200
+main.srcs += mcu_periph/uart.c
 main.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0
 

conf/airframes/flixr_discovery.xml

@@ -32,6 +32,7 @@ http://paparazzi.enac.fr/w/index.php?title=Theory_of_Operation
     <!-- Communication -->
     <subsystem name="telemetry" type="transparent"/>
     <subsystem name="radio_control" type="ppm"/>
+    <!--subsystem name="settings" type="rc"/-->
 
     <!-- Control -->
     <subsystem name="control" type="new"/>

conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile

@@ -1 +1 @@
-$(error Attitude estimation via infrared has been implemented as an AHRS subsystem now. Please replace <subsystem name="attitude" type="infrared"/> with <subsystem name="ahrs" type="infrared"/> and add the module <load name="infrared.xml"/> in your airframe file.)
+$(error Attitude estimation via infrared has been implemented as an AHRS subsystem now. Please replace <subsystem name="attitude" type="infrared"/> with <subsystem name="ahrs" type="infrared"/> and add the module <load name="infrared_adc.xml"/> in your airframe file.)

conf/autopilot/subsystems/fixedwing/autopilot.makefile

@@ -215,7 +215,7 @@ jsbsim.srcs 		+= $(SIMDIR)/sim_ac_jsbsim.c $(SIMDIR)/sim_ac_fw.c $(SIMDIR)/sim_a
 
 # external libraries
 jsbsim.CFLAGS 		+= -I$(SIMDIR) -I/usr/include -I$(JSBSIM_INC) -I$(OCAMLLIBDIR) `pkg-config glib-2.0 --cflags`
-jsbsim.LDFLAGS		+= `pkg-config glib-2.0 --libs` -lm -lpcre -lglibivy -L/usr/lib -lJSBSim
+jsbsim.LDFLAGS		+= `pkg-config glib-2.0 --libs` -lglibivy -lm -L/usr/lib -lJSBSim
 
 jsbsim.CFLAGS 		+= -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport
 jsbsim.srcs 		+= downlink.c $(SRC_FIRMWARE)/datalink.c $(SRC_ARCH)/jsbsim_hw.c $(SRC_ARCH)/jsbsim_ir.c $(SRC_ARCH)/jsbsim_gps.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/jsbsim_transport.c