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

Merge branch 'test-slow-i2c' into BLE

Browse Source
This commit is contained in:
Ben V. Brown
2022-11-20 20:38:31 +11:00
parent 36b60e250d 3e66648768
commit 28924ccfa6
4 changed files with 170 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/Core/BSP/Pinecilv2/Setup.cpp
View File

@@ -62,7 +62,11 @@ void hardware_init() {
setup_timer_scheduler();
setup_adc();
setup_pwm();
I2C_ClockSet(I2C0_ID, 100000); // Sets clock to around 175kHz
I2C_SetSclSync(I2C0_ID,1);
I2C_SetDeglitchCount(I2C0_ID,1); // Turn on de-glitch
//Note on I2C clock rate @ 100Khz the screen update == 20ms which is too long for USB-PD to work
//200kHz and above works
I2C_ClockSet(I2C0_ID, 300000); // Sets clock to around 25 kHz less than set here
TIMER_SetCompValue(TIMER_CH0, TIMER_COMP_ID_1, 0);
}
void setup_pwm(void) {

314
source/Core/BSP/Pinecilv2/bl_mcu_sdk/drivers/bl702_driver/std_drv/src/bl702_i2c.c
View File

@@ -89,14 +89,14 @@ intCallback_Type *i2cIntCbfArra[I2C_ID_MAX][I2C_INT_ALL] = {{NULL}};
* @{
*/
/****************************************************************************/ /**
* @brief I2C interrupt handler
*
* @param i2cNo: I2C ID type
*
* @return None
*
*******************************************************************************/
/**
* @brief I2C interrupt handler
*
* @param i2cNo: I2C ID type
*
* @return None
*
*******************************************************************************/
#ifndef BFLB_USE_HAL_DRIVER
static void I2C_IntHandler(I2C_ID_Type i2cNo) {
uint32_t tmpVal;
@@ -157,15 +157,15 @@ static void I2C_IntHandler(I2C_ID_Type i2cNo) {
* @{
*/
/****************************************************************************/ /**
* @brief I2C write word data
*
* @param i2cNo: I2C ID type
* @param data: Data word
*
* @return None
*
*******************************************************************************/
/**
* @brief I2C write word data
*
* @param i2cNo: I2C ID type
* @param data: Data word
*
* @return None
*
*******************************************************************************/
void I2C_SendWord(I2C_ID_Type i2cNo, uint32_t data) {
uint32_t I2Cx = I2C_BASE;
@@ -174,14 +174,14 @@ void I2C_SendWord(I2C_ID_Type i2cNo, uint32_t data) {
BL_WR_REG(I2Cx, I2C_FIFO_WDATA, data);
}
/****************************************************************************/ /**
* @brief I2C read word data
*
* @param i2cNo: I2C ID type
*
* @return word data
*
*******************************************************************************/
/**
* @brief I2C read word data
*
* @param i2cNo: I2C ID type
*
* @return word data
*
*******************************************************************************/
uint32_t I2C_RecieveWord(I2C_ID_Type i2cNo) {
uint32_t I2Cx = I2C_BASE;
@@ -190,14 +190,14 @@ uint32_t I2C_RecieveWord(I2C_ID_Type i2cNo) {
return BL_RD_REG(I2Cx, I2C_FIFO_RDATA);
}
/****************************************************************************/ /**
* @brief I2C enable
*
* @param i2cNo: I2C ID type
*
* @return None
*
*******************************************************************************/
/**
* @brief I2C enable
*
* @param i2cNo: I2C ID type
*
* @return None
*
*******************************************************************************/
void I2C_Enable(I2C_ID_Type i2cNo) {
uint32_t tmpVal;
uint32_t I2Cx = I2C_BASE;
@@ -210,14 +210,14 @@ void I2C_Enable(I2C_ID_Type i2cNo) {
BL_WR_REG(I2Cx, I2C_CONFIG, tmpVal);
}
/****************************************************************************/ /**
* @brief I2C disable
*
* @param i2cNo: I2C ID type
*
* @return None
*
*******************************************************************************/
/**
* @brief I2C disable
*
* @param i2cNo: I2C ID type
*
* @return None
*
*******************************************************************************/
void I2C_Disable(I2C_ID_Type i2cNo) {
uint32_t tmpVal;
uint32_t I2Cx = I2C_BASE;
@@ -243,14 +243,14 @@ void I2C_Disable(I2C_ID_Type i2cNo) {
BL_WR_REG(I2Cx, I2C_INT_STS, tmpVal);
}
/****************************************************************************/ /**
* @brief I2C set global reset function
*
* @param i2cNo: I2C ID type
*
* @return SUCCESS or ERROR
*
*******************************************************************************/
/**
* @brief I2C set global reset function
*
* @param i2cNo: I2C ID type
*
* @return SUCCESS or ERROR
*
*******************************************************************************/
BL_Err_Type I2C_Reset(I2C_ID_Type i2cNo) {
/* Check the parameters */
CHECK_PARAM(IS_I2C_ID_TYPE(i2cNo));
@@ -259,16 +259,16 @@ BL_Err_Type I2C_Reset(I2C_ID_Type i2cNo) {
return SUCCESS;
}
/****************************************************************************/ /**
* @brief I2C init function
*
* @param i2cNo: I2C ID type
* @param direct: I2C read or write direct
* @param cfg: I2C transfer config struct
*
* @return None
*
*******************************************************************************/
/**
* @brief I2C init function
*
* @param i2cNo: I2C ID type
* @param direct: I2C read or write direct
* @param cfg: I2C transfer config struct
*
* @return None
*
*******************************************************************************/
void I2C_Init(I2C_ID_Type i2cNo, I2C_Direction_Type direct, I2C_Transfer_Cfg *cfg) {
uint32_t tmpVal;
uint32_t I2Cx = I2C_BASE;
@@ -308,15 +308,15 @@ void I2C_Init(I2C_ID_Type i2cNo, I2C_Direction_Type direct, I2C_Transfer_Cfg *cf
#endif
}
/****************************************************************************/ /**
* @brief Set de-glitch function cycle count value
*
* @param i2cNo: I2C ID type
* @param cnt: De-glitch function cycle count
*
* @return SUCCESS
*
*******************************************************************************/
/**
* @brief Set de-glitch function cycle count value
*
* @param i2cNo: I2C ID type
* @param cnt: De-glitch function cycle count
*
* @return SUCCESS
*
*******************************************************************************/
BL_Err_Type I2C_SetDeglitchCount(I2C_ID_Type i2cNo, uint8_t cnt) {
uint32_t tmpVal;
uint32_t I2Cx = I2C_BASE;
@@ -343,15 +343,15 @@ BL_Err_Type I2C_SetDeglitchCount(I2C_ID_Type i2cNo, uint8_t cnt) {
return SUCCESS;
}
/****************************************************************************/ /**
* @brief Set i2c prd
*
* @param i2cNo: I2C ID type
* @param phase: I2C phase value
*
* @return None
*
*******************************************************************************/
/**
* @brief Set i2c prd
*
* @param i2cNo: I2C ID type
* @param phase: I2C phase value
*
* @return None
*
*******************************************************************************/
void I2C_SetPrd(I2C_ID_Type i2cNo, uint8_t phase) {
uint32_t tmpVal;
uint32_t I2Cx = I2C_BASE;
@@ -380,15 +380,15 @@ void I2C_SetPrd(I2C_ID_Type i2cNo, uint8_t phase) {
BL_WR_REG(I2Cx, I2C_PRD_DATA, tmpVal);
}
/****************************************************************************/ /**
* @brief I2C set scl output clock
*
* @param i2cNo: I2C ID type
* @param clk: Clock set
*
* @return None
*
*******************************************************************************/
/**
* @brief I2C set scl output clock
*
* @param i2cNo: I2C ID type
* @param clk: Clock set
*
* @return None
*
*******************************************************************************/
void I2C_ClockSet(I2C_ID_Type i2cNo, uint32_t clk) {
uint8_t bclkDiv = 0;
@@ -412,15 +412,15 @@ void I2C_ClockSet(I2C_ID_Type i2cNo, uint32_t clk) {
}
}
/****************************************************************************/ /**
* @brief I2C set scl sync
*
* @param i2cNo: I2C ID type
* @param enable: Enable or disable I2C scl sync
*
* @return None
*
*******************************************************************************/
/**
* @brief I2C set scl sync
*
* @param i2cNo: I2C ID type
* @param enable: Enable or disable I2C scl sync
*
* @return None
*
*******************************************************************************/
void I2C_SetSclSync(I2C_ID_Type i2cNo, uint8_t enable) {
uint32_t tmpVal;
uint32_t I2Cx = I2C_BASE;
@@ -439,14 +439,14 @@ void I2C_SetSclSync(I2C_ID_Type i2cNo, uint8_t enable) {
BL_WR_REG(I2Cx, I2C_CONFIG, tmpVal);
}
/****************************************************************************/ /**
* @brief Get i2c busy state
*
* @param i2cNo: I2C ID type
*
* @return RESET or SET
*
*******************************************************************************/
/**
* @brief Get i2c busy state
*
* @param i2cNo: I2C ID type
*
* @return RESET or SET
*
*******************************************************************************/
BL_Sts_Type I2C_IsBusy(I2C_ID_Type i2cNo) {
uint32_t tmpVal;
uint32_t I2Cx = I2C_BASE;
@@ -458,14 +458,14 @@ BL_Sts_Type I2C_IsBusy(I2C_ID_Type i2cNo) {
return ((BL_IS_REG_BIT_SET(tmpVal, I2C_STS_I2C_BUS_BUSY)) ? SET : RESET);
}
/****************************************************************************/ /**
* @brief Get i2c transfer end state
*
* @param i2cNo: I2C ID type
*
* @return RESET or SET
*
*******************************************************************************/
/**
* @brief Get i2c transfer end state
*
* @param i2cNo: I2C ID type
*
* @return RESET or SET
*
*******************************************************************************/
BL_Sts_Type I2C_TransferEndStatus(I2C_ID_Type i2cNo) {
uint32_t tmpVal;
uint32_t I2Cx = I2C_BASE;
@@ -477,15 +477,15 @@ BL_Sts_Type I2C_TransferEndStatus(I2C_ID_Type i2cNo) {
return ((BL_IS_REG_BIT_SET(tmpVal, I2C_END_INT)) ? SET : RESET);
}
/****************************************************************************/ /**
* @brief I2C master write block data
*
* @param i2cNo: I2C ID type
* @param cfg: I2C transfer config struct
*
* @return SUCCESS or ERROR
*
*******************************************************************************/
/**
* @brief I2C master write block data
*
* @param i2cNo: I2C ID type
* @param cfg: I2C transfer config struct
*
* @return SUCCESS or ERROR
*
*******************************************************************************/
BL_Err_Type I2C_MasterSendBlocking(I2C_ID_Type i2cNo, I2C_Transfer_Cfg *cfg) {
uint8_t i;
uint32_t timeOut = 0;
@@ -550,15 +550,15 @@ BL_Err_Type I2C_MasterSendBlocking(I2C_ID_Type i2cNo, I2C_Transfer_Cfg *cfg) {
return SUCCESS;
}
/****************************************************************************/ /**
* @brief I2C master read block data
*
* @param i2cNo: I2C ID type
* @param cfg: I2C transfer config struct
*
* @return SUCCESS or ERROR
*
*******************************************************************************/
/**
* @brief I2C master read block data
*
* @param i2cNo: I2C ID type
* @param cfg: I2C transfer config struct
*
* @return SUCCESS or ERROR
*
*******************************************************************************/
BL_Err_Type I2C_MasterReceiveBlocking(I2C_ID_Type i2cNo, I2C_Transfer_Cfg *cfg) {
uint8_t i = 0;
uint32_t timeOut = 0;
@@ -643,16 +643,16 @@ BL_Err_Type I2C_MasterReceiveBlocking(I2C_ID_Type i2cNo, I2C_Transfer_Cfg *cfg)
return SUCCESS;
}
/****************************************************************************/ /**
* @brief Mask/Unmask the I2C interrupt
*
* @param i2cNo: I2C ID type
* @param intType: Specifies the interrupt type
* @param intMask: Enable/Disable Specified interrupt type
*
* @return None
*
*******************************************************************************/
/**
* @brief Mask/Unmask the I2C interrupt
*
* @param i2cNo: I2C ID type
* @param intType: Specifies the interrupt type
* @param intMask: Enable/Disable Specified interrupt type
*
* @return None
*
*******************************************************************************/
void I2C_IntMask(I2C_ID_Type i2cNo, I2C_INT_Type intType, BL_Mask_Type intMask) {
uint32_t tmpVal;
uint32_t I2Cx = I2C_BASE;
@@ -783,16 +783,16 @@ void I2C_IntMask(I2C_ID_Type i2cNo, I2C_INT_Type intType, BL_Mask_Type intMask)
BL_WR_REG(I2Cx, I2C_INT_STS, tmpVal);
}
/****************************************************************************/ /**
* @brief Install I2C interrupt callback function
*
* @param i2cNo: I2C ID type
* @param intType: Specifies the interrupt type
* @param cbFun: Pointer to interrupt callback function. The type should be void (*fn)(void)
*
* @return None
*
*******************************************************************************/
/**
* @brief Install I2C interrupt callback function
*
* @param i2cNo: I2C ID type
* @param intType: Specifies the interrupt type
* @param cbFun: Pointer to interrupt callback function. The type should be void (*fn)(void)
*
* @return None
*
*******************************************************************************/
#ifndef BFLB_USE_HAL_DRIVER
void I2C_Int_Callback_Install(I2C_ID_Type i2cNo, I2C_INT_Type intType, intCallback_Type *cbFun) {
/* Check the parameters */
@@ -803,14 +803,14 @@ void I2C_Int_Callback_Install(I2C_ID_Type i2cNo, I2C_INT_Type intType, intCallba
}
#endif
/****************************************************************************/ /**
* @brief I2C IRQ handler
*
* @param None
*
* @return None
*
*******************************************************************************/
/**
* @brief I2C IRQ handler
*
* @param None
*
* @return None
*
*******************************************************************************/
#ifndef BFLB_USE_HAL_DRIVER
void I2C_IRQHandler(void) { I2C_IntHandler(I2C0_ID); }
#endif

6
source/Core/Drivers/OLED.cpp
View File

@@ -361,13 +361,17 @@ void OLED::setRotation(bool leftHanded) {
OLED_Setup_Array[9].val = 0xA0;
}
I2C_CLASS::writeRegistersBulk(DEVICEADDR_OLED, OLED_Setup_Array, sizeof(OLED_Setup_Array) / sizeof(OLED_Setup_Array[0]));
osDelay(TICKS_10MS);
inLeftHandedMode = leftHanded;
screenBuffer[5] = inLeftHandedMode ? 0 : 32; // display is shifted by 32 in left handed
// mode as driver ram is 128 wide
screenBuffer[7] = inLeftHandedMode ? 95 : 0x7F; // End address of the ram segment we are writing to (96 wide)
screenBuffer[9] = inLeftHandedMode ? 0xC8 : 0xC0;
//Force a screen refresh
const int len = FRAMEBUFFER_START + (OLED_WIDTH * 2);
I2C_CLASS::Transmit(DEVICEADDR_OLED, screenBuffer, len);
osDelay(TICKS_10MS);
}
void OLED::setBrightness(uint8_t contrast) {

5
source/Core/Threads/GUIThread.cpp
View File

@@ -1105,17 +1105,18 @@ void startGUITask(void const *argument) {
} else {
setStatusLED(LED_STANDBY);
}
// Preemptively turn the display on. Turn it off if and only if
// Turn it off if and only if
// the tip temperature is below 50 degrees C *and* motion sleep
// detection is enabled *and* there has been no activity (movement or
// button presses) in a while.
// This is zero cost really as state is only changed on display updates
OLED::setDisplayState(OLED::DisplayState::ON);
if ((tipTemp < 50) && getSettingValue(SettingsOptions::Sensitivity)
&& (((xTaskGetTickCount() - lastMovementTime) > MOVEMENT_INACTIVITY_TIME) && ((xTaskGetTickCount() - lastButtonTime) > BUTTON_INACTIVITY_TIME))) {
OLED::setDisplayState(OLED::DisplayState::OFF);
setStatusLED(LED_OFF);
}else {
OLED::setDisplayState(OLED::DisplayState::ON);
}
// Clear the lcd buffer
OLED::clearScreen();