Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 02:55:07 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Syslink properly working address params

Browse Source
This commit is contained in:
Dennis Shtatnov
2016-09-21 21:48:30 -04:00
committed by Lorenz Meier
parent f750140b6f
commit e27f396f55
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/syslink/syslink_main.cpp
+6 -6
View File
@@ -254,13 +254,15 @@ Syslink::task_main()
param_t _param_radio_addr1 = param_find("SLNK_RADIO_ADDR1"); param_t _param_radio_addr1 = param_find("SLNK_RADIO_ADDR1");
param_t _param_radio_addr2 = param_find("SLNK_RADIO_ADDR2"); param_t _param_radio_addr2 = param_find("SLNK_RADIO_ADDR2");
uint32_t channel, rate; uint32_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);
param_get(_param_radio_rate, &rate); param_get(_param_radio_rate, &rate);
param_get(_param_radio_addr1, &addr + 4); param_get(_param_radio_addr1, &addr1);
param_get(_param_radio_addr2, &addr); param_get(_param_radio_addr2, &addr2);
memcpy(&addr, &addr2, 4); memcpy(((char *)&addr) + 4, &addr1, 4);
_bridge = new SyslinkBridge(this); _bridge = new SyslinkBridge(this);
_bridge->init(); _bridge->init();
@@ -291,10 +293,8 @@ Syslink::task_main()
px4_arch_configgpio(GPIO_NRF_TXEN); px4_arch_configgpio(GPIO_NRF_TXEN);
set_datarate(rate);
usleep(1000);
set_channel(channel); set_channel(channel);
usleep(1000); set_datarate(rate);
set_address(addr); set_address(addr);
src/modules/syslink/syslink_params.c
+2 -2
View File
@@ -66,11 +66,11 @@ PARAM_DEFINE_INT32(SLNK_RADIO_RATE, 2);
* *
* @group Syslink * @group Syslink
*/ */
PARAM_DEFINE_INT32(SLNK_RADIO_ADDR1, (uint32_t) 0xE7); PARAM_DEFINE_INT32(SLNK_RADIO_ADDR1, 231); // 0xE7
/** /**
* Operating address of the NRF51 (least significant 4 bytes) * Operating address of the NRF51 (least significant 4 bytes)
* *
* @group Syslink * @group Syslink
*/ */
PARAM_DEFINE_INT32(SLNK_RADIO_ADDR2, (uint32_t) 0xE7E7E7E7); PARAM_DEFINE_INT32(SLNK_RADIO_ADDR2, 3890735079); // 0xE7E7E7E7