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

UpperCamelCase rxMessage and txMessage because they're extern variables.

Browse Source
This commit is contained in:
László Monda
2017-09-28 03:38:44 +02:00
parent 8d57968575
commit 9309c1e954
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
left/src/init_peripherals.c
View File

@@ -18,20 +18,20 @@ static void i2cSlaveCallback(I2C_Type *base, i2c_slave_transfer_t *xfer, void *u
{ {
if (prevEvent != kI2C_SlaveReceiveEvent && xfer->event == kI2C_SlaveReceiveEvent) { if (prevEvent != kI2C_SlaveReceiveEvent && xfer->event == kI2C_SlaveReceiveEvent) {
rxMessagePos = 0; rxMessagePos = 0;
memset(&rxMessage, 0, I2C_BUFFER_MAX_LENGTH); memset(&RxMessage, 0, I2C_BUFFER_MAX_LENGTH);
} else if (prevEvent == kI2C_SlaveReceiveEvent && xfer->event == kI2C_SlaveCompletionEvent) { } else if (prevEvent == kI2C_SlaveReceiveEvent && xfer->event == kI2C_SlaveCompletionEvent) {
((uint8_t*)&rxMessage)[rxMessagePos] = byteIn; ((uint8_t*)&RxMessage)[rxMessagePos] = byteIn;
rxMessage.length = rxMessagePos-3; RxMessage.length = rxMessagePos-3;
SlaveRxHandler(); SlaveRxHandler();
} else if (prevEvent == kI2C_SlaveReceiveEvent && xfer->event == kI2C_SlaveReceiveEvent) { } else if (prevEvent == kI2C_SlaveReceiveEvent && xfer->event == kI2C_SlaveReceiveEvent) {
((uint8_t*)&rxMessage)[rxMessagePos++] = byteIn; ((uint8_t*)&RxMessage)[rxMessagePos++] = byteIn;
} }
switch (xfer->event) { switch (xfer->event) {
case kI2C_SlaveTransmitEvent: case kI2C_SlaveTransmitEvent:
SlaveTxHandler(); SlaveTxHandler();
xfer->data = (uint8_t*)&txMessage; xfer->data = (uint8_t*)&TxMessage;
xfer->dataSize = txMessage.length+3; xfer->dataSize = TxMessage.length+3;
break; break;
case kI2C_SlaveReceiveEvent: case kI2C_SlaveReceiveEvent:
xfer->data = (uint8_t*)&byteIn; xfer->data = (uint8_t*)&byteIn;

26
left/src/slave_protocol_handler.c
View File

@@ -10,15 +10,15 @@
#include "bool_array_converter.h" #include "bool_array_converter.h"
#include "bootloader.h" #include "bootloader.h"
i2c_message_t rxMessage; i2c_message_t RxMessage;
i2c_message_t txMessage; i2c_message_t TxMessage;
void SetError(uint8_t error); void SetError(uint8_t error);
void SetGenericError(void); void SetGenericError(void);
void SetResponseByte(uint8_t response); void SetResponseByte(uint8_t response);
void SetError(uint8_t error) { void SetError(uint8_t error) {
txMessage.data[0] = error; TxMessage.data[0] = error;
} }
void SetGenericError(void) void SetGenericError(void)
@@ -29,21 +29,21 @@ void SetGenericError(void)
// Set a single byte as the response. // Set a single byte as the response.
void SetResponseByte(uint8_t response) void SetResponseByte(uint8_t response)
{ {
txMessage.data[1] = response; TxMessage.data[1] = response;
} }
void SlaveRxHandler(void) void SlaveRxHandler(void)
{ {
uint8_t commandId = rxMessage.data[0]; uint8_t commandId = RxMessage.data[0];
switch (commandId) { switch (commandId) {
case SlaveCommand_SetTestLed: case SlaveCommand_SetTestLed:
txMessage.length = 0; TxMessage.length = 0;
bool isLedOn = rxMessage.data[1]; bool isLedOn = RxMessage.data[1];
TEST_LED_SET(isLedOn); TEST_LED_SET(isLedOn);
break; break;
case SlaveCommand_SetLedPwmBrightness: case SlaveCommand_SetLedPwmBrightness:
txMessage.length = 0; TxMessage.length = 0;
uint8_t brightnessPercent = rxMessage.data[1]; uint8_t brightnessPercent = RxMessage.data[1];
LedPwm_SetBrightness(brightnessPercent); LedPwm_SetBrightness(brightnessPercent);
break; break;
case SlaveCommand_JumpToBootloader: case SlaveCommand_JumpToBootloader:
@@ -54,12 +54,12 @@ void SlaveRxHandler(void)
void SlaveTxHandler(void) void SlaveTxHandler(void)
{ {
uint8_t commandId = rxMessage.data[0]; uint8_t commandId = RxMessage.data[0];
switch (commandId) { switch (commandId) {
case SlaveCommand_RequestKeyStates: case SlaveCommand_RequestKeyStates:
BoolBytesToBits(keyMatrix.keyStates, txMessage.data, LEFT_KEYBOARD_HALF_KEY_COUNT); BoolBytesToBits(keyMatrix.keyStates, TxMessage.data, LEFT_KEYBOARD_HALF_KEY_COUNT);
txMessage.length = KEY_STATE_SIZE; TxMessage.length = KEY_STATE_SIZE;
CRC16_UpdateMessageChecksum(&txMessage); CRC16_UpdateMessageChecksum(&TxMessage);
break; break;
} }
} }

4
left/src/slave_protocol_handler.h
View File

@@ -17,8 +17,8 @@
// Variables: // Variables:
extern i2c_message_t rxMessage; extern i2c_message_t RxMessage;
extern i2c_message_t txMessage; extern i2c_message_t TxMessage;
// Functions: // Functions: