uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix hard faults by moving slaveConfig and slaveHandle out of InitI2c(), thereby making them always available for KSDK. Fixed by @santiagogf89.

Browse Source
This commit is contained in:
László Monda
2017-10-03 19:15:33 +02:00
parent 90bad68287
commit 7061345ec2
2 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
left/src/i2c_watchdog.c
+1 -1
View File
@@ -28,7 +28,7 @@ void I2C_WATCHDOG_LPTMR_HANDLER(void)
// NVIC_SystemReset(); // NVIC_SystemReset();
I2cWatchdog_InnerCounter++; I2cWatchdog_InnerCounter++;
I2C_SlaveDeinit(I2C_BUS_BASEADDR); I2C_SlaveDeinit(I2C_BUS_BASEADDR);
InitI2cV2(); InitI2c();
} }
prevWatchdogCounter = I2C_Watchdog; prevWatchdogCounter = I2C_Watchdog;
left/src/init_peripherals.c
+3 -26
View File
@@ -10,6 +10,9 @@
#include "slave_protocol_handler.h" #include "slave_protocol_handler.h"
#include "i2c_watchdog.h" #include "i2c_watchdog.h"
i2c_slave_config_t slaveConfig;
i2c_slave_handle_t slaveHandle;
uint8_t byteIn; uint8_t byteIn;
uint8_t rxMessagePos; uint8_t rxMessagePos;
i2c_slave_transfer_event_t prevEvent; i2c_slave_transfer_event_t prevEvent;
@@ -65,32 +68,6 @@ void InitI2c(void) {
PORT_SetPinConfig(I2C_BUS_SDA_PORT, I2C_BUS_SDA_PIN, &pinConfig); PORT_SetPinConfig(I2C_BUS_SDA_PORT, I2C_BUS_SDA_PIN, &pinConfig);
PORT_SetPinConfig(I2C_BUS_SCL_PORT, I2C_BUS_SCL_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 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); I2C_SlaveGetDefaultConfig(&slaveConfig);
slaveConfig.slaveAddress = I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE; slaveConfig.slaveAddress = I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE;
I2C_SlaveInit(I2C_BUS_BASEADDR, &slaveConfig); I2C_SlaveInit(I2C_BUS_BASEADDR, &slaveConfig);