Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-26 01:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move mockdata/HAL_Value.h to hal/Value.h

Browse Source 
Also prefix the MakeBoolean et al functions with HAL_ to avoid namespace
pollution.
This commit is contained in:
Peter Johnson
2019-09-23 23:28:49 -07:00
parent 1b266717a8
commit e8d6f8a2c1
37 changed files with 185 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hal/src/main/native/sim/mockdata/AnalogTriggerDataInternal.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -19,15 +19,15 @@ class AnalogTriggerData {
static LLVM_ATTRIBUTE_ALWAYS_INLINE HAL_Value
MakeTriggerModeValue(HALSIM_AnalogTriggerMode value) {
return MakeEnum(value);
return HAL_MakeEnum(value);
}
public:
SimDataValue<HAL_Bool, MakeBoolean, GetInitializedName> initialized{0};
SimDataValue<double, MakeDouble, GetTriggerLowerBoundName> triggerLowerBound{
0};
SimDataValue<double, MakeDouble, GetTriggerUpperBoundName> triggerUpperBound{
0};
SimDataValue<HAL_Bool, HAL_MakeBoolean, GetInitializedName> initialized{0};
SimDataValue<double, HAL_MakeDouble, GetTriggerLowerBoundName>
triggerLowerBound{0};
SimDataValue<double, HAL_MakeDouble, GetTriggerUpperBoundName>
triggerUpperBound{0};
SimDataValue<HALSIM_AnalogTriggerMode, MakeTriggerModeValue,
GetTriggerModeName>
triggerMode{static_cast<HALSIM_AnalogTriggerMode>(0)};