me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More FRToS I2C cleanup

Browse Source
This commit is contained in:
Ben V. Brown
2018-04-14 16:33:16 +10:00
parent 7c1937b412
commit 576575d7ba
4 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workspace/TS100/inc/FRToSI2C.hpp
View File

@@ -14,9 +14,7 @@ class FRToSI2C {
public:
FRToSI2C(I2C_HandleTypeDef* i2chandle);
void FRToSInit();
void MasterTxCpltCallback(); //Normal Tx Callback
void MemRxCpltCallback(); //Callback from memory read cycles
void MemTxCpltCallback(); //Callback from memory write cycles
void CpltCallback(); //Normal Tx Callback
void Mem_Read(uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize,
uint8_t *pData, uint16_t Size);
@@ -26,7 +24,6 @@ public:
void Transmit(uint16_t DevAddress, uint8_t *pData, uint16_t Size);
private:
bool RToSUP=false;
I2C_HandleTypeDef* i2c;
SemaphoreHandle_t I2CSemaphore;
};

13
workspace/TS100/inc/main.hpp
View File

@@ -26,10 +26,17 @@ enum ButtonState {
ButtonState getButtonState();
void waitForButtonPressOrTimeout(uint32_t timeout);
#ifdef __cplusplus
extern "C" {
extern "C" {
#endif
void HAL_ADCEx_InjectedConvCpltCallback(ADC_HandleTypeDef* hadc);
void HAL_ADCEx_InjectedConvCpltCallback(ADC_HandleTypeDef* hadc);
void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c);
void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c);
void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c);
void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c);
void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c);
void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c);
#ifdef __cplusplus
}
}
#endif
#endif /* __MAIN_H */