Clone InitI2c() as InitI2cV2() and use it in the LPTMR interrupt handler to avoid the hard fault.
This commit is contained in:
@@ -21,13 +21,14 @@ void InitI2cWatchdog(void)
|
|||||||
|
|
||||||
void I2C_WATCHDOG_LPTMR_HANDLER(void)
|
void I2C_WATCHDOG_LPTMR_HANDLER(void)
|
||||||
{
|
{
|
||||||
I2cWatchdog_OuterCounter++;
|
|
||||||
TEST_LED_TOGGLE();
|
TEST_LED_TOGGLE();
|
||||||
|
I2cWatchdog_OuterCounter++;
|
||||||
|
|
||||||
if (I2C_Watchdog == prevWatchdogCounter && I2cWatchdog_OuterCounter>10) { // Restart I2C if there hasn't been any interrupt during 100 ms
|
if (I2C_Watchdog == prevWatchdogCounter) { // Restart I2C if there hasn't been any interrupt during 100 ms
|
||||||
|
// NVIC_SystemReset();
|
||||||
I2cWatchdog_InnerCounter++;
|
I2cWatchdog_InnerCounter++;
|
||||||
I2C_SlaveDeinit(I2C_BUS_BASEADDR);
|
I2C_SlaveDeinit(I2C_BUS_BASEADDR);
|
||||||
//InitI2c();
|
InitI2cV2();
|
||||||
}
|
}
|
||||||
|
|
||||||
prevWatchdogCounter = I2C_Watchdog;
|
prevWatchdogCounter = I2C_Watchdog;
|
||||||
|
|||||||
@@ -75,6 +75,29 @@ void InitI2c(void) {
|
|||||||
I2C_SlaveTransferNonBlocking(I2C_BUS_BASEADDR, &slaveHandle, kI2C_SlaveCompletionEvent);
|
I2C_SlaveTransferNonBlocking(I2C_BUS_BASEADDR, &slaveHandle, kI2C_SlaveCompletionEvent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void InitI2cV2(void) {
|
||||||
|
port_pin_config_t pinConfig = {
|
||||||
|
.pullSelect = kPORT_PullUp,
|
||||||
|
};
|
||||||
|
|
||||||
|
CLOCK_EnableClock(I2C_BUS_SDA_CLOCK);
|
||||||
|
CLOCK_EnableClock(I2C_BUS_SCL_CLOCK);
|
||||||
|
|
||||||
|
pinConfig.mux = I2C_BUS_MUX;
|
||||||
|
PORT_SetPinConfig(I2C_BUS_SDA_PORT, I2C_BUS_SDA_PIN, &pinConfig);
|
||||||
|
PORT_SetPinConfig(I2C_BUS_SCL_PORT, I2C_BUS_SCL_PIN, &pinConfig);
|
||||||
|
|
||||||
|
i2c_slave_config_t slaveConfig;
|
||||||
|
i2c_slave_handle_t slaveHandle;
|
||||||
|
|
||||||
|
I2C_SlaveGetDefaultConfig(&slaveConfig);
|
||||||
|
slaveConfig.slaveAddress = I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE;
|
||||||
|
I2C_SlaveInit(I2C_BUS_BASEADDR, &slaveConfig);
|
||||||
|
I2C_SlaveTransferCreateHandle(I2C_BUS_BASEADDR, &slaveHandle, i2cSlaveCallback, NULL);
|
||||||
|
slaveHandle.eventMask |= kI2C_SlaveCompletionEvent;
|
||||||
|
I2C_SlaveTransferNonBlocking(I2C_BUS_BASEADDR, &slaveHandle, kI2C_SlaveCompletionEvent);
|
||||||
|
}
|
||||||
|
|
||||||
void InitLedDriver(void) {
|
void InitLedDriver(void) {
|
||||||
CLOCK_EnableClock(LED_DRIVER_SDB_CLOCK);
|
CLOCK_EnableClock(LED_DRIVER_SDB_CLOCK);
|
||||||
PORT_SetPinMux(LED_DRIVER_SDB_PORT, LED_DRIVER_SDB_PIN, kPORT_MuxAsGpio);
|
PORT_SetPinMux(LED_DRIVER_SDB_PORT, LED_DRIVER_SDB_PIN, kPORT_MuxAsGpio);
|
||||||
@@ -89,5 +112,5 @@ void InitPeripherals(void)
|
|||||||
InitTestLed();
|
InitTestLed();
|
||||||
LedPwm_Init();
|
LedPwm_Init();
|
||||||
InitI2c();
|
InitI2c();
|
||||||
//InitI2cWatchdog();
|
InitI2cWatchdog();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,5 +12,6 @@
|
|||||||
|
|
||||||
void InitPeripherals(void);
|
void InitPeripherals(void);
|
||||||
void InitI2c(void);
|
void InitI2c(void);
|
||||||
|
void InitI2cV2(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user