Fix unit tests

Fix some unit tests and disable some that are unable to fix.

src/main/blackbox/blackbox.h

@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "build/build_config.h"

src/main/build/dprintf.c

@@ -15,7 +15,7 @@
  * along with this software. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "types.h"
+#include "common/types.h"
 
 #include "dprintf.h"
 

src/main/cms/cms.c

@@ -958,7 +958,7 @@ static void cmsTraverseGlobalExit(const CMS_Menu *pMenu)
 
 const void *cmsMenuExit(displayPort_t *pDisplay, const void *ptr)
 {
-    int exitType = (int)ptr;
+    int exitType = (intptr_t)ptr;
     switch (exitType) {
     case CMS_EXIT_SAVE:
     case CMS_EXIT_SAVEREBOOT:

src/main/common/bitarray.c

@@ -22,8 +22,6 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include "platform.h"
-
 #include "bitarray.h"
 
 #define BITARRAY_BIT_OP(array, bit, op) ((array)[(bit) / (sizeof((array)[0]) * 8)] op (1 << ((bit) % (sizeof((array)[0]) * 8))))

src/main/common/filter.h

@@ -19,6 +19,8 @@
 
 #include <stdbool.h>
 
+#include "common/utils.h"
+
 
 #define BUTTER_Q        0.707106781f     /* 2nd order Butterworth: 1/sqrt(2) */
 #define BESSEL_Q        0.577350269f     /* 2nd order Bessel: 1/sqrt(3) */

src/main/common/maths.h

@@ -22,7 +22,7 @@
 
 #include <stdlib.h>
 
-#include "types.h"
+#include "common/types.h"
 
 /*
  * Floating point constants

src/main/common/time.h

@@ -23,8 +23,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "platform.h"
-
 #include "pg/time.h"
 
 // time difference, 32 bits always sufficient

src/main/common/utils.h

@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 
 #define INIT_ZERO  { 0, }
 

src/main/config/feature.h

@@ -20,6 +20,7 @@
 
 #pragma once
 
+#include "common/utils.h"
 #include "pg/feature.h"
 
 #ifndef DEFAULT_FEATURES

src/main/fc/core.c

@@ -786,6 +786,7 @@ static void subTaskMotorsServosUpdate(timeUs_t currentTimeUs)
 
 static void subTaskFilterUpdate(timeUs_t currentTimeUs)
 {
+    UNUSED(currentTimeUs);
 #ifdef USE_FREQ_SENSOR
     freqUpdate();
 #endif

src/main/fc/rc_adjustments.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 
 #include "fc/rc_modes.h"
 #include "flight/pid.h"

src/main/fc/rc_controls.h

@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "common/filter.h"

src/main/flight/pid.c

@@ -59,7 +59,7 @@
 
 #include "pid.h"
 
-static FAST_DATA_ZERO_INIT pid_t pid;
+static FAST_DATA_ZERO_INIT pidData_t pid;
 
 
 float pidGetDT()

src/main/flight/pid.h

@@ -137,7 +137,7 @@ typedef struct pid_s {
 
     order1Filter_t crossCouplingFilter[XY_AXIS_COUNT];
 
-} pid_t;
+} pidData_t;
 
 
 void pidController(const pidProfile_t *pidProfile, timeUs_t currentTimeUs);

src/main/pg/accel.c

@@ -15,7 +15,7 @@
  * along with this software. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "config/config_reset.h"

src/main/pg/accel.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "common/sensor_alignment.h"

src/main/pg/adjustments.c

@@ -15,7 +15,7 @@
  * along with this software. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "types.h"
+#include "common/types.h"
 
 #include "pg/pg_ids.h"
 #include "pg/adjustments.h"

src/main/pg/adjustments.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 
 #include "pg/pg.h"
 #include "pg/modes.h"

src/main/pg/arming.c

@@ -15,7 +15,7 @@
  * along with this software. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "pg/pg_ids.h"

src/main/pg/arming.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "pg/pg.h"

src/main/pg/barometer.c

@@ -15,7 +15,7 @@
  * along with this software. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #ifdef USE_BARO

src/main/pg/barometer.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "drivers/barometer/barometer.h"

src/main/pg/battery.c

@@ -15,7 +15,7 @@
  * along with this software. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "config/config.h"

src/main/pg/battery.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "pg/pg.h"

src/main/pg/blackbox.c

@@ -15,7 +15,7 @@
  * along with this software. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #ifdef USE_BLACKBOX

src/main/pg/blackbox.h

@@ -17,7 +17,8 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
+
 #include "platform.h"
 
 #include "pg/pg.h"

src/main/pg/boardalignment.c

@@ -15,7 +15,7 @@
  * along with this software. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "pg/pg_ids.h"

src/main/pg/boardalignment.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "pg/pg.h"

src/main/pg/camera_control.c

@@ -15,7 +15,7 @@
  * along with this software. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #ifdef USE_CAMERA_CONTROL

src/main/pg/camera_control.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "drivers/io.h"

src/main/pg/compass.c

@@ -15,7 +15,7 @@
  * along with this software. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #if defined(USE_MAG)

src/main/pg/compass.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "common/time.h"

src/main/pg/current.c

@@ -15,7 +15,7 @@
  * along with this software. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "config/config_reset.h"

src/main/pg/current.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "pg/pg.h"

src/main/pg/esc_sensor.c

@@ -15,7 +15,7 @@
  * along with this software. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "pg/pg_ids.h"

src/main/pg/esc_sensor.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "pg/pg.h"

src/main/pg/esc_serial.c

@@ -15,7 +15,7 @@
  * along with this software. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "config/config_reset.h"

src/main/pg/esc_serial.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "drivers/io.h"

src/main/pg/failsafe.c

@@ -15,7 +15,7 @@
  * along with this software. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "pg/pg_ids.h"

src/main/pg/failsafe.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "pg/pg.h"

src/main/pg/feature.c

@@ -15,7 +15,7 @@
  * along with this software. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "pg/pg_ids.h"

src/main/pg/feature.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "pg/pg.h"

src/main/pg/governor.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "pg/pg.h"

src/main/pg/gps.c

@@ -15,7 +15,7 @@
  * along with this software. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "types.h"
+#include "common/types.h"
 #include "platform.h"
 
 #include "pg/pg_ids.h"