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

Add I2C_ADDRESS_MODULE_FIRMWARE.

Browse Source
This commit is contained in:
László Monda
2019-05-16 00:18:51 +02:00
parent e2e14ac73b
commit 16c5cac395
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
keycluster/src/init_peripherals.c
View File

@@ -10,6 +10,7 @@
#include "slave_protocol_handler.h" #include "slave_protocol_handler.h"
#include "i2c_watchdog.h" #include "i2c_watchdog.h"
#include "main.h" #include "main.h"
#include "module.h"
i2c_slave_config_t slaveConfig; i2c_slave_config_t slaveConfig;
i2c_slave_handle_t slaveHandle; i2c_slave_handle_t slaveHandle;
@@ -64,7 +65,7 @@ void initI2c(void)
PORT_SetPinConfig(I2C_BUS_SCL_PORT, I2C_BUS_SCL_PIN, &pinConfig); PORT_SetPinConfig(I2C_BUS_SCL_PORT, I2C_BUS_SCL_PIN, &pinConfig);
I2C_SlaveGetDefaultConfig(&slaveConfig); I2C_SlaveGetDefaultConfig(&slaveConfig);
slaveConfig.slaveAddress = I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE; slaveConfig.slaveAddress = I2C_ADDRESS_MODULE_FIRMWARE;
I2C_SlaveInit(I2C_BUS_BASEADDR, &slaveConfig); I2C_SlaveInit(I2C_BUS_BASEADDR, &slaveConfig);
I2C_SlaveTransferCreateHandle(I2C_BUS_BASEADDR, &slaveHandle, i2cSlaveCallback, &userData); I2C_SlaveTransferCreateHandle(I2C_BUS_BASEADDR, &slaveHandle, i2cSlaveCallback, &userData);
I2C_SlaveTransferNonBlocking(I2C_BUS_BASEADDR, &slaveHandle, kI2C_SlaveAddressMatchEvent); I2C_SlaveTransferNonBlocking(I2C_BUS_BASEADDR, &slaveHandle, kI2C_SlaveAddressMatchEvent);

1
keycluster/src/module.h
View File

@@ -3,6 +3,7 @@
// Macros: // Macros:
#define I2C_ADDRESS_MODULE_FIRMWARE I2C_ADDRESS_LEFT_MODULE_FIRMWARE
#define MODULE_PROTOCOL_VERSION 1 #define MODULE_PROTOCOL_VERSION 1
#define MODULE_ID ModuleId_KeyClusterLeft #define MODULE_ID ModuleId_KeyClusterLeft
#define MODULE_KEY_COUNT (KEYBOARD_MATRIX_ROWS_NUM * KEYBOARD_MATRIX_COLS_NUM) #define MODULE_KEY_COUNT (KEYBOARD_MATRIX_ROWS_NUM * KEYBOARD_MATRIX_COLS_NUM)

3
left/src/init_peripherals.c
View File

@@ -10,6 +10,7 @@
#include "slave_protocol_handler.h" #include "slave_protocol_handler.h"
#include "i2c_watchdog.h" #include "i2c_watchdog.h"
#include "main.h" #include "main.h"
#include "module.h"
i2c_slave_config_t slaveConfig; i2c_slave_config_t slaveConfig;
i2c_slave_handle_t slaveHandle; i2c_slave_handle_t slaveHandle;
@@ -64,7 +65,7 @@ void initI2c(void)
PORT_SetPinConfig(I2C_BUS_SCL_PORT, I2C_BUS_SCL_PIN, &pinConfig); PORT_SetPinConfig(I2C_BUS_SCL_PORT, I2C_BUS_SCL_PIN, &pinConfig);
I2C_SlaveGetDefaultConfig(&slaveConfig); I2C_SlaveGetDefaultConfig(&slaveConfig);
slaveConfig.slaveAddress = I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE; slaveConfig.slaveAddress = I2C_ADDRESS_MODULE_FIRMWARE;
I2C_SlaveInit(I2C_BUS_BASEADDR, &slaveConfig); I2C_SlaveInit(I2C_BUS_BASEADDR, &slaveConfig);
I2C_SlaveTransferCreateHandle(I2C_BUS_BASEADDR, &slaveHandle, i2cSlaveCallback, &userData); I2C_SlaveTransferCreateHandle(I2C_BUS_BASEADDR, &slaveHandle, i2cSlaveCallback, &userData);
I2C_SlaveTransferNonBlocking(I2C_BUS_BASEADDR, &slaveHandle, kI2C_SlaveAddressMatchEvent); I2C_SlaveTransferNonBlocking(I2C_BUS_BASEADDR, &slaveHandle, kI2C_SlaveAddressMatchEvent);

1
left/src/module.h
View File

@@ -3,6 +3,7 @@
// Macros: // Macros:
#define I2C_ADDRESS_MODULE_FIRMWARE I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE
#define MODULE_PROTOCOL_VERSION 1 #define MODULE_PROTOCOL_VERSION 1
#define MODULE_ID ModuleId_LeftKeyboardHalf #define MODULE_ID ModuleId_LeftKeyboardHalf
#define MODULE_KEY_COUNT (KEYBOARD_MATRIX_ROWS_NUM * KEYBOARD_MATRIX_COLS_NUM) #define MODULE_KEY_COUNT (KEYBOARD_MATRIX_ROWS_NUM * KEYBOARD_MATRIX_COLS_NUM)