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

Use Twine in error checks.

Browse Source
This commit is contained in:
Peter Johnson
2017-12-01 21:50:24 -08:00
parent fe53dd2f28
commit 54326311ad
9 changed files with 27 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wpilibc/src/main/native/cpp/Solenoid.cpp
View File

@@ -10,8 +10,6 @@
#include <HAL/HAL.h>
#include <HAL/Ports.h>
#include <HAL/Solenoid.h>
#include <llvm/SmallString.h>
#include <llvm/raw_ostream.h>
#include "SensorBase.h"
#include "SmartDashboard/SendableBuilder.h"
@@ -35,16 +33,15 @@ Solenoid::Solenoid(int channel)
*/
Solenoid::Solenoid(int moduleNumber, int channel)
: SolenoidBase(moduleNumber), m_channel(channel) {
llvm::SmallString<32> str;
llvm::raw_svector_ostream buf(str);
if (!SensorBase::CheckSolenoidModule(m_moduleNumber)) {
buf << "Solenoid Module " << m_moduleNumber;
wpi_setWPIErrorWithContext(ModuleIndexOutOfRange, buf.str());
wpi_setWPIErrorWithContext(
ModuleIndexOutOfRange,
"Solenoid Module " + llvm::Twine(m_moduleNumber));
return;
}
if (!SensorBase::CheckSolenoidChannel(m_channel)) {
buf << "Solenoid Module " << m_channel;
wpi_setWPIErrorWithContext(ChannelIndexOutOfRange, buf.str());
wpi_setWPIErrorWithContext(ChannelIndexOutOfRange,
"Solenoid Channel " + llvm::Twine(m_channel));
return;
}