Merge "Unbreak cmake build."

hal/include/ctre/CtreCanNode.h

@@ -1,7 +1,6 @@
 #ifndef CtreCanNode_H_
 #define CtreCanNode_H_
 #include "ctre.h"				//BIT Defines + Typedefs
-#include <NetworkCommunication/CANSessionMux.h>	//CAN Comm
 #include <map>
 #include <string.h> // memcpy
 #include <sys/time.h>

hal/include/ctre/PCM.h

@@ -1,7 +1,6 @@
 #ifndef PCM_H_
 #define PCM_H_
 #include "ctre.h"				//BIT Defines + Typedefs
-#include <NetworkCommunication/CANSessionMux.h>	//CAN Comm
 #include "CtreCanNode.h"
 class PCM : public CtreCanNode
 {

hal/include/ctre/PDP.h

@@ -1,7 +1,6 @@
 #ifndef PDP_H_
 #define PDP_H_
 #include "ctre.h"				//BIT Defines + Typedefs
-#include <NetworkCommunication/CANSessionMux.h>	//CAN Comm
 #include "CtreCanNode.h"
 class PDP : public CtreCanNode
 {

hal/lib/Athena/ctre/CtreCanNode.cpp

@@ -1,6 +1,6 @@
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 
-#include "CtreCanNode.h"
+#include "ctre/CtreCanNode.h"
 #include "NetworkCommunication/CANSessionMux.h"
 #include <string.h> // memset
 #include <unistd.h> // usleep

hal/lib/Athena/ctre/PCM.cpp

@@ -1,6 +1,6 @@
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 
-#include "PCM.h"
+#include "ctre/PCM.h"
 #include "NetworkCommunication/CANSessionMux.h"
 #include <string.h> // memset
 #include <unistd.h> // usleep

hal/lib/Athena/ctre/PDP.cpp

@@ -1,4 +1,4 @@
-#include "PDP.h"
+#include "ctre/PDP.h"
 #include "NetworkCommunication/CANSessionMux.h"	//CAN Comm
 #include <string.h> // memset
 #include <unistd.h> // usleep