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

Changed AnalogChannel to AnalogInput, added AnalogOutput for MXP

Browse Source 
Change-Id: I863d89c61ff2cf4a7a3aeeca1296978e728758b6
This commit is contained in:
thomasclark
2014-06-12 18:07:45 -04:00
parent a46c246587
commit 3538e2c05c
32 changed files with 658 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpilibc/wpilibC++/include/Accelerometer.h
View File

@@ -5,7 +5,7 @@
/*----------------------------------------------------------------------------*/
#pragma once
#include "AnalogChannel.h"
#include "AnalogInput.h"
#include "SensorBase.h"
#include "PIDSource.h"
#include "LiveWindow/LiveWindowSendable.h"
@@ -20,7 +20,7 @@ class Accelerometer : public SensorBase, public PIDSource, public LiveWindowSend
public:
explicit Accelerometer(uint32_t channel);
Accelerometer(uint8_t moduleNumber, uint32_t channel);
explicit Accelerometer(AnalogChannel *channel);
explicit Accelerometer(AnalogInput *channel);
virtual ~Accelerometer();
float GetAcceleration();
@@ -38,7 +38,7 @@ public:
private:
void InitAccelerometer();
AnalogChannel *m_analogChannel;
AnalogInput *m_AnalogInput;
float m_voltsPerG;
float m_zeroGVoltage;
bool m_allocatedChannel;