From 6bfc0086738043b26e6884465ed0e24ca5e51a8d Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Tue, 6 Sep 2016 19:43:24 -0700 Subject: [PATCH] Replaced snake case variable names with mixed case (#221) --- hal/include/HAL/SPI.h | 12 ++++++------ hal/lib/athena/SPI.cpp | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/hal/include/HAL/SPI.h b/hal/include/HAL/SPI.h index 1d7320d921..084e74b63c 100644 --- a/hal/include/HAL/SPI.h +++ b/hal/include/HAL/SPI.h @@ -21,18 +21,18 @@ int32_t HAL_WriteSPI(int32_t port, uint8_t* dataToSend, int32_t sendSize); int32_t HAL_ReadSPI(int32_t port, uint8_t* buffer, int32_t count); void HAL_CloseSPI(int32_t port); 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); +void HAL_SetSPIOpts(int32_t port, HAL_Bool msbFirst, HAL_Bool sampleOnTrailing, + HAL_Bool clkIdleHigh); void HAL_SetSPIChipSelectActiveHigh(int32_t port, int32_t* status); void HAL_SetSPIChipSelectActiveLow(int32_t port, int32_t* status); int32_t HAL_GetSPIHandle(int32_t port); void HAL_SetSPIHandle(int32_t port, int32_t handle); void HAL_InitSPIAccumulator(int32_t port, int32_t period, int32_t cmd, - int32_t xfer_size, int32_t valid_mask, - int32_t valid_value, int32_t data_shift, - int32_t data_size, HAL_Bool is_signed, - HAL_Bool big_endian, int32_t* status); + int32_t xferSize, int32_t validMask, + int32_t validValue, int32_t dataShift, + int32_t dataSize, HAL_Bool isSigned, + HAL_Bool bigEndian, int32_t* status); void HAL_FreeSPIAccumulator(int32_t port, int32_t* status); void HAL_ResetSPIAccumulator(int32_t port, int32_t* status); void HAL_SetSPIAccumulatorCenter(int32_t port, int32_t center, int32_t* status); diff --git a/hal/lib/athena/SPI.cpp b/hal/lib/athena/SPI.cpp index 6dd4d43927..3c92d216a6 100644 --- a/hal/lib/athena/SPI.cpp +++ b/hal/lib/athena/SPI.cpp @@ -228,17 +228,17 @@ void HAL_SetSPISpeed(int32_t port, int32_t speed) { * Set the SPI options * * @param port The number of the port to use. 0-3 for Onboard CS0-CS2, 4 for MXP - * @param msb_first True to write the MSB first, False for LSB first - * @param sample_on_trailing True to sample on the trailing edge, False to - * sample on the leading edge - * @param clk_idle_high True to set the clock to active low, False to set the + * @param msbFirst True to write the MSB first, False for LSB first + * @param sampleOnTrailing True to sample on the trailing edge, False to sample + * on the leading edge + * @param clkIdleHigh True to set the clock to active low, False to set the * clock active high */ -void HAL_SetSPIOpts(int32_t port, HAL_Bool msb_first, - HAL_Bool sample_on_trailing, HAL_Bool clk_idle_high) { +void HAL_SetSPIOpts(int32_t port, HAL_Bool msbFirst, HAL_Bool sampleOnTrailing, + HAL_Bool clkIdleHigh) { std::lock_guard sync(spiGetMutex(port)); - spilib_setopts(HAL_GetSPIHandle(port), msb_first, sample_on_trailing, - clk_idle_high); + spilib_setopts(HAL_GetSPIHandle(port), msbFirst, sampleOnTrailing, + clkIdleHigh); } /**