1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-27 15:22:04 +01:00

Merged in filnet/librepilot/msys2 (pull request )

Msys2 updates & uncrustiy
This commit is contained in:
Lalanne Laurent 2016-12-28 13:27:27 +01:00
commit 291ce6eb0c
3 changed files with 3 additions and 4 deletions
flight/modules
CameraControl/inc
Receiver
ground/gcs/src/libs/osgearth

@ -32,5 +32,4 @@
#define FLIGHT_MODULES_CAMERACONTROL_INC_CAMERACONTROL_H
#endif /* FLIGHT_MODULES_CAMERACONTROL_INC_CAMERACONTROL_H */

@ -680,7 +680,7 @@ static bool updateRcvrActivityCompare(uint32_t rcvr_id, struct rcvr_activity_fsm
// Ignore activity from this Group/Channel because already used/set for Rssi input
// Without that, the ReceiverActivity will be saturated just with Rssi value activity.
if(channelGroups.Rssi == fsm->group && channelNumber.Rssi == channel) {
if (channelGroups.Rssi == fsm->group && channelNumber.Rssi == channel) {
delta = 0;
}

@ -56,8 +56,8 @@ osg:win32 {
libp11-kit-0.dll \
libffi-6.dll \
libtasn1-6.dll \
libhogweed-4-2.dll \
libnettle-6-2.dll \
libhogweed-4.dll \
libnettle-6.dll \
libssh2-1.dll \
libnghttp2-14.dll