diff --git a/conf/simulator/aircraft/BOOZ2_A1.xml b/conf/simulator/aircraft/BOOZ2_A1.xml new file mode 100644 index 0000000000..19d13b890f --- /dev/null +++ b/conf/simulator/aircraft/BOOZ2_A1.xml @@ -0,0 +1,353 @@ + + + + + + Gustavo Violato + 24-02-2009 + Version 1.0 + Test file + + + + 78.53 + 10 + 6.89 + 0 + 0 + 0 + 0 + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + + + 0.005 + 0.005 + 0.010 + 0. + 0. + 0. + 0.84 + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + 0 + 0 + 0 + 10000 + 200000 + 0.0 + NONE + 0 + + + + + + + fcs/front_motor + fcs/back_motor + fcs/right_motor + fcs/left_motor + + + + + + + fcs/front_motor + 0.84 + + + + -6.89 + 0 + 0 + + + 0 + 0 + -1 + + + + + + + fcs/back_motor + 0.84 + + + + 6.89 + 0 + 0 + + + 0 + 0 + -1 + + + + + + + fcs/right_motor + 0.84 + + + + 0 + 6.89 + 0 + + + 0 + 0 + -1 + + + + + + + fcs/left_motor + 0.84 + + + + 0 + -6.89 + 0 + + + 0 + 0 + -1 + + + + + + + + + + + fcs/front_motor + 0.84 + + + + -6.89 + + 1.9685 + 0 + + + -1 + 0 + 0 + + + + + + + fcs/front_motor + 0.84 + + + + -6.89 + -1.9685 + 0 + + + 1 + 0 + 0 + + + + + + + + + fcs/back_motor + 0.84 + + + + 6.89 + 1.9685 + 0 + + + -1 + 0 + 0 + + + + + + + fcs/back_motor + 0.84 + + + + 6.89 + -1.9685 + 0 + + + 1 + 0 + 0 + + + + + + + + + fcs/right_motor + 0.84 + + + + -1.9685 + 6.89 + 0 + + + 0 + -1 + 0 + + + + + + + fcs/right_motor + 0.84 + + + + 1.9685 + 6.89 + 0 + + + 0 + 1 + 0 + + + + + + + + + fcs/left_motor + 0.84 + + + + -1.9685 + -6.89 + 0 + + + 0 + -1 + 0 + + + + + + + fcs/left_motor + 0.84 + + + + 1.9685 + -6.89 + 0 + + + 0 + 1 + 0 + + + + + + + + + + + + + Drag + + aero/qbar-psf + 47.9 + 0.0151 + 0.224808943 + + + + + + + fcs/front_motor + fcs/back_motor + fcs/right_motor + fcs/left_motor + ON + ON + ON + ON + ON + + \ No newline at end of file diff --git a/conf/simulator/aircraft/reset00.xml b/conf/simulator/aircraft/reset00.xml new file mode 100644 index 0000000000..cd1b9da55a --- /dev/null +++ b/conf/simulator/aircraft/reset00.xml @@ -0,0 +1,16 @@ + + + + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 20.0 + 0.0 + 0.0 + + diff --git a/sw/simulator/tests/Makefile b/sw/simulator/tests/Makefile index 0009a7b03d..626e8076d2 100644 --- a/sw/simulator/tests/Makefile +++ b/sw/simulator/tests/Makefile @@ -21,22 +21,22 @@ # $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) - - - +JSBSIM = /home/violato/enac/programs/install_jsbsim CFLAGS = -Wall \ -I .. \ - -I ../../../var/BOOZ \ + -I ../../../var/BOOZ2_A1 \ -I ../../airborne \ -I ../../include \ -I /usr/include/meschach \ + -I $(JSBSIM)/include/JSBSim \ `pkg-config glib-2.0 --cflags` \ LDFLAGS = -lm \ -lmeschach \ -lpcre \ -lglibivy \ + -L $(JSBSIM)/lib -lJSBSim \ `pkg-config glib-2.0 --libs` \ SIMDIR = .. @@ -45,12 +45,12 @@ SIMDIR = .. # # -TEST_FDM_SRCS = test_fdm.c \ - $(SIMDIR)/booz_flight_model.c \ - $(SIMDIR)/booz_flight_model_utils.c +TEST_FDM_SRCS = nps_test_fdm.c \ + $(SIMDIR)/nps_fdm_jsbsim.c \ -test_fdm : $(TEST_FDM_SRCS) - gcc $(CFLAGS) -o $@ $^ $(LDFLAGS) + +nps_test_fdm : $(TEST_FDM_SRCS) + g++ $(CFLAGS) -o $@ $^ $(LDFLAGS) #