Browse Source

Fix format and remove ets driver from fmu-v2 build

sbg
acfloria 7 years ago committed by Beat Küng
parent
commit
78950f2b39
  1. 6
      cmake/configs/nuttx_px4fmu-v2_default.cmake
  2. 2
      msg/vehicle_status.msg
  3. 2
      src/drivers/telemetry/iridiumsbd/IridiumSBD.h
  4. 2
      src/drivers/telemetry/iridiumsbd/iridiumsbd_params.c
  5. 2
      src/modules/mavlink/mavlink_main.h
  6. 2
      src/modules/mavlink/mavlink_messages.cpp

6
cmake/configs/nuttx_px4fmu-v2_default.cmake

@ -7,7 +7,8 @@ set(config_module_list @@ -7,7 +7,8 @@ set(config_module_list
# Board support modules
#
#drivers/barometer
drivers/differential_pressure
#drivers/differential_pressure
#drivers/distance_sensor
#drivers/magnetometer
#drivers/telemetry
@ -21,6 +22,9 @@ set(config_module_list @@ -21,6 +22,9 @@ set(config_module_list
#drivers/bst
drivers/camera_trigger
drivers/device
drivers/differential_pressure/ms4525
drivers/differential_pressure/ms5525
drivers/differential_pressure/sdp3x
#drivers/frsky_telemetry
drivers/gps
#drivers/hott

2
msg/vehicle_status.msg

@ -61,7 +61,7 @@ bool rc_signal_lost # true if RC reception lost @@ -61,7 +61,7 @@ bool rc_signal_lost # true if RC reception lost
uint8 rc_input_mode # set to 1 to disable the RC input, 2 to enable manual control to RC in mapping.
bool data_link_lost # datalink to GCS lost
bool high_latency_data_link_active # all low latency datalinks to GCS lost
bool high_latency_data_link_active # all low latency datalinks to GCS lost
uint8 data_link_lost_counter # counts unique data link lost events
bool engine_failure # Set to true if an engine failure is detected
bool mission_failure # Set to true if mission could not continue/finish

2
src/drivers/telemetry/iridiumsbd/IridiumSBD.h

@ -83,7 +83,7 @@ typedef enum { @@ -83,7 +83,7 @@ typedef enum {
extern "C" __EXPORT int iridiumsbd_main(int argc, char *argv[]);
#define SATCOM_TX_BUF_LEN 340 // TX buffer size - maximum for a SBD MO message is 340, but billed per 50
#define SATCOM_TX_BUF_LEN 340 // TX buffer size - maximum for a SBD MO message is 340, but billed per 50
#define SATCOM_RX_MSG_BUF_LEN 270 // RX buffer size for MT messages
#define SATCOM_RX_COMMAND_BUF_LEN 50 // RX buffer size for other commands
#define SATCOM_SIGNAL_REFRESH_DELAY 20000000 // update signal quality every 20s

2
src/drivers/telemetry/iridiumsbd/iridiumsbd_params.c

@ -21,7 +21,7 @@ PARAM_DEFINE_INT32(ISBD_READ_INT, 60); @@ -21,7 +21,7 @@ PARAM_DEFINE_INT32(ISBD_READ_INT, 60);
PARAM_DEFINE_INT32(ISBD_SBD_TIMEOUT, 60);
/**
* Time [ms] the Iridum driver will wait for additional mavlink messages to combine them into one SBD message
* Time [ms] the Iridium driver will wait for additional mavlink messages to combine them into one SBD message
* Value 0 turns the functionality off
*
* @unit ms

2
src/modules/mavlink/mavlink_main.h

@ -485,7 +485,7 @@ protected: @@ -485,7 +485,7 @@ protected:
private:
int _instance_id;
bool _transmitting_enabled;
bool _transmitting_enabled;
orb_advert_t _mavlink_log_pub;
bool _task_running;

2
src/modules/mavlink/mavlink_messages.cpp

@ -4404,7 +4404,7 @@ protected: @@ -4404,7 +4404,7 @@ protected:
struct vehicle_global_position_s global_pos = {};
if (_global_pos_sub->update(&global_pos)) {
_climb_rate.add_value(fabs(global_pos.vel_d), update_rate);
_climb_rate.add_value(fabsf(global_pos.vel_d), update_rate);
_groundspeed.add_value(sqrtf(global_pos.vel_n * global_pos.vel_n + global_pos.vel_e * global_pos.vel_e), update_rate);
}

Loading…
Cancel
Save