Move serial include

purduesigbots · May 1, 2019 · 127caed · 127caed
1 parent 05eb95a
commit 127caed
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/include/api.h b/include/api.h
@@ -54,7 +54,6 @@
 #include "pros/motors.h"
 #include "pros/rtos.h"
 #include "pros/vision.h"
-#include "pros/serial.h"
 
 #ifdef __cplusplus
 #include "pros/adi.hpp"
@@ -63,7 +62,6 @@
 #include "pros/motors.hpp"
 #include "pros/rtos.hpp"
 #include "pros/vision.hpp"
-#include "pros/serial.hpp"
 #endif
 
 #endif  // _PROS_API_H_
diff --git a/include/pros/apix.h b/include/pros/apix.h
@@ -28,8 +28,10 @@
 #pragma GCC diagnostic ignored "-Wall"
 #include "display/lvgl.h"
 #pragma GCC diagnostic pop
+#include "pros/serial.h"
 
 #ifdef __cplusplus
+#include "pros/serial.hpp"
 namespace pros::c {
 extern "C" {
 #endif

diff --git a/src/tests/generic_serial.cpp b/src/tests/generic_serial.cpp
@@ -15,6 +15,7 @@
  */
 #include "main.h"
 #include <stdarg.h>
+#include "pros/apix.h"
 
 pros::Serial *serial_w = nullptr, *serial_r = nullptr;