Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +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++/lib/DriverStation.cpp
View File

@@ -5,7 +5,7 @@
/*----------------------------------------------------------------------------*/
#include "DriverStation.h"
#include "AnalogChannel.h"
#include "AnalogInput.h"
#include "HAL/cpp/Synchronized.hpp"
#include "Timer.h"
//#include "NetworkCommunication/FRCComm.h"
@@ -93,7 +93,7 @@ DriverStation::DriverStation()
m_controlData->analog4 = 0;
m_controlData->dsDigitalIn = 0;
m_batteryChannel = new AnalogChannel(kBatteryModuleNumber, kBatteryChannel);
m_batteryChannel = new AnalogInput(kBatteryModuleNumber, kBatteryChannel);
AddToSingletonList();
@@ -208,7 +208,7 @@ void DriverStation::SetData()
}
/**
* Read the battery voltage from the specified AnalogChannel.
* Read the battery voltage from the specified AnalogInput.
*
* This accessor assumes that the battery voltage is being measured
* through the voltage divider on an analog breakout.