diff --git a/src/modules/fw_dyn_soar_control/FixedwingPositionINDIControl.cpp b/src/modules/fw_dyn_soar_control/FixedwingPositionINDIControl.cpp index d22d9a1ece..b1977521d0 100644 --- a/src/modules/fw_dyn_soar_control/FixedwingPositionINDIControl.cpp +++ b/src/modules/fw_dyn_soar_control/FixedwingPositionINDIControl.cpp @@ -440,13 +440,13 @@ FixedwingPositionINDIControl::soaring_estimator_shear_poll() // the initial speed of the target trajectory can safely be updated during soaring :) _shear_aspd = _soaring_estimator_shear.aspd; _param_shear_estimated_v_max.set(_shear_v_max); - _param_shear_estimated_v_max.commit() + _param_shear_estimated_v_max.commit(); _param_shear_estimated_alpha.set(_shear_alpha); - _param_shear_estimated_alpha.commit() + _param_shear_estimated_alpha.commit(); _param_shear_estimated_h_ref.set(_shear_h_ref); - _param_shear_estimated_h_ref.commit() + _param_shear_estimated_h_ref.commit(); _param_shear_estimated_heading.set(_shear_heading); - _param_shear_estimated_heading.commit() + _param_shear_estimated_heading.commit(); } } @@ -697,8 +697,8 @@ FixedwingPositionINDIControl::_read_trajectory_coeffs_csv(char *filename) // ======================================================================= bool error = false; - //char home_dir[200] = "/home/marvin/Documents/master_thesis_ADS/PX4/Git/ethzasl_fw_px4/src/modules/fw_dyn_soar_control/trajectories/"; - char home_dir[200] = PX4_ROOTFSDIR"/fs/microsd/trajectories/"; + char home_dir[200] = "/home/jaeyoung/src/PX4-Autopilot/src/modules/fw_dyn_soar_control/trajectories/"; + // char home_dir[200] = PX4_ROOTFSDIR"/fs/microsd/trajectories/"; //PX4_ERR(home_dir); strcat(home_dir, filename); FILE *fp = fopen(home_dir, "r"); diff --git a/src/modules/fw_dyn_soar_control/fw_dyn_soar_control_params.c b/src/modules/fw_dyn_soar_control/fw_dyn_soar_control_params.c index 21eec6fcb8..897e61c615 100644 --- a/src/modules/fw_dyn_soar_control/fw_dyn_soar_control_params.c +++ b/src/modules/fw_dyn_soar_control/fw_dyn_soar_control_params.c @@ -475,7 +475,7 @@ PARAM_DEFINE_FLOAT(DS_K_DAMP_PITCH, 0.02f); * @increment 0.0000001 * @group FW DYN SOAR Control */ -PARAM_DEFINE_FLOAT(DS_ORIGIN_LAT, 47.3130000f); +PARAM_DEFINE_FLOAT(DS_ORIGIN_LAT, 47.397754f); /** * longitude of trajectory start point (WGS84) @@ -487,7 +487,7 @@ PARAM_DEFINE_FLOAT(DS_ORIGIN_LAT, 47.3130000f); * @increment 0.0000001 * @group FW DYN SOAR Control */ -PARAM_DEFINE_FLOAT(DS_ORIGIN_LON, 8.8100000f); +PARAM_DEFINE_FLOAT(DS_ORIGIN_LON, 8.546372f); /** * altitude of trajectory start point (WGS84)