From c2fc6711d8410f72290b799f6288c588ea04a506 Mon Sep 17 00:00:00 2001 From: Thad House Date: Tue, 13 Sep 2016 20:27:38 -0700 Subject: [PATCH] Switches enums to use a fixed size for their base (#230) --- hal/include/HAL/Accelerometer.h | 2 +- hal/include/HAL/AnalogTrigger.h | 2 +- hal/include/HAL/Counter.h | 2 +- hal/include/HAL/DriverStation.h | 2 +- hal/include/HAL/Encoder.h | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hal/include/HAL/Accelerometer.h b/hal/include/HAL/Accelerometer.h index 76bb0caf8c..ca485cce78 100644 --- a/hal/include/HAL/Accelerometer.h +++ b/hal/include/HAL/Accelerometer.h @@ -9,7 +9,7 @@ #include "HAL/Types.h" -enum HAL_AccelerometerRange { +enum HAL_AccelerometerRange : int32_t { HAL_AccelerometerRange_k2G = 0, HAL_AccelerometerRange_k4G = 1, HAL_AccelerometerRange_k8G = 2, diff --git a/hal/include/HAL/AnalogTrigger.h b/hal/include/HAL/AnalogTrigger.h index d4c0f6c54a..d6a522ace4 100644 --- a/hal/include/HAL/AnalogTrigger.h +++ b/hal/include/HAL/AnalogTrigger.h @@ -11,7 +11,7 @@ #include "HAL/Types.h" -enum HAL_AnalogTriggerType { +enum HAL_AnalogTriggerType : int32_t { HAL_Trigger_kInWindow = 0, HAL_Trigger_kState = 1, HAL_Trigger_kRisingPulse = 2, diff --git a/hal/include/HAL/Counter.h b/hal/include/HAL/Counter.h index 720886f863..5ecf95cd91 100644 --- a/hal/include/HAL/Counter.h +++ b/hal/include/HAL/Counter.h @@ -12,7 +12,7 @@ #include "HAL/AnalogTrigger.h" #include "HAL/Types.h" -enum HAL_Counter_Mode { +enum HAL_Counter_Mode : int32_t { HAL_Counter_kTwoPulse = 0, HAL_Counter_kSemiperiod = 1, HAL_Counter_kPulseLength = 2, diff --git a/hal/include/HAL/DriverStation.h b/hal/include/HAL/DriverStation.h index 8505ddbaf7..ba97aea7da 100644 --- a/hal/include/HAL/DriverStation.h +++ b/hal/include/HAL/DriverStation.h @@ -37,7 +37,7 @@ struct HAL_ControlWord { uint32_t control_reserved : 26; }; -enum HAL_AllianceStationID { +enum HAL_AllianceStationID : int32_t { HAL_AllianceStationID_kRed1, HAL_AllianceStationID_kRed2, HAL_AllianceStationID_kRed3, diff --git a/hal/include/HAL/Encoder.h b/hal/include/HAL/Encoder.h index 1af0f88fa2..94f78905fa 100644 --- a/hal/include/HAL/Encoder.h +++ b/hal/include/HAL/Encoder.h @@ -12,13 +12,13 @@ #include "HAL/AnalogTrigger.h" #include "HAL/Types.h" -enum HAL_EncoderIndexingType { +enum HAL_EncoderIndexingType : int32_t { HAL_kResetWhileHigh, HAL_kResetWhileLow, HAL_kResetOnFallingEdge, HAL_kResetOnRisingEdge }; -enum HAL_EncoderEncodingType { +enum HAL_EncoderEncodingType : int32_t { HAL_Encoder_k1X, HAL_Encoder_k2X, HAL_Encoder_k4X