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

Rename variable in SPI class not compliant with style guide (#1330)

Browse Source 
Also rename some wpilibj SPI class variables to match wpilibc and
better communicate their intent.
This commit is contained in:
Tyler Veness
2018-09-23 18:26:02 -07:00
committed by Peter Johnson
parent 5c6b78ea2b
commit b505bbefd1
3 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wpilibc/src/main/native/cpp/SPI.cpp
View File

@@ -142,42 +142,42 @@ void SPI::SetClockRate(double hz) { HAL_SetSPISpeed(m_port, hz); }
void SPI::SetMSBFirst() {
m_msbFirst = true;
HAL_SetSPIOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clk_idle_high);
HAL_SetSPIOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clockIdleHigh);
}
void SPI::SetLSBFirst() {
m_msbFirst = false;
HAL_SetSPIOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clk_idle_high);
HAL_SetSPIOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clockIdleHigh);
}
void SPI::SetSampleDataOnLeadingEdge() {
m_sampleOnTrailing = false;
HAL_SetSPIOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clk_idle_high);
HAL_SetSPIOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clockIdleHigh);
}
void SPI::SetSampleDataOnTrailingEdge() {
m_sampleOnTrailing = true;
HAL_SetSPIOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clk_idle_high);
HAL_SetSPIOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clockIdleHigh);
}
void SPI::SetSampleDataOnFalling() {
m_sampleOnTrailing = true;
HAL_SetSPIOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clk_idle_high);
HAL_SetSPIOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clockIdleHigh);
}
void SPI::SetSampleDataOnRising() {
m_sampleOnTrailing = false;
HAL_SetSPIOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clk_idle_high);
HAL_SetSPIOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clockIdleHigh);
}
void SPI::SetClockActiveLow() {
m_clk_idle_high = true;
HAL_SetSPIOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clk_idle_high);
m_clockIdleHigh = true;
HAL_SetSPIOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clockIdleHigh);
}
void SPI::SetClockActiveHigh() {
m_clk_idle_high = false;
HAL_SetSPIOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clk_idle_high);
m_clockIdleHigh = false;
HAL_SetSPIOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clockIdleHigh);
}
void SPI::SetChipSelectActiveHigh() {

2
wpilibc/src/main/native/include/frc/SPI.h
View File

@@ -318,7 +318,7 @@ class SPI : public ErrorBase {
HAL_SPIPort m_port;
bool m_msbFirst = false; // Default little-endian
bool m_sampleOnTrailing = false; // Default data updated on falling edge
bool m_clk_idle_high = false; // Default clock active high
bool m_clockIdleHigh = false; // Default clock active high
private:
void Init();

38
wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java
View File

@@ -33,9 +33,9 @@ public class SPI implements AutoCloseable {
private static int devices;
private int m_port;
private int m_bitOrder;
private int m_clockPolarity;
private int m_dataOnTrailing;
private int m_msbFirst;
private int m_clockIdleHigh;
private int m_sampleOnTrailing;
/**
* Constructor.
@@ -81,8 +81,8 @@ public class SPI implements AutoCloseable {
* first.
*/
public final void setMSBFirst() {
m_bitOrder = 1;
SPIJNI.spiSetOpts(m_port, m_bitOrder, m_dataOnTrailing, m_clockPolarity);
m_msbFirst = 1;
SPIJNI.spiSetOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clockIdleHigh);
}
/**
@@ -90,8 +90,8 @@ public class SPI implements AutoCloseable {
* first.
*/
public final void setLSBFirst() {
m_bitOrder = 0;
SPIJNI.spiSetOpts(m_port, m_bitOrder, m_dataOnTrailing, m_clockPolarity);
m_msbFirst = 0;
SPIJNI.spiSetOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clockIdleHigh);
}
/**
@@ -99,8 +99,8 @@ public class SPI implements AutoCloseable {
* or clock idle high.
*/
public final void setClockActiveLow() {
m_clockPolarity = 1;
SPIJNI.spiSetOpts(m_port, m_bitOrder, m_dataOnTrailing, m_clockPolarity);
m_clockIdleHigh = 1;
SPIJNI.spiSetOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clockIdleHigh);
}
/**
@@ -108,8 +108,8 @@ public class SPI implements AutoCloseable {
* or clock idle low.
*/
public final void setClockActiveHigh() {
m_clockPolarity = 0;
SPIJNI.spiSetOpts(m_port, m_bitOrder, m_dataOnTrailing, m_clockPolarity);
m_clockIdleHigh = 0;
SPIJNI.spiSetOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clockIdleHigh);
}
/**
@@ -117,8 +117,8 @@ public class SPI implements AutoCloseable {
* edge.
*/
public final void setSampleDataOnLeadingEdge() {
m_dataOnTrailing = 0;
SPIJNI.spiSetOpts(m_port, m_bitOrder, m_dataOnTrailing, m_clockPolarity);
m_sampleOnTrailing = 0;
SPIJNI.spiSetOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clockIdleHigh);
}
/**
@@ -126,8 +126,8 @@ public class SPI implements AutoCloseable {
* edge.
*/
public final void setSampleDataOnTrailingEdge() {
m_dataOnTrailing = 1;
SPIJNI.spiSetOpts(m_port, m_bitOrder, m_dataOnTrailing, m_clockPolarity);
m_sampleOnTrailing = 1;
SPIJNI.spiSetOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clockIdleHigh);
}
/**
@@ -137,8 +137,8 @@ public class SPI implements AutoCloseable {
*/
@Deprecated
public final void setSampleDataOnFalling() {
m_dataOnTrailing = 1;
SPIJNI.spiSetOpts(m_port, m_bitOrder, m_dataOnTrailing, m_clockPolarity);
m_sampleOnTrailing = 1;
SPIJNI.spiSetOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clockIdleHigh);
}
/**
@@ -148,8 +148,8 @@ public class SPI implements AutoCloseable {
*/
@Deprecated
public final void setSampleDataOnRising() {
m_dataOnTrailing = 0;
SPIJNI.spiSetOpts(m_port, m_bitOrder, m_dataOnTrailing, m_clockPolarity);
m_sampleOnTrailing = 0;
SPIJNI.spiSetOpts(m_port, m_msbFirst, m_sampleOnTrailing, m_clockIdleHigh);
}