diff --git a/flight/modules/CameraControl/inc/cameracontrol.h b/flight/modules/CameraControl/inc/cameracontrol.h index c3d61f0cc..50fe3e9e2 100644 --- a/flight/modules/CameraControl/inc/cameracontrol.h +++ b/flight/modules/CameraControl/inc/cameracontrol.h @@ -32,5 +32,4 @@ #define FLIGHT_MODULES_CAMERACONTROL_INC_CAMERACONTROL_H - #endif /* FLIGHT_MODULES_CAMERACONTROL_INC_CAMERACONTROL_H */ diff --git a/flight/modules/Receiver/receiver.c b/flight/modules/Receiver/receiver.c index 7c30dd7b1..6bfc46d36 100644 --- a/flight/modules/Receiver/receiver.c +++ b/flight/modules/Receiver/receiver.c @@ -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; } diff --git a/ground/gcs/src/libs/osgearth/copydata.pro b/ground/gcs/src/libs/osgearth/copydata.pro index 2c7b10c8b..c263520f5 100644 --- a/ground/gcs/src/libs/osgearth/copydata.pro +++ b/ground/gcs/src/libs/osgearth/copydata.pro @@ -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