Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-20 03:13:44 +08:00
Code Issues Actions 21 Packages Projects Releases Wiki Activity

hotfix for frsky dport telemetry (#4409)

Browse Source
This commit is contained in:
thedevleon
2016-05-01 00:41:17 +02:00
committed by Lorenz Meier
parent 05885e4e5f
commit 9ff6751eb5
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+5
View File
@@ -64,6 +64,11 @@ CMakeLists.txt.user
GPATH
GRTAGS
GTAGS
*.config
*.creator
*.creator.user
*.files
*.includes
# uavcan firmware
ROMFS/px4fmu_common/uavcan/
src/drivers/frsky_telemetry/frsky_data.c
+1 -14
View File
@@ -53,7 +53,6 @@
#include <uORB/topics/battery_status.h>
#include <uORB/topics/sensor_combined.h>
#include <uORB/topics/vehicle_global_position.h>
#include <uORB/topics/vehicle_status.h>
#include <drivers/drv_hrt.h>
@@ -94,12 +93,10 @@
static struct battery_status_s *battery_status;
static struct vehicle_global_position_s *global_pos;
static struct vehicle_status_s *vehicle_status;
static struct sensor_combined_s *sensor_combined;
static int battery_status_sub = -1;
static int vehicle_global_position_sub = -1;
static int vehicle_status_sub = -1;
static int sensor_sub = -1;
/**
@@ -110,15 +107,13 @@ bool frsky_init()
battery_status = malloc(sizeof(struct battery_status_s));
global_pos = malloc(sizeof(struct vehicle_global_position_s));
sensor_combined = malloc(sizeof(struct sensor_combined_s));
vehicle_status = malloc(sizeof(struct vehicle_status_s));
if (battery_status == NULL || global_pos == NULL || sensor_combined == NULL || vehicle_status) {
if (battery_status == NULL || global_pos == NULL || sensor_combined == NULL) {
return false;
}
battery_status_sub = orb_subscribe(ORB_ID(battery_status));
vehicle_global_position_sub = orb_subscribe(ORB_ID(vehicle_global_position));
vehicle_status_sub = orb_subscribe(ORB_ID(vehicle_status));
sensor_sub = orb_subscribe(ORB_ID(sensor_combined));
return true;
}
@@ -128,7 +123,6 @@ void frsky_deinit()
free(battery_status);
free(global_pos);
free(sensor_combined);
free(vehicle_status);
}
/**
@@ -201,13 +195,6 @@ void frsky_update_topics()
if (updated) {
orb_copy(ORB_ID(vehicle_global_position), vehicle_global_position_sub, global_pos);
}
/* get a local copy of the vehicle status data */
orb_check(vehicle_status_sub, &updated);
if (updated) {
orb_copy(ORB_ID(vehicle_status), vehicle_status_sub, vehicle_status);
}
}
/**