Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-07 17:49:49 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

fix sim to match cleaned actuators

Browse Source
This commit is contained in:
Felix Ruess
2009-08-04 09:14:46 +00:00
parent 2f51f1d820
commit 9b5420dace
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/autopilot/booz2_simulator.makefile
+1 -1
View File
@@ -45,7 +45,7 @@ sim.srcs = $(SIMDIR)/booz2_sim_main.c \
$(SIMDIR)/booz_sensors_model_gps.c \
$(SIMDIR)/booz_wind_model.c \
sim.CFLAGS += -DBOARD_CONFIG=\"booz2_board_v1_0.h\"
sim.CFLAGS += -DBOARD_CONFIG=\"boards/booz2_v1_0.h\"
sim.srcs += $(SRC_BOOZ_SIM)/booz2_unsimulated_peripherals.c
sim.srcs += $(SRC_BOOZ)/booz2_main.c
conf/autopilot/booz2_simulator_nps.makefile
+1 -1
View File
@@ -48,7 +48,7 @@ sim.srcs += math/pprz_trig_int.c \
sim.CFLAGS += -DBOARD_CONFIG=\"booz2_board_v1_0.h\"
sim.CFLAGS += -DBOARD_CONFIG=\"boards/booz2_v1_0.h\"
sim.srcs += $(SRC_BOOZ_SIM)/booz2_unsimulated_peripherals.c
sim.srcs += $(SRC_BOOZ)/booz2_main.c
sw/airborne/booz/arch/sim/actuators_buss_twi_blmc_hw.h
+3 -3
View File
@@ -1,6 +1,6 @@
/*
* $Id$
*
*
* Copyright (C) 2008-2009 Antoine Drouin <poinix@gmail.com>
*
* This file is part of paparazzi.
@@ -18,14 +18,14 @@
* 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.
*/
#ifndef ACTUATORS_BUSS_TWI_BLMC_HW_H
#define ACTUATORS_BUSS_TWI_BLMC_HW_H
#include "airframe.h"
#include "booz2_supervision.h"
#include "actuators/booz_supervision.h"
#define BUSS_TWI_BLMC_NB 4
extern uint8_t buss_twi_blmc_motor_power[BUSS_TWI_BLMC_NB];
sw/simulator/nps/nps_main.c
+1 -1
View File
@@ -131,7 +131,7 @@ static gboolean nps_main_periodic(gpointer data __attribute__ ((unused))) {
/* unscale to initial real time*/
irt = t1 - (t1 - nps_main.scaled_initial_time)*nps_main.host_time_factor;
printf("Press <enter> to continue (or CTRL-Z to suspend). Enter a new time factor if needed: ");
printf("Press <enter> to continue (or CTRL-Z to suspend).\nEnter a new time factor if needed (current: %f): ", nps_main.host_time_factor);
fflush(stdout);
fgets(line,127,stdin);
if ((sscanf(line," %le ", &tf) == 1)) {