fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-03 15:28:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

syslink_main: fix int type passed to param_get()

Browse Source
This commit is contained in:
Beat Küng
2017-10-27 10:43:15 +02:00
committed by Lorenz Meier
parent a2fd9ef2d0
commit 9b85b39c07
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/syslink/syslink_main.cpp
+3 -2
View File
@@ -190,7 +190,7 @@ Syslink::update_params(bool force_set)
// reading parameter values into temp variables // reading parameter values into temp variables
uint32_t channel, rate, addr1, addr2; int32_t channel, rate, addr1, addr2;
uint64_t addr = 0; uint64_t addr = 0;
param_get(_param_radio_channel, &channel); param_get(_param_radio_channel, &channel);
@@ -198,7 +198,8 @@ Syslink::update_params(bool force_set)
param_get(_param_radio_addr1, &addr1); param_get(_param_radio_addr1, &addr1);
param_get(_param_radio_addr2, &addr2); param_get(_param_radio_addr2, &addr2);
memcpy(&addr, &addr2, 4); memcpy(((char *)&addr) + 4, &addr1, 4); memcpy(&addr, &addr2, 4);
memcpy(((char *)&addr) + 4, &addr1, 4);
hrt_abstime t = hrt_absolute_time(); hrt_abstime t = hrt_absolute_time();
src/modules/syslink/syslink_main.h
+1 -1
View File
@@ -127,7 +127,7 @@ private:
int _params_sub; int _params_sub;
// Current parameter values // Current parameter values
uint32_t _channel, _rate; int32_t _channel, _rate;
uint64_t _addr; uint64_t _addr;
hrt_abstime _params_update[3]; // Time at which the parameters were updated hrt_abstime _params_update[3]; // Time at which the parameters were updated
hrt_abstime _params_ack[3]; // Time at which the parameters were acknowledged by the nrf module hrt_abstime _params_ack[3]; // Time at which the parameters were acknowledged by the nrf module