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

Fixes CPP lint errors added to HAL. (#173)

Browse Source
This commit is contained in:
Thad House
2016-07-13 20:16:45 -07:00
committed by Peter Johnson
parent 5305087162
commit 05c00430b3
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hal/lib/athena/PCMInternal.cpp
View File

@@ -23,4 +23,4 @@ void initializePCM(int32_t module, int32_t* status) {
PCM_modules[module] = new PCM(module);
}
}
}
} // namespace hal

4
hal/lib/athena/PWM.cpp
View File

@@ -75,7 +75,7 @@ HAL_DigitalHandle HAL_InitializePWMPort(HAL_PortHandle port_handle,
port->pin = origPin;
int32_t bitToSet = 1 << remapMXPPWMChannel(port->pin);
unsigned short specialFunctions =
uint16_t specialFunctions =
digitalSystem->readEnableMXPSpecialFunction(status);
digitalSystem->writeEnableMXPSpecialFunction(specialFunctions | bitToSet,
status);
@@ -91,7 +91,7 @@ void HAL_FreePWMPort(HAL_DigitalHandle pwm_port_handle, int32_t* status) {
if (port->pin > tPWM::kNumHdrRegisters - 1) {
int32_t bitToUnset = 1 << remapMXPPWMChannel(port->pin);
unsigned short specialFunctions =
uint16_t specialFunctions =
digitalSystem->readEnableMXPSpecialFunction(status);
digitalSystem->writeEnableMXPSpecialFunction(specialFunctions & ~bitToUnset,
status);

4
hal/lib/athena/SPI.cpp
View File

@@ -240,8 +240,8 @@ void HAL_SetSPISpeed(int32_t port, int32_t speed) {
void HAL_SetSPIOpts(int32_t port, HAL_Bool msb_first,
HAL_Bool sample_on_trailing, HAL_Bool clk_idle_high) {
std::lock_guard<priority_recursive_mutex> sync(spiGetMutex(port));
spilib_setopts(HAL_GetSPIHandle(port), (int)msb_first,
(int)sample_on_trailing, (int)clk_idle_high);
spilib_setopts(HAL_GetSPIHandle(port), msb_first, sample_on_trailing,
clk_idle_high);
}
/**