fix top board build; circular include issues before?

RoboTeamTwente · Jul 14, 2024 · 755029f · 755029f
1 parent dfa89d8
commit 755029f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/Core/Inc/top_board/Wireless/Wireless.h b/Core/Inc/top_board/Wireless/Wireless.h
@@ -14,7 +14,6 @@
 #include <stdint.h>
 #include "SX1280_Constants.h"
 #include "SX1280.h"
-#include "main.h"
 
 #define WIRELESS_YELLOW_CHANNELS 0
 #define WIRELESS_BLUE_CHANNELS 1

diff --git a/Core/Inc/top_board/robot.h b/Core/Inc/top_board/robot.h
@@ -4,28 +4,8 @@
 #include <unistd.h>
 #include "main.h"
 
-#include "control_util.h"
-#include "gpio_util.h"
-#include "tim_util.h"
-#include "peripheral_util.h"
-#include "wheels.h"
-#include "stateControl.h"
-#include "stateEstimation.h"
-#include "sdcard.h"
-#include "Wireless.h"
-#include "buzzer.h"
-#include "speaker.h"
-#include "MTi.h"
-#include "yawCalibration.h"
-#include "iwdg.h"
-#include "logging.h"
-#include "SX1280_Constants.h"
-#include "AssuredPacketManager.h"
 #include "drivers.h"
 #include "pages.h"
-#include "system_test.h"
-#include "drain_battery.h"
-#include "mcp_page.h"
 
 #include "rem.h"
 

diff --git a/Core/Src/top_board/robot.c b/Core/Src/top_board/robot.c
@@ -1,5 +1,27 @@
 #include "robot.h"
 
+#include "control_util.h"
+#include "gpio_util.h"
+#include "tim_util.h"
+#include "peripheral_util.h"
+#include "wheels.h"
+#include "stateControl.h"
+#include "stateEstimation.h"
+#include "sdcard.h"
+#include "Wireless.h"
+#include "buzzer.h"
+#include "speaker.h"
+#include "MTi.h"
+#include "yawCalibration.h"
+#include "iwdg.h"
+#include "logging.h"
+#include "SX1280_Constants.h"
+#include "AssuredPacketManager.h"
+#include "system_test.h"
+#include "drain_battery.h"
+#include "mcp_page.h"
+
+
 /* ============================================================ */
 /* ======================= VARIABLES ========================== */
 /* ============================================================ */