Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-28 02:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[hal] Rename SimDevice constants to all caps

Browse Source 
Also use enum class for SimDevice C++ wrapper.
This commit is contained in:
Peter Johnson
2026-03-14 12:57:37 -07:00
parent 70f77a1f8e
commit aad08b9ad1
29 changed files with 145 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hal/src/main/native/include/wpi/hal/SimDevice.h
View File

@@ -25,9 +25,9 @@
* Direction of a simulated value (from the perspective of user code).
*/
HAL_ENUM(HAL_SimValueDirection) {
HAL_SimValueInput = 0, /**< input to user code from the simulator */
HAL_SimValueOutput, /**< output from user code to the simulator */
HAL_SimValueBidir /**< bidirectional between user code and simulator */
HAL_SIM_VALUE_INPUT = 0, /**< input to user code from the simulator */
HAL_SIM_VALUE_OUTPUT, /**< output from user code to the simulator */
HAL_SIM_VALUE_BIDIR /**< bidirectional between user code and simulator */
};
#ifdef __cplusplus

58
hal/src/main/native/include/wpi/hal/SimDevice.hpp
View File

@@ -280,10 +280,10 @@ class SimDevice {
/**
* Direction of a simulated value (from the perspective of user code).
*/
enum Direction {
kInput = HAL_SimValueInput,
kOutput = HAL_SimValueOutput,
kBidir = HAL_SimValueBidir
enum class Direction {
INPUT = HAL_SIM_VALUE_INPUT,
OUTPUT = HAL_SIM_VALUE_OUTPUT,
BIDIR = HAL_SIM_VALUE_BIDIR
};
/**
@@ -403,9 +403,10 @@ class SimDevice {
* @param initialValue initial value
* @return simulated value object
*/
SimValue CreateValue(const char* name, int32_t direction,
SimValue CreateValue(const char* name, Direction direction,
const HAL_Value& initialValue) {
return HAL_CreateSimValue(m_handle, name, direction, &initialValue);
return HAL_CreateSimValue(m_handle, name, static_cast<int32_t>(direction),
&initialValue);
}
/**
@@ -419,8 +420,10 @@ class SimDevice {
* @param initialValue initial value
* @return simulated double value object
*/
SimInt CreateInt(const char* name, int32_t direction, int32_t initialValue) {
return HAL_CreateSimValueInt(m_handle, name, direction, initialValue);
SimInt CreateInt(const char* name, Direction direction,
int32_t initialValue) {
return HAL_CreateSimValueInt(m_handle, name,
static_cast<int32_t>(direction), initialValue);
}
/**
@@ -434,9 +437,10 @@ class SimDevice {
* @param initialValue initial value
* @return simulated double value object
*/
SimLong CreateLong(const char* name, int32_t direction,
SimLong CreateLong(const char* name, Direction direction,
int64_t initialValue) {
return HAL_CreateSimValueLong(m_handle, name, direction, initialValue);
return HAL_CreateSimValueLong(
m_handle, name, static_cast<int32_t>(direction), initialValue);
}
/**
@@ -450,9 +454,10 @@ class SimDevice {
* @param initialValue initial value
* @return simulated double value object
*/
SimDouble CreateDouble(const char* name, int32_t direction,
SimDouble CreateDouble(const char* name, Direction direction,
double initialValue) {
return HAL_CreateSimValueDouble(m_handle, name, direction, initialValue);
return HAL_CreateSimValueDouble(
m_handle, name, static_cast<int32_t>(direction), initialValue);
}
/**
@@ -469,12 +474,12 @@ class SimDevice {
* @param initialValue initial value (selection)
* @return simulated enum value object
*/
SimEnum CreateEnum(const char* name, int32_t direction,
SimEnum CreateEnum(const char* name, Direction direction,
std::initializer_list<const char*> options,
int32_t initialValue) {
return HAL_CreateSimValueEnum(m_handle, name, direction, options.size(),
const_cast<const char**>(options.begin()),
initialValue);
return HAL_CreateSimValueEnum(
m_handle, name, static_cast<int32_t>(direction), options.size(),
const_cast<const char**>(options.begin()), initialValue);
}
/**
@@ -491,12 +496,12 @@ class SimDevice {
* @param initialValue initial value (selection)
* @return simulated enum value object
*/
SimEnum CreateEnum(const char* name, int32_t direction,
SimEnum CreateEnum(const char* name, Direction direction,
std::span<const char* const> options,
int32_t initialValue) {
return HAL_CreateSimValueEnum(m_handle, name, direction, options.size(),
const_cast<const char**>(options.data()),
initialValue);
return HAL_CreateSimValueEnum(
m_handle, name, static_cast<int32_t>(direction), options.size(),
const_cast<const char**>(options.data()), initialValue);
}
/**
@@ -515,7 +520,7 @@ class SimDevice {
* @param initialValue initial value (selection)
* @return simulated enum value object
*/
SimEnum CreateEnumDouble(const char* name, int32_t direction,
SimEnum CreateEnumDouble(const char* name, Direction direction,
std::initializer_list<const char*> options,
std::initializer_list<double> optionValues,
int32_t initialValue) {
@@ -523,7 +528,7 @@ class SimDevice {
return {};
}
return HAL_CreateSimValueEnumDouble(
m_handle, name, direction, options.size(),
m_handle, name, static_cast<int32_t>(direction), options.size(),
const_cast<const char**>(options.begin()), optionValues.begin(),
initialValue);
}
@@ -544,7 +549,7 @@ class SimDevice {
* @param initialValue initial value (selection)
* @return simulated enum value object
*/
SimEnum CreateEnumDouble(const char* name, int32_t direction,
SimEnum CreateEnumDouble(const char* name, Direction direction,
std::span<const char* const> options,
std::span<const double> optionValues,
int32_t initialValue) {
@@ -552,7 +557,7 @@ class SimDevice {
return {};
}
return HAL_CreateSimValueEnumDouble(
m_handle, name, direction, options.size(),
m_handle, name, static_cast<int32_t>(direction), options.size(),
const_cast<const char**>(options.data()), optionValues.data(),
initialValue);
}
@@ -568,9 +573,10 @@ class SimDevice {
* @param initialValue initial value
* @return simulated boolean value object
*/
SimBoolean CreateBoolean(const char* name, int32_t direction,
SimBoolean CreateBoolean(const char* name, Direction direction,
bool initialValue) {
return HAL_CreateSimValueBoolean(m_handle, name, direction, initialValue);
return HAL_CreateSimValueBoolean(
m_handle, name, static_cast<int32_t>(direction), initialValue);
}
protected: