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.
This commit is contained in:
Tyler Veness
2016-05-25 22:38:11 -07:00
committed by Peter Johnson
parent a598e2d09b
commit d82635bbe1
147 changed files with 398 additions and 272 deletions

View File

@@ -6,6 +6,7 @@
/*----------------------------------------------------------------------------*/
#pragma once
#include <stdint.h>
extern "C" {

View File

@@ -6,6 +6,7 @@
/*----------------------------------------------------------------------------*/
#pragma once
#include <stdint.h>
extern "C" {

View File

@@ -6,6 +6,7 @@
/*----------------------------------------------------------------------------*/
#pragma once
#include <stdint.h>
extern "C" {

View File

@@ -6,6 +6,7 @@
/*----------------------------------------------------------------------------*/
#pragma once
#include <stdint.h>
enum AnalogTriggerType {

View File

@@ -8,6 +8,7 @@
#pragma once
#include <stdint.h>
#include "FRC_NetworkCommunication/CANSessionMux.h"
void canTxSend(uint32_t arbID, uint8_t length,

View File

@@ -6,6 +6,7 @@
/*----------------------------------------------------------------------------*/
#pragma once
#include <stdint.h>
enum Mode {

View File

@@ -6,6 +6,7 @@
/*----------------------------------------------------------------------------*/
#pragma once
#include <stdint.h>
extern "C" {

View File

@@ -6,6 +6,7 @@
/*----------------------------------------------------------------------------*/
#pragma once
#include <stdint.h>
extern "C" {

View File

@@ -7,8 +7,8 @@
#pragma once
#include <math.h>
#include <stdint.h>
#include <cmath>
#include "Accelerometer.h"
#include "AnalogAccumulator.h"
@@ -29,10 +29,9 @@
#include "Relay.h"
#include "SPI.h"
#include "SPIAccumulator.h"
#include "Semaphore.h"
#include "SerialPort.h"
#include "Solenoid.h"
#include "Semaphore.h"
#include "Task.h"
#include "Utilities.h"

View File

@@ -6,6 +6,7 @@
/*----------------------------------------------------------------------------*/
#pragma once
#include <stdint.h>
extern "C" {

View File

@@ -7,10 +7,10 @@
#pragma once
#include <errno.h>
#include <stdint.h>
#include <iostream>
#include "errno.h"
extern "C" {
typedef void (*InterruptHandlerFunction)(uint32_t interruptAssertedMask,

View File

@@ -6,6 +6,7 @@
/*----------------------------------------------------------------------------*/
#pragma once
#include <stdint.h>
extern "C" {

View File

@@ -6,6 +6,7 @@
/*----------------------------------------------------------------------------*/
#pragma once
#include <stdint.h>
extern "C" {

View File

@@ -6,6 +6,7 @@
/*----------------------------------------------------------------------------*/
#pragma once
#include <stdint.h>
#include "HAL/cpp/priority_mutex.h"

View File

@@ -6,6 +6,7 @@
/*----------------------------------------------------------------------------*/
#pragma once
#include <stdint.h>
extern "C" {

View File

@@ -8,11 +8,12 @@
#pragma once
#include <stdint.h>
#include "../Errors.h"
#include "HAL/cpp/priority_mutex.h"
#include <vector>
#include "../Errors.h"
#include "HAL/cpp/priority_mutex.h"
// TODO: Replace this with something appropriate to avoid conflicts with
// wpilibC++ Resource class (which performs an essentially identical function).
namespace hal {

View File

@@ -7,8 +7,9 @@
#pragma once
#include <stdint.h>
#include <condition_variable>
#include <cstdint>
#include "HAL/cpp/priority_mutex.h"

View File

@@ -18,6 +18,7 @@
#include <condition_variable>
#include <memory>
#include "priority_mutex.h"
class priority_condition_variable {

View File

@@ -10,6 +10,7 @@
#include <assert.h>
#include <stdint.h>
#include <stdio.h>
#include "ChipObject.h"
// The 7-bit I2C address with a 0 "send" bit

View File

@@ -6,7 +6,9 @@
/*----------------------------------------------------------------------------*/
#include "HAL/Compressor.h"
#include <iostream>
#include "ctre/PCM.h"
static const int NUM_MODULE_NUMBERS = 63;

View File

@@ -5,22 +5,23 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include <math.h>
#include <stdio.h>
#include <mutex>
#include "ChipObject.h"
#include "FRC_NetworkCommunication/LoadOut.h"
#include "HAL/Counter.h"
#include "HAL/DIO.h"
#include "HAL/Encoder.h"
#include "HAL/HAL.h"
#include "HAL/I2C.h"
#include "HAL/PWM.h"
#include "HAL/Port.h"
#include "HAL/Relay.h"
#include "HAL/SPI.h"
#include "HAL/SPIAccumulator.h"
#include <math.h>
#include <stdio.h>
#include <mutex>
#include "ChipObject.h"
#include "FRC_NetworkCommunication/LoadOut.h"
#include "HAL/HAL.h"
#include "HAL/Port.h"
#include "HAL/cpp/Resource.h"
#include "HAL/cpp/priority_mutex.h"
#include "i2clib/i2c-lib.h"

View File

@@ -8,12 +8,14 @@
#include "HAL/HAL.h"
#include <signal.h> // linux for kill
#include <stdlib.h>
#include <sys/prctl.h>
#include <unistd.h>
#include <cstdlib>
#include <fstream>
#include <iostream>
#include <mutex>
#include "ChipObject.h"
#include "FRC_NetworkCommunication/CANSessionMux.h"
#include "FRC_NetworkCommunication/FRCComm.h"
@@ -23,6 +25,7 @@
#include "HAL/Port.h"
#include "ctre/ctre.h"
#include "visa/visa.h"
const uint32_t solenoid_kNumDO7_0Elements = 8;
const uint32_t dio_kNumSystems = tDIO::kNumSystems;
const uint32_t interrupt_kNumSystems = tInterrupt::kNumSystems;

View File

@@ -6,6 +6,7 @@
/*----------------------------------------------------------------------------*/
#include "HAL/Interrupts.h"
#include "ChipObject.h"
extern void remapDigitalSource(bool analogTrigger, uint32_t& pin,

View File

@@ -6,9 +6,12 @@
/*----------------------------------------------------------------------------*/
#include "HAL/Notifier.h"
#include <stdlib.h>
#include <atomic>
#include <cstdlib>
#include <mutex>
#include "ChipObject.h"
#include "HAL/HAL.h"
#include "HAL/cpp/priority_mutex.h"

View File

@@ -6,8 +6,8 @@
/*----------------------------------------------------------------------------*/
#include "HAL/PDP.h"
#include "ctre/PDP.h"
// static PDP pdp;
static const int NUM_MODULE_NUMBERS = 63;

View File

@@ -6,6 +6,7 @@
/*----------------------------------------------------------------------------*/
#include "HAL/Power.h"
#include "ChipObject.h"
static tPower* power = NULL;

View File

@@ -6,6 +6,7 @@
/*----------------------------------------------------------------------------*/
#include "HAL/SerialPort.h"
#include "visa/visa.h"
static uint32_t m_resourceManagerHandle;

View File

@@ -7,6 +7,8 @@
#include "HAL/Task.h"
#include <signal.h>
#ifndef OK
#define OK 0
#endif /* OK */
@@ -14,8 +16,6 @@
#define ERROR (-1)
#endif /* ERROR */
#include <signal.h>
extern "C" {
STATUS verifyTaskID(TASK task) {

View File

@@ -6,6 +6,7 @@
/*----------------------------------------------------------------------------*/
#include "HAL/Utilities.h"
#include <time.h>
const int32_t HAL_NO_WAIT = 0;

View File

@@ -6,7 +6,9 @@
/*----------------------------------------------------------------------------*/
#include "HAL/cpp/Resource.h"
#include <cstddef>
#include <stddef.h>
#include "HAL/Errors.h"
#include "HAL/cpp/priority_mutex.h"

View File

@@ -5,11 +5,10 @@
/* the project. */
/*----------------------------------------------------------------------------*/
// This file must compile on ALL PLATFORMS. Be very careful what you put in
// here.
#include "HAL/HAL.h"
#include <cstring>
#include "FRC_NetworkCommunication/FRCComm.h"
struct HALJoystickAxesInt {