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

Adds Constants from new constants class to encoders (#133)

Browse Source
This commit is contained in:
Thad House
2016-07-03 21:52:49 -07:00
committed by Peter Johnson
parent fb865d3ee7
commit ea95bb85aa
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hal/lib/athena/Encoder.cpp
View File

@@ -12,6 +12,7 @@
#include "FPGAEncoder.h"
#include "HAL/Counter.h"
#include "HAL/Errors.h"
#include "PortsInternal.h"
#include "handles/LimitedClassedHandleResource.h"
using namespace hal;
@@ -213,9 +214,9 @@ double Encoder::DecodingScaleFactor() const {
}
}
static LimitedClassedHandleResource<
HalEncoderHandle, Encoder, tEncoder::kNumSystems + tCounter::kNumSystems,
HalHandleEnum::Encoder>
static LimitedClassedHandleResource<HalEncoderHandle, Encoder,
kNumEncoders + kNumCounters,
HalHandleEnum::Encoder>
encoderHandles;
extern "C" {

8
hal/lib/athena/FPGAEncoder.cpp
View File

@@ -8,11 +8,9 @@
#include "FPGAEncoder.h"
#include "DigitalInternal.h"
#include "PortsInternal.h"
#include "handles/LimitedHandleResource.h"
static_assert(sizeof(uint32_t) <= sizeof(void*),
"This file shoves uint32_ts into pointers.");
using namespace hal;
namespace {
@@ -24,8 +22,8 @@ struct Encoder {
static const double DECODING_SCALING_FACTOR = 0.25;
static LimitedHandleResource<HalFPGAEncoderHandle, Encoder,
tEncoder::kNumSystems, HalHandleEnum::FPGAEncoder>
static LimitedHandleResource<HalFPGAEncoderHandle, Encoder, kNumEncoders,
HalHandleEnum::FPGAEncoder>
fpgaEncoderHandles;
extern "C" {