aboutsummaryrefslogtreecommitdiff
path: root/src/drivers/hott
diff options
context:
space:
mode:
authorSimon Wilks <sjwilks@gmail.com>2013-07-09 08:04:07 +0200
committerSimon Wilks <sjwilks@gmail.com>2013-07-09 08:04:07 +0200
commita18c6cea18aff92f226fdcd9da666ef1a9b6c99b (patch)
treeaa37dc3799a5a1bba8aae439da7f2fb661d5ca4f /src/drivers/hott
parent86adaeb3e8f28c92005a38b7c71e12111efe8694 (diff)
parentced2871263d5395da84ae6d034aa18015bf66d1c (diff)
downloadpx4-firmware-a18c6cea18aff92f226fdcd9da666ef1a9b6c99b.tar.gz
px4-firmware-a18c6cea18aff92f226fdcd9da666ef1a9b6c99b.tar.bz2
px4-firmware-a18c6cea18aff92f226fdcd9da666ef1a9b6c99b.zip
Merge remote-tracking branch 'upstream/master' into hott-esc
Diffstat (limited to 'src/drivers/hott')
-rw-r--r--src/drivers/hott/hott_telemetry/hott_telemetry.c2
-rw-r--r--src/drivers/hott/messages.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/hott/hott_telemetry/hott_telemetry.c b/src/drivers/hott/hott_telemetry/hott_telemetry.c
index c87810b42..a88f357f6 100644
--- a/src/drivers/hott/hott_telemetry/hott_telemetry.c
+++ b/src/drivers/hott/hott_telemetry/hott_telemetry.c
@@ -255,7 +255,7 @@ hott_telemetry_main(int argc, char *argv[])
}
thread_should_exit = false;
- deamon_task = task_spawn(daemon_name,
+ deamon_task = task_spawn_cmd(daemon_name,
SCHED_DEFAULT,
SCHED_PRIORITY_MAX - 40,
2048,
diff --git a/src/drivers/hott/messages.c b/src/drivers/hott/messages.c
index ba2f6212d..36d5fe942 100644
--- a/src/drivers/hott/messages.c
+++ b/src/drivers/hott/messages.c
@@ -159,7 +159,7 @@ build_eam_response(uint8_t *buffer, size_t *size)
memset(&airspeed, 0, sizeof(airspeed));
orb_copy(ORB_ID(airspeed), airspeed_sub, &airspeed);
- uint16_t speed = (uint16_t)(airspeed.indicated_airspeed_m_s);
+ uint16_t speed = (uint16_t)(airspeed.indicated_airspeed_m_s * 3.6f);
msg.speed_L = (uint8_t)speed & 0xff;
msg.speed_H = (uint8_t)(speed >> 8) & 0xff;