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

Add names to simulator components (#1268)

Browse Source 
Makes configuration easier when you can associate the items with a name
instead of just a port number. Important if there is a GUI added at some
point.
This commit is contained in:
PJ Reiniger
2018-08-23 20:59:09 -04:00
committed by Peter Johnson
parent 8d8f120cc3
commit de212a9dd0
30 changed files with 207 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXL345_I2CAccelerometerData.cpp
View File

@@ -40,6 +40,10 @@ ADXL345_I2CData::~ADXL345_I2CData() {
HALSIM_CancelI2CWriteCallback(m_port, m_writeCallbackId);
}
bool ADXL345_I2CData::GetInitialized() const {
return HALSIM_GetI2CInitialized(m_port);
}
void ADXL345_I2CData::ADXL345_I2CData::HandleWrite(const uint8_t* buffer,
uint32_t count) {
m_lastWriteAddress = buffer[0];

4
simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXL345_SpiAccelerometerData.cpp
View File

@@ -40,6 +40,10 @@ ADXL345_SpiAccelerometer::~ADXL345_SpiAccelerometer() {
HALSIM_CancelSPIWriteCallback(m_port, m_writeCallbackId);
}
bool ADXL345_SpiAccelerometer::GetInitialized() const {
return HALSIM_GetSPIInitialized(m_port);
}
void ADXL345_SpiAccelerometer::HandleWrite(const uint8_t* buffer,
uint32_t count) {
m_lastWriteAddress = buffer[0] & 0xF;

3
simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXL362_SpiAccelerometerData.cpp
View File

@@ -39,6 +39,9 @@ ADXL362_SpiAccelerometer::~ADXL362_SpiAccelerometer() {
HALSIM_CancelSPIReadCallback(m_port, m_readCallbackId);
HALSIM_CancelSPIWriteCallback(m_port, m_writeCallbackId);
}
bool ADXL362_SpiAccelerometer::GetInitialized() const {
return HALSIM_GetSPIInitialized(m_port);
}
void ADXL362_SpiAccelerometer::HandleWrite(const uint8_t* buffer,
uint32_t count) {

3
simulation/halsim_adx_gyro_accelerometer/src/main/native/cpp/ADXRS450_SpiGyroWrapperData.cpp
View File

@@ -57,6 +57,9 @@ ADXRS450_SpiGyroWrapper::~ADXRS450_SpiGyroWrapper() {
HALSIM_CancelSPIReadAutoReceivedDataCallback(m_port,
m_autoReceiveReadCallbackId);
}
bool ADXRS450_SpiGyroWrapper::GetInitialized() const {
return HALSIM_GetSPIInitialized(m_port);
}
void ADXRS450_SpiGyroWrapper::ResetData() {
std::lock_guard<wpi::mutex> lock(m_dataMutex);

2
simulation/halsim_adx_gyro_accelerometer/src/main/native/include/ADXL345_I2CAccelerometerData.h
View File

@@ -15,6 +15,8 @@ class ADXL345_I2CData : public ThreeAxisAccelerometerData {
explicit ADXL345_I2CData(int port);
virtual ~ADXL345_I2CData();
bool GetInitialized() const override;
void HandleWrite(const uint8_t* buffer, uint32_t count);
void HandleRead(uint8_t* buffer, uint32_t count);

2
simulation/halsim_adx_gyro_accelerometer/src/main/native/include/ADXL345_SpiAccelerometerData.h
View File

@@ -15,6 +15,8 @@ class ADXL345_SpiAccelerometer : public ThreeAxisAccelerometerData {
explicit ADXL345_SpiAccelerometer(int port);
virtual ~ADXL345_SpiAccelerometer();
bool GetInitialized() const override;
void HandleWrite(const uint8_t* buffer, uint32_t count);
void HandleRead(uint8_t* buffer, uint32_t count);

2
simulation/halsim_adx_gyro_accelerometer/src/main/native/include/ADXL362_SpiAccelerometerData.h
View File

@@ -15,6 +15,8 @@ class ADXL362_SpiAccelerometer : public ThreeAxisAccelerometerData {
explicit ADXL362_SpiAccelerometer(int port);
virtual ~ADXL362_SpiAccelerometer();
bool GetInitialized() const override;
void HandleWrite(const uint8_t* buffer, uint32_t count);
void HandleRead(uint8_t* buffer, uint32_t count);

2
simulation/halsim_adx_gyro_accelerometer/src/main/native/include/ADXRS450_SpiGyroWrapperData.h
View File

@@ -19,6 +19,8 @@ class ADXRS450_SpiGyroWrapper {
explicit ADXRS450_SpiGyroWrapper(int port);
virtual ~ADXRS450_SpiGyroWrapper();
bool GetInitialized() const;
void HandleRead(uint8_t* buffer, uint32_t count);
void HandleAutoReceiveData(uint8_t* buffer, int32_t numToRead,
int32_t& outputCount);

2
simulation/halsim_adx_gyro_accelerometer/src/main/native/include/ThreeAxisAccelerometerData.h
View File

@@ -19,6 +19,8 @@ class ThreeAxisAccelerometerData {
ThreeAxisAccelerometerData();
virtual ~ThreeAxisAccelerometerData();
virtual bool GetInitialized() const = 0;
int32_t RegisterXCallback(HAL_NotifyCallback callback, void* param,
HAL_Bool initialNotify);
void CancelXCallback(int32_t uid);