diff --git a/conf/airframes/examples/MentorEnergy.xml b/conf/airframes/examples/MentorEnergy.xml index c4076d1c7e..7b3526a6a5 100644 --- a/conf/airframes/examples/MentorEnergy.xml +++ b/conf/airframes/examples/MentorEnergy.xml @@ -268,10 +268,13 @@
- + + + +
diff --git a/conf/airframes/examples/microjet_lisa_m.xml b/conf/airframes/examples/microjet_lisa_m.xml index 8263373a4e..475f90d831 100644 --- a/conf/airframes/examples/microjet_lisa_m.xml +++ b/conf/airframes/examples/microjet_lisa_m.xml @@ -10,6 +10,10 @@ + + + + @@ -195,4 +199,19 @@ +
+ + +
+ +
+ + + + + + + +
+ diff --git a/conf/simulator/jsbsim/aircraft/LisaAspirin2.xml b/conf/simulator/jsbsim/aircraft/Malolo1.xml similarity index 100% rename from conf/simulator/jsbsim/aircraft/LisaAspirin2.xml rename to conf/simulator/jsbsim/aircraft/Malolo1.xml diff --git a/sw/simulator/nps/nps_autopilot_fixedwing.c b/sw/simulator/nps/nps_autopilot_fixedwing.c index 8f1952e0fd..41f492277f 100644 --- a/sw/simulator/nps/nps_autopilot_fixedwing.c +++ b/sw/simulator/nps/nps_autopilot_fixedwing.c @@ -136,6 +136,8 @@ void nps_autopilot_run_step(double time) { /* scale final motor commands to 0-1 for feeding the fdm */ for (uint8_t i=0; i < NPS_COMMANDS_NB; i++) autopilot.commands[i] = (double)commands[i]/MAX_PPRZ; + // hack: invert pitch to fit most JSBSim models + autopilot.commands[COMMAND_PITCH] = -(double)commands[COMMAND_PITCH]/MAX_PPRZ; }