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

[hal] Replace hardcoded sim array sizes with constants (#4015)

Browse Source
This commit is contained in:
Dustin Spicuzza
2022-02-10 03:12:07 -05:00
committed by GitHub
parent 74de97eeca
commit 3411eee20f
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hal/src/main/native/sim/PortsInternal.h
View File

@@ -7,6 +7,7 @@
#include <stdint.h>
namespace hal {
constexpr int32_t kAccelerometers = 1;
constexpr int32_t kNumAccumulators = 2;
constexpr int32_t kNumAnalogTriggers = 8;
constexpr int32_t kNumAnalogInputs = 8;
@@ -18,6 +19,7 @@ constexpr int32_t kNumDigitalChannels = 31;
constexpr int32_t kNumPWMChannels = 20;
constexpr int32_t kNumDigitalPWMOutputs = 6;
constexpr int32_t kNumEncoders = 8;
constexpr int32_t kI2CPorts = 2;
constexpr int32_t kNumInterrupts = 8;
constexpr int32_t kNumRelayChannels = 8;
constexpr int32_t kNumRelayHeaders = kNumRelayChannels / 2;
@@ -27,8 +29,13 @@ constexpr int32_t kNumCTREPDPModules = 63;
constexpr int32_t kNumCTREPDPChannels = 16;
constexpr int32_t kNumREVPDHModules = 63;
constexpr int32_t kNumREVPDHChannels = 24;
constexpr int32_t kNumPDSimModules = kNumREVPDHModules;
constexpr int32_t kNumPDSimChannels = kNumREVPDHChannels;
constexpr int32_t kNumDutyCycles = 8;
constexpr int32_t kNumAddressableLEDs = 1;
constexpr int32_t kNumREVPHModules = 63;
constexpr int32_t kNumREVPHChannels = 16;
constexpr int32_t kSPIAccelerometers = 5;
constexpr int32_t kSPIPorts = 5;
} // namespace hal

2
hal/src/main/native/sim/mockdata/AccelerometerData.cpp
View File

@@ -9,7 +9,7 @@ using namespace hal;
namespace hal::init {
void InitializeAccelerometerData() {
static AccelerometerData sad[1];
static AccelerometerData sad[kAccelerometers];
::hal::SimAccelerometerData = sad;
}
} // namespace hal::init

2
hal/src/main/native/sim/mockdata/I2CData.cpp
View File

@@ -9,7 +9,7 @@ using namespace hal;
namespace hal::init {
void InitializeI2CData() {
static I2CData sid[2];
static I2CData sid[kI2CPorts];
::hal::SimI2CData = sid;
}
} // namespace hal::init

2
hal/src/main/native/sim/mockdata/PowerDistributionDataInternal.h
View File

@@ -9,8 +9,6 @@
#include "hal/simulation/SimDataValue.h"
namespace hal {
constexpr int32_t kNumPDSimModules = hal::kNumREVPDHModules;
constexpr int32_t kNumPDSimChannels = hal::kNumREVPDHChannels;
class PowerDistributionData {
HAL_SIMDATAVALUE_DEFINE_NAME(Initialized)

2
hal/src/main/native/sim/mockdata/SPIAccelerometerData.cpp
View File

@@ -9,7 +9,7 @@ using namespace hal;
namespace hal::init {
void InitializeSPIAccelerometerData() {
static SPIAccelerometerData ssad[5];
static SPIAccelerometerData ssad[kSPIAccelerometers];
::hal::SimSPIAccelerometerData = ssad;
}
} // namespace hal::init

2
hal/src/main/native/sim/mockdata/SPIData.cpp
View File

@@ -9,7 +9,7 @@ using namespace hal;
namespace hal::init {
void InitializeSPIData() {
static SPIData ssd[5];
static SPIData ssd[kSPIPorts];
::hal::SimSPIData = ssd;
}
} // namespace hal::init