fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-07 03:21:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #68 from paulpatience/master

Browse Source 
Fix -Wundef warning and use constructor to compile in C++03
This commit is contained in:
Pavel Kirienko
2015-10-09 02:23:05 +03:00
parent d773db4ffc 45eb37d905
commit 69dc2114c9
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/stm32/driver/include/uavcan_stm32/build_config.hpp
+4
View File
@@ -15,6 +15,10 @@
# define UAVCAN_STM32_NUTTX 0 # define UAVCAN_STM32_NUTTX 0
#endif #endif
#ifndef UAVCAN_STM32_BAREMETAL
# define UAVCAN_STM32_BAREMETAL 0
#endif
/** /**
* Number of interfaces must be enabled explicitly * Number of interfaces must be enabled explicitly
*/ */
libuavcan_drivers/stm32/driver/include/uavcan_stm32/clock.hpp
+17 -7
View File
@@ -50,13 +50,23 @@ void adjustUtc(uavcan::UtcDuration adjustment);
*/ */
struct UtcSyncParams struct UtcSyncParams
{ {
float offset_p = 0.01F; ///< PPM per one usec error float offset_p; ///< PPM per one usec error
float rate_i = 0.02F; ///< PPM per one PPM error for second float rate_i; ///< PPM per one PPM error for second
float rate_error_corner_freq = 0.01F; float rate_error_corner_freq;
float max_rate_correction_ppm = 300.0F; float max_rate_correction_ppm;
float lock_thres_rate_ppm = 2.0F; float lock_thres_rate_ppm;
uavcan::UtcDuration lock_thres_offset = uavcan::UtcDuration::fromMSec(4); uavcan::UtcDuration lock_thres_offset;
uavcan::UtcDuration min_jump = uavcan::UtcDuration::fromMSec(10); ///< Min error to jump rather than change rate uavcan::UtcDuration min_jump; ///< Min error to jump rather than change rate
UtcSyncParams()
: offset_p(0.01F)
, rate_i(0.02F)
, rate_error_corner_freq(0.01F)
, max_rate_correction_ppm(300.0F)
, lock_thres_rate_ppm(2.0F)
, lock_thres_offset(uavcan::UtcDuration::fromMSec(4))
, min_jump(uavcan::UtcDuration::fromMSec(10))
{ }
}; };
/** /**