Reordered headers according to the style guide (#58)

Subsections are alphabetized according to lexographic ordering. Also, HAL includes were moved from headers to source files where possible. This change may cause user code which uses HAL functionality and does not include the relevant HAL header (since it may have been provided by another WPILib header) to fail to compile.

wpilibc/athena/src/ADXL345_SPI.cpp

@@ -8,6 +8,7 @@
 #include "ADXL345_SPI.h"
 #include "DigitalInput.h"
 #include "DigitalOutput.h"
+#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 
 const uint8_t ADXL345_SPI::kPowerCtlRegister;

wpilibc/athena/src/ADXL362.cpp

@@ -9,6 +9,7 @@
 #include "DigitalInput.h"
 #include "DigitalOutput.h"
 #include "DriverStation.h"
+#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 
 static uint8_t kRegWrite = 0x0A;

wpilibc/athena/src/AnalogAccelerometer.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "AnalogAccelerometer.h"
+#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
 

wpilibc/athena/src/AnalogGyro.cpp

@@ -6,11 +6,15 @@
 /*----------------------------------------------------------------------------*/
 
 #include "AnalogGyro.h"
-#include <climits>
+
+#include <limits.h>
+
 #include "AnalogInput.h"
+#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 #include "Timer.h"
 #include "WPIErrors.h"
+
 const uint32_t AnalogGyro::kOversampleBits;
 const uint32_t AnalogGyro::kAverageBits;
 constexpr float AnalogGyro::kSamplesPerSecond;

wpilibc/athena/src/AnalogInput.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "AnalogInput.h"
+#include "HAL/HAL.h"
 #include "HAL/Port.h"
 #include "LiveWindow/LiveWindow.h"
 #include "Resource.h"

wpilibc/athena/src/AnalogOutput.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "AnalogOutput.h"
+#include "HAL/HAL.h"
 #include "HAL/Port.h"
 #include "LiveWindow/LiveWindow.h"
 #include "Resource.h"

wpilibc/athena/src/AnalogTrigger.cpp

@@ -8,6 +8,7 @@
 #include "AnalogTrigger.h"
 
 #include "AnalogInput.h"
+#include "HAL/HAL.h"
 #include "HAL/Port.h"
 #include "Resource.h"
 #include "WPIErrors.h"

wpilibc/athena/src/AnalogTriggerOutput.cpp

@@ -7,6 +7,7 @@
 
 #include "AnalogTriggerOutput.h"
 #include "AnalogTrigger.h"
+#include "HAL/HAL.h"
 #include "WPIErrors.h"
 
 /**

wpilibc/athena/src/CANJaguar.cpp

@@ -6,14 +6,18 @@
 /*----------------------------------------------------------------------------*/
 
 #include "CANJaguar.h"
-#include "Timer.h"
-#define tNIRIO_i32 int
-#include <cassert>
-#include <cstdio>
+
+#include <assert.h>
+#include <stdio.h>
+
+#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 #include "NetworkCommunication/CANSessionMux.h"
+#include "Timer.h"
 #include "WPIErrors.h"
 
+#define tNIRIO_i32 int
+
 /* we are on ARM-LE now, not Freescale so no need to swap */
 #define swap16(x) (x)
 #define swap32(x) (x)

wpilibc/athena/src/CANTalon.cpp

@@ -6,8 +6,12 @@
 /*----------------------------------------------------------------------------*/
 
 #include "CANTalon.h"
+
 #include <unistd.h>  // usleep
+
 #include <sstream>
+
+#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
 

wpilibc/athena/src/CameraServer.cpp

@@ -6,16 +6,18 @@
 /*----------------------------------------------------------------------------*/
 
 #include "CameraServer.h"
-#include "Utility.h"
-#include "WPIErrors.h"
 
 #include <netdb.h>
+#include <string.h>
 #include <sys/socket.h>
 #include <unistd.h>
+
 #include <chrono>
-#include <cstring>
 #include <iostream>
 
+#include "Utility.h"
+#include "WPIErrors.h"
+
 constexpr uint8_t CameraServer::kMagicNumber[];
 
 CameraServer* CameraServer::GetInstance() {

wpilibc/athena/src/Compressor.cpp

@@ -3,6 +3,8 @@
  */
 
 #include "Compressor.h"
+
+#include "HAL/HAL.h"
 #include "WPIErrors.h"
 
 /**

wpilibc/athena/src/ControllerPower.cpp

@@ -8,6 +8,7 @@
 #include "ControllerPower.h"
 
 #include <stdint.h>
+
 #include "ErrorBase.h"
 #include "HAL/HAL.h"
 #include "HAL/Power.h"

wpilibc/athena/src/Counter.cpp

@@ -6,8 +6,10 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Counter.h"
+
 #include "AnalogTrigger.h"
 #include "DigitalInput.h"
+#include "HAL/HAL.h"
 #include "Resource.h"
 #include "WPIErrors.h"
 

wpilibc/athena/src/DigitalGlitchFilter.cpp

@@ -5,12 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
+#include "DigitalGlitchFilter.h"
+
 #include <algorithm>
 #include <array>
 
 #include "Counter.h"
-#include "DigitalGlitchFilter.h"
 #include "Encoder.h"
+#include "HAL/HAL.h"
 #include "Resource.h"
 #include "Utility.h"
 #include "WPIErrors.h"

wpilibc/athena/src/DigitalInput.cpp

@@ -6,13 +6,15 @@
 /*----------------------------------------------------------------------------*/
 
 #include "DigitalInput.h"
-#include "LiveWindow/LiveWindow.h"
-#include "Resource.h"
-#include "WPIErrors.h"
 
 #include <limits>
 #include <sstream>
 
+#include "HAL/HAL.h"
+#include "LiveWindow/LiveWindow.h"
+#include "Resource.h"
+#include "WPIErrors.h"
+
 /**
  * Create an instance of a Digital Input class.
  *

wpilibc/athena/src/DigitalOutput.cpp

@@ -6,6 +6,8 @@
 /*----------------------------------------------------------------------------*/
 
 #include "DigitalOutput.h"
+
+#include "HAL/HAL.h"
 #include "Resource.h"
 #include "WPIErrors.h"
 

wpilibc/athena/src/DoubleSolenoid.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "DoubleSolenoid.h"
+#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
 

wpilibc/athena/src/Encoder.cpp

@@ -7,6 +7,7 @@
 
 #include "Encoder.h"
 #include "DigitalInput.h"
+#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 #include "Resource.h"
 #include "WPIErrors.h"

wpilibc/athena/src/InterruptableSensorBase.cpp

@@ -6,6 +6,8 @@
 /*----------------------------------------------------------------------------*/
 
 #include "InterruptableSensorBase.h"
+
+#include "HAL/HAL.h"
 #include "Utility.h"
 #include "WPIErrors.h"
 

wpilibc/athena/src/Jaguar.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Jaguar.h"
+#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 
 /**

wpilibc/athena/src/RobotBase.cpp

@@ -7,8 +7,9 @@
 
 #include "RobotBase.h"
 
-#include <cstdio>
-#include <cstring>
+#include <stdio.h>
+#include <string.h>
+
 #include "DriverStation.h"
 #include "HAL/HAL.h"
 #include "HLUsageReporting.h"

wpilibc/athena/src/RobotDrive.cpp

@@ -9,6 +9,7 @@
 
 #include <math.h>
 #include "GenericHID.h"
+#include "HAL/HAL.h"
 #include "Joystick.h"
 #include "Talon.h"
 #include "Utility.h"

wpilibc/athena/src/SD540.cpp

@@ -7,6 +7,7 @@
 
 #include "SD540.h"
 
+#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 
 /**

wpilibc/athena/src/SPI.cpp

@@ -6,11 +6,12 @@
 /*----------------------------------------------------------------------------*/
 
 #include "SPI.h"
-#include "HAL/HAL.h"
-#include "WPIErrors.h"
 
 #include <string.h>
 
+#include "HAL/HAL.h"
+#include "WPIErrors.h"
+
 /**
  * Constructor
  *

wpilibc/athena/src/Solenoid.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Solenoid.h"
+#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
 

wpilibc/athena/src/SolenoidBase.cpp

@@ -7,6 +7,8 @@
 
 #include "SolenoidBase.h"
 
+#include "HAL/HAL.h"
+
 void* SolenoidBase::m_ports[m_maxModules][m_maxPorts];
 std::unique_ptr<Resource> SolenoidBase::m_allocated;
 

wpilibc/athena/src/Spark.cpp

@@ -7,6 +7,7 @@
 
 #include "Spark.h"
 
+#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 
 /**

wpilibc/athena/src/Talon.cpp

@@ -7,6 +7,7 @@
 
 #include "Talon.h"
 
+#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 
 /**

wpilibc/athena/src/TalonSRX.cpp

@@ -7,6 +7,7 @@
 
 #include "TalonSRX.h"
 
+#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 
 /**

wpilibc/athena/src/Utility.cpp

@@ -7,14 +7,15 @@
 
 #include "Utility.h"
 
-//#include "NetworkCommunication/FRCComm.h"
 #include <cxxabi.h>
 #include <execinfo.h>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include <iostream>
 #include <sstream>
+
 #include "HAL/HAL.h"
 #include "Task.h"
 #include "nivision.h"

wpilibc/athena/src/Victor.cpp

@@ -7,6 +7,7 @@
 
 #include "Victor.h"
 
+#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 
 /**

wpilibc/athena/src/VictorSP.cpp

@@ -7,6 +7,7 @@
 
 #include "VictorSP.h"
 
+#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 
 /**

wpilibc/athena/src/Vision/AxisCamera.cpp

@@ -7,18 +7,19 @@
 
 #include "Vision/AxisCamera.h"
 
-#include "WPIErrors.h"
-
-#include <Timer.h>
 #include <netdb.h>
 #include <netinet/in.h>
+#include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <cstring>
+
 #include <iostream>
 #include <sstream>
 
+#include "Timer.h"
+#include "WPIErrors.h"
+
 static const unsigned int kMaxPacketSize = 1536;
 static const unsigned int kImageBufferAllocationIncrement = 1000;
 

wpilibc/athena/src/Vision/BinaryImage.cpp

@@ -6,7 +6,9 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Vision/BinaryImage.h"
-#include <cstring>
+
+#include <string.h>
+
 #include "WPIErrors.h"
 
 using namespace std;