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/include/ADXL345_I2C.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <memory>
+
 #include "I2C.h"
 #include "LiveWindow/LiveWindowSendable.h"
 #include "interfaces/Accelerometer.h"

wpilibc/athena/include/ADXL345_SPI.h

@@ -7,13 +7,13 @@
 
 #pragma once
 
+#include <memory>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SPI.h"
 #include "SensorBase.h"
 #include "interfaces/Accelerometer.h"
 
-#include <memory>
-
 class DigitalInput;
 class DigitalOutput;
 

wpilibc/athena/include/ADXL362.h

@@ -7,13 +7,13 @@
 
 #pragma once
 
+#include <memory>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SPI.h"
 #include "SensorBase.h"
 #include "interfaces/Accelerometer.h"
 
-#include <memory>
-
 class DigitalInput;
 class DigitalOutput;
 

wpilibc/athena/include/ADXRS450_Gyro.h

@@ -7,13 +7,13 @@
 
 #pragma once
 
+#include <memory>
+
 #include "GyroBase.h"
 #include "HAL/cpp/priority_mutex.h"
 #include "Notifier.h"
 #include "SPI.h"
 
-#include <memory>
-
 /**
  * Use a rate gyro to return the robots heading relative to a starting position.
  * The Gyro class tracks the robots heading based on the starting position. As

wpilibc/athena/include/AnalogAccelerometer.h

@@ -7,13 +7,13 @@
 
 #pragma once
 
+#include <memory>
+
 #include "AnalogInput.h"
 #include "LiveWindow/LiveWindowSendable.h"
 #include "PIDSource.h"
 #include "SensorBase.h"
 
-#include <memory>
-
 /**
  * Handle operation of an analog accelerometer.
  * The accelerometer reads acceleration directly through the sensor. Many

wpilibc/athena/include/AnalogInput.h

@@ -7,13 +7,12 @@
 
 #pragma once
 
-#include "HAL/HAL.h"
+#include <memory>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "PIDSource.h"
 #include "SensorBase.h"
 
-#include <memory>
-
 /**
  * Analog input class.
  *

wpilibc/athena/include/AnalogOutput.h

@@ -7,9 +7,10 @@
 
 #pragma once
 
-#include <cstdint>
+#include <stdint.h>
+
 #include <memory>
-#include "HAL/HAL.h"
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SensorBase.h"
 

wpilibc/athena/include/AnalogPotentiometer.h

@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
+#include <memory>
+
 #include "AnalogInput.h"
 #include "LiveWindow/LiveWindowSendable.h"
 #include "interfaces/Potentiometer.h"
 
-#include <memory>
-
 /**
  * Class for reading analog potentiometers. Analog potentiometers read
  * in an analog voltage that corresponds to a position. The position is

wpilibc/athena/include/AnalogTrigger.h

@@ -8,7 +8,6 @@
 #pragma once
 
 #include "AnalogTriggerOutput.h"
-#include "HAL/HAL.h"
 #include "SensorBase.h"
 
 class AnalogInput;

wpilibc/athena/include/AnalogTriggerOutput.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include "DigitalSource.h"
+#include "HAL/AnalogTrigger.h"
 
 class AnalogTrigger;
 

wpilibc/athena/include/BuiltInAccelerometer.h

@@ -7,12 +7,12 @@
 
 #pragma once
 
+#include <memory>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SensorBase.h"
 #include "interfaces/Accelerometer.h"
 
-#include <memory>
-
 /**
  * Built-in accelerometer.
  *

wpilibc/athena/include/CANJaguar.h

@@ -7,11 +7,16 @@
 
 #pragma once
 
+#include <atomic>
+#include <memory>
+#include <sstream>
+#include <utility>
+
 #include "CAN/can_proto.h"
 #include "CANSpeedController.h"
 #include "ErrorBase.h"
-#include "HAL/HAL.h"
 #include "HAL/cpp/Semaphore.h"
+#include "HAL/cpp/priority_mutex.h"
 #include "LiveWindow/LiveWindowSendable.h"
 #include "MotorSafety.h"
 #include "MotorSafetyHelper.h"
@@ -20,12 +25,6 @@
 #include "Resource.h"
 #include "tables/ITableListener.h"
 
-#include <atomic>
-#include <memory>
-#include <sstream>
-#include <utility>
-#include "HAL/cpp/priority_mutex.h"
-
 /**
  * Luminary Micro / Vex Robotics Jaguar Speed Control
  */

wpilibc/athena/include/CANTalon.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "CANSpeedController.h"
 #include "HAL/CanTalonSRX.h"
 #include "LiveWindow/LiveWindowSendable.h"
@@ -17,8 +19,6 @@
 #include "SafePWM.h"
 #include "tables/ITable.h"
 
-#include <memory>
-
 /**
  * CTRE Talon SRX Speed Controller with CAN Control
  */

wpilibc/athena/include/CameraServer.h

@@ -7,17 +7,17 @@
 
 #pragma once
 
-#include "ErrorBase.h"
-#include "NIIMAQdx.h"
-#include "USBCamera.h"
-#include "nivision.h"
-
 #include <condition_variable>
 #include <memory>
 #include <thread>
 #include <tuple>
 #include <vector>
+
+#include "ErrorBase.h"
 #include "HAL/cpp/priority_mutex.h"
+#include "NIIMAQdx.h"
+#include "USBCamera.h"
+#include "nivision.h"
 
 class CameraServer : public ErrorBase {
  private:

wpilibc/athena/include/Compressor.h

@@ -8,13 +8,12 @@
 #ifndef Compressor_H_
 #define Compressor_H_
 
-#include "HAL/HAL.h"
+#include <memory>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SensorBase.h"
 #include "tables/ITableListener.h"
 
-#include <memory>
-
 /**
  * PCM compressor
  */

wpilibc/athena/include/Counter.h

@@ -7,14 +7,14 @@
 
 #pragma once
 
-#include "AnalogTriggerOutput.h"
+#include <memory>
+
+#include "AnalogTrigger.h"
 #include "CounterBase.h"
-#include "HAL/HAL.h"
+#include "HAL/Counter.h"
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SensorBase.h"
 
-#include <memory>
-
 class DigitalGlitchFilter;
 
 /**

wpilibc/athena/include/DigitalInput.h

@@ -7,12 +7,13 @@
 
 #pragma once
 
+#include <stdint.h>
+
+#include <memory>
+
 #include "DigitalSource.h"
 #include "LiveWindow/LiveWindowSendable.h"
 
-#include <cstdint>
-#include <memory>
-
 class DigitalGlitchFilter;
 
 /**

wpilibc/athena/include/DigitalOutput.h

@@ -7,12 +7,12 @@
 
 #pragma once
 
+#include <memory>
+
 #include "DigitalSource.h"
 #include "LiveWindow/LiveWindowSendable.h"
 #include "tables/ITableListener.h"
 
-#include <memory>
-
 /**
  * Class to write to digital outputs.
  * Write values to the digital output channels. Other devices implemented

wpilibc/athena/include/DoubleSolenoid.h

@@ -7,12 +7,12 @@
 
 #pragma once
 
+#include <memory>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SolenoidBase.h"
 #include "tables/ITableListener.h"
 
-#include <memory>
-
 /**
  * DoubleSolenoid class for running 2 channels of high voltage Digital Output
  * (PCM).

wpilibc/athena/include/DriverStation.h

@@ -9,8 +9,7 @@
 
 #include <atomic>
 #include <condition_variable>
-#include <memory>
-#include "HAL/HAL.h"
+
 #include "HAL/cpp/Semaphore.h"
 #include "HAL/cpp/priority_condition_variable.h"
 #include "HAL/cpp/priority_mutex.h"

wpilibc/athena/include/Encoder.h

@@ -7,15 +7,14 @@
 
 #pragma once
 
+#include <memory>
+
 #include "Counter.h"
 #include "CounterBase.h"
-#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindowSendable.h"
 #include "PIDSource.h"
 #include "SensorBase.h"
 
-#include <memory>
-
 class DigitalSource;
 class DigitalGlitchFilter;
 

wpilibc/athena/include/GearTooth.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <memory>
+
 #include "Counter.h"
 
 /**

wpilibc/athena/include/InterruptableSensorBase.h

@@ -7,12 +7,12 @@
 
 #pragma once
 
-#include "HAL/HAL.h"
+#include <memory>
+
+#include "HAL/Interrupts.h"
 #include "Resource.h"
 #include "SensorBase.h"
 
-#include <memory>
-
 class InterruptableSensorBase : public SensorBase {
  public:
   enum WaitResult {

wpilibc/athena/include/Joystick.h

@@ -8,9 +8,11 @@
 #ifndef JOYSTICK_H_
 #define JOYSTICK_H_
 
-#include <cstdint>
+#include <stdint.h>
+
 #include <memory>
 #include <vector>
+
 #include "ErrorBase.h"
 #include "GenericHID.h"
 

wpilibc/athena/include/MotorSafetyHelper.h

@@ -7,11 +7,11 @@
 
 #pragma once
 
+#include <set>
+
 #include "ErrorBase.h"
 #include "HAL/cpp/priority_mutex.h"
 
-#include <set>
-
 class MotorSafety;
 
 class MotorSafetyHelper : public ErrorBase {

wpilibc/athena/include/PWM.h

@@ -7,12 +7,12 @@
 
 #pragma once
 
+#include <memory>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SensorBase.h"
 #include "tables/ITableListener.h"
 
-#include <memory>
-
 /**
  * Class implements the PWM generation in the FPGA.
  *

wpilibc/athena/include/PowerDistributionPanel.h

@@ -9,11 +9,11 @@
 #ifndef __WPILIB_POWER_DISTRIBUTION_PANEL_H__
 #define __WPILIB_POWER_DISTRIBUTION_PANEL_H__
 
+#include <memory>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SensorBase.h"
 
-#include <memory>
-
 /**
  * Class for getting voltage, current, temperature, power and energy from the
  * CAN PDP.

wpilibc/athena/include/Preferences.h

@@ -10,6 +10,7 @@
 #include <map>
 #include <string>
 #include <vector>
+
 #include "ErrorBase.h"
 #include "HAL/cpp/Semaphore.h"
 #include "Task.h"

wpilibc/athena/include/Relay.h

@@ -7,14 +7,14 @@
 
 #pragma once
 
+#include <memory>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "MotorSafety.h"
 #include "SensorBase.h"
 #include "tables/ITable.h"
 #include "tables/ITableListener.h"
 
-#include <memory>
-
 class MotorSafetyHelper;
 
 /**

wpilibc/athena/include/RobotDrive.h

@@ -8,10 +8,11 @@
 #pragma once
 
 #include <stdlib.h>
+
 #include <memory>
 #include <sstream>
+
 #include "ErrorBase.h"
-#include "HAL/HAL.h"
 #include "MotorSafety.h"
 #include "MotorSafetyHelper.h"
 

wpilibc/athena/include/SPI.h

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include "HAL/HAL.h"
 #include "SensorBase.h"
 
 class DigitalOutput;

wpilibc/athena/include/SafePWM.h

@@ -9,6 +9,7 @@
 
 #include <memory>
 #include <sstream>
+
 #include "MotorSafety.h"
 #include "MotorSafetyHelper.h"
 #include "PWM.h"

wpilibc/athena/include/SerialPort.h

@@ -8,7 +8,6 @@
 #pragma once
 
 #include "ErrorBase.h"
-#include "HAL/HAL.h"
 
 /**
  * Driver for the RS-232 serial port on the RoboRIO.

wpilibc/athena/include/Servo.h

@@ -7,11 +7,11 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SafePWM.h"
 #include "SpeedController.h"
 
-#include <memory>
-
 /**
  * Standard hobby style servo.
  *

wpilibc/athena/include/Solenoid.h

@@ -7,12 +7,12 @@
 
 #pragma once
 
+#include <memory>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SolenoidBase.h"
 #include "tables/ITableListener.h"
 
-#include <memory>
-
 /**
  * Solenoid class for running high voltage Digital Output (PCM).
  *

wpilibc/athena/include/SolenoidBase.h

@@ -7,13 +7,11 @@
 
 #pragma once
 
-#include "HAL/HAL.h"
-#include "HAL/Port.h"
+#include <memory>
+
 #include "Resource.h"
 #include "SensorBase.h"
 
-#include <memory>
-
 /**
  * SolenoidBase class is the common base class for the Solenoid and
  * DoubleSolenoid classes.

wpilibc/athena/include/SpeedController.h

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include "HAL/HAL.h"
 #include "PIDOutput.h"
 
 /**

wpilibc/athena/include/USBCamera.h

@@ -7,13 +7,13 @@
 
 #pragma once
 
+#include <string>
+
 #include "ErrorBase.h"
 #include "HAL/cpp/priority_mutex.h"
 #include "NIIMAQdx.h"
 #include "nivision.h"
 
-#include <string>
-
 typedef enum whiteBalance_enum {
   kFixedIndoor = 3000,
   kFixedOutdoor1 = 4000,

wpilibc/athena/include/Ultrasonic.h

@@ -10,6 +10,7 @@
 #include <atomic>
 #include <memory>
 #include <set>
+
 #include "Counter.h"
 #include "LiveWindow/LiveWindowSendable.h"
 #include "PIDSource.h"

wpilibc/athena/include/Vision/AxisCamera.h

@@ -9,9 +9,9 @@
 
 #include <string>
 #include <thread>
-#include "HAL/cpp/priority_mutex.h"
 
 #include "ErrorBase.h"
+#include "HAL/cpp/priority_mutex.h"
 #include "Vision/ColorImage.h"
 #include "Vision/HSLImage.h"
 #include "nivision.h"

wpilibc/athena/include/Vision/BinaryImage.h

@@ -7,6 +7,9 @@
 
 #pragma once
 
+#include <algorithm>
+#include <vector>
+
 #include "MonoImage.h"
 /**
  * Included for ParticleAnalysisReport definition
@@ -14,9 +17,6 @@
  */
 #include "Vision/VisionAPI.h"
 
-#include <algorithm>
-#include <vector>
-
 class BinaryImage : public MonoImage {
  public:
   virtual ~BinaryImage() = default;

wpilibc/athena/include/Vision/ImageBase.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <stdio.h>
+
 #include "ErrorBase.h"
 #include "nivision.h"
 

wpilibc/athena/include/Vision/MonoImage.h

@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include "ImageBase.h"
-
 #include <vector>
 
+#include "ImageBase.h"
+
 class MonoImage : public ImageBase {
  public:
   MonoImage();

wpilibc/athena/include/WPILib.h

@@ -9,9 +9,6 @@
 
 #define REAL
 
-#include <iostream>
-#include "string.h"
-
 #include "ADXL345_I2C.h"
 #include "ADXL345_SPI.h"
 #include "ADXL362.h"