Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-01 04:46:51 +08:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

[nps] remove datalink_enabled hacks

Browse Source
This commit is contained in:
Felix Ruess
2015-11-04 22:24:31 +01:00
parent 00cdd548d3
commit aba6faefcd
4 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/settings/nps.xml
-2
View File
@@ -7,8 +7,6 @@
<dl_setting var="nps_bypass_ahrs" min="0" step="1" max="1" module="nps/nps_autopilot" shortname="bypass_ahrs" values="No|Yes"/> <dl_setting var="nps_bypass_ahrs" min="0" step="1" max="1" module="nps/nps_autopilot" shortname="bypass_ahrs" values="No|Yes"/>
<dl_setting var="nps_bypass_ins" min="0" step="1" max="1" module="nps/nps_autopilot" shortname="bypass_ins" values="No|Yes"/> <dl_setting var="nps_bypass_ins" min="0" step="1" max="1" module="nps/nps_autopilot" shortname="bypass_ins" values="No|Yes"/>
<dl_setting var="gps_has_fix" min="0" step="1" max="1" module="subsystems/gps/gps_sim_nps" shortname="gps_fix" values="No|Yes"/> <dl_setting var="gps_has_fix" min="0" step="1" max="1" module="subsystems/gps/gps_sim_nps" shortname="gps_fix" values="No|Yes"/>
<dl_setting var="autopilot.datalink_enabled" min="0" step="1" max="1" module="nps/nps_autopilot" shortname="datalink" values="OFF|ON"/>
<dl_setting var="ivy_tp.ivy_dl_enabled" min="0" step="1" max="1" module="subsystems/datalink/ivy_transport" shortname="downlink" values="OFF|ON"/>
<dl_setting var="nps_electrical.supply_voltage" min="0" step="0.1" max="24" module="nps/nps_electrical" shortname="bat_voltage" unit="V"/> <dl_setting var="nps_electrical.supply_voltage" min="0" step="0.1" max="24" module="nps/nps_electrical" shortname="bat_voltage" unit="V"/>
<dl_setting var="nps_atmosphere.wind_speed" min="0" step="0.1" max="25" module="nps/nps_atmosphere" shortname="wind_speed" unit="m/s" handler="set_wind_speed"/> <dl_setting var="nps_atmosphere.wind_speed" min="0" step="0.1" max="25" module="nps/nps_atmosphere" shortname="wind_speed" unit="m/s" handler="set_wind_speed"/>
<dl_setting var="nps_atmosphere.wind_dir" min="0" step="1" max="360" module="nps/nps_atmosphere" shortname="wind_dir" unit="rad" alt_unit="deg" handler="set_wind_dir"/> <dl_setting var="nps_atmosphere.wind_dir" min="0" step="1" max="360" module="nps/nps_atmosphere" shortname="wind_dir" unit="rad" alt_unit="deg" handler="set_wind_dir"/>
sw/simulator/nps/nps_autopilot.h
-1
View File
@@ -27,7 +27,6 @@
struct NpsAutopilot { struct NpsAutopilot {
double commands[NPS_COMMANDS_NB]; double commands[NPS_COMMANDS_NB];
bool_t launch; bool_t launch;
bool_t datalink_enabled;
}; };
extern struct NpsAutopilot autopilot; extern struct NpsAutopilot autopilot;
sw/simulator/nps/nps_autopilot_fixedwing.c
-6
View File
@@ -76,7 +76,6 @@ void nps_autopilot_init(enum NpsRadioControlType type_rc, int num_rc_script, cha
{ {
autopilot.launch = FALSE; autopilot.launch = FALSE;
autopilot.datalink_enabled = TRUE;
nps_radio_control_init(type_rc, num_rc_script, rc_dev); nps_radio_control_init(type_rc, num_rc_script, rc_dev);
nps_electrical_init(); nps_electrical_init();
@@ -179,11 +178,6 @@ void nps_autopilot_run_step(double time)
if (!launch) { if (!launch) {
autopilot.commands[COMMAND_THROTTLE] = 0; autopilot.commands[COMMAND_THROTTLE] = 0;
} }
// hack to reset datalink_time, since we don't use actual dl_parse_msg
if (autopilot.datalink_enabled) {
datalink_time = 0;
}
} }
void sim_overwrite_ahrs(void) void sim_overwrite_ahrs(void)
sw/simulator/nps/nps_autopilot_rotorcraft.c
-6
View File
@@ -64,7 +64,6 @@ bool_t nps_bypass_ins;
void nps_autopilot_init(enum NpsRadioControlType type_rc, int num_rc_script, char *rc_dev) void nps_autopilot_init(enum NpsRadioControlType type_rc, int num_rc_script, char *rc_dev)
{ {
autopilot.launch = TRUE; autopilot.launch = TRUE;
autopilot.datalink_enabled = TRUE;
nps_radio_control_init(type_rc, num_rc_script, rc_dev); nps_radio_control_init(type_rc, num_rc_script, rc_dev);
nps_electrical_init(); nps_electrical_init();
@@ -143,11 +142,6 @@ void nps_autopilot_run_step(double time)
for (uint8_t i = 0; i < NPS_COMMANDS_NB; i++) { for (uint8_t i = 0; i < NPS_COMMANDS_NB; i++) {
autopilot.commands[i] = (double)motor_mixing.commands[i] / MAX_PPRZ; autopilot.commands[i] = (double)motor_mixing.commands[i] / MAX_PPRZ;
} }
// hack to reset datalink_time, since we don't use actual dl_parse_msg
if (autopilot.datalink_enabled) {
datalink_time = 0;
}
} }