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

Convert ConfigBuffer to serialized_buffer_t

Browse Source
This commit is contained in:
Eric Tang
2017-07-09 10:23:51 -07:00
parent 7a9659f7c0
commit fa79957ab2
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
right/src/config/config_state.c
View File

@@ -1,6 +1,7 @@
#include "config_state.h" #include "config_state.h"
uint8_t ConfigBuffer[EEPROM_SIZE]; static uint8_t config[EEPROM_SIZE];
serialized_buffer_t ConfigBuffer = { config };
uint8_t readUInt8(serialized_buffer_t *buffer) { uint8_t readUInt8(serialized_buffer_t *buffer) {
return buffer->buffer[buffer->offset++]; return buffer->buffer[buffer->offset++];

4
right/src/config/config_state.h
View File

@@ -12,7 +12,7 @@
// Typedefs: // Typedefs:
typedef struct { typedef struct {
uint8_t *buffer; uint8_t *const buffer;
uint16_t offset; uint16_t offset;
} serialized_buffer_t; } serialized_buffer_t;
@@ -28,7 +28,7 @@
// Variables: // Variables:
extern uint8_t ConfigBuffer[EEPROM_SIZE]; extern serialized_buffer_t ConfigBuffer;
// Functions: // Functions:

11
right/src/usb_protocol_handler.c
View File

@@ -188,16 +188,15 @@ void uploadConfig()
return; return;
} }
memcpy(ConfigBuffer+memoryOffset, GenericHidInBuffer+4, byteCount); memcpy(ConfigBuffer.buffer+memoryOffset, GenericHidInBuffer+4, byteCount);
} }
void applyConfig() void applyConfig()
{ {
serialized_buffer_t buffer = { ConfigBuffer, 0 }; ConfigBuffer.offset = 0;
GenericHidOutBuffer[0] = ParseKeymap(&ConfigBuffer);
GenericHidOutBuffer[0] = ParseKeymap(&buffer); GenericHidOutBuffer[1] = ConfigBuffer.offset;
GenericHidOutBuffer[1] = buffer.offset; GenericHidOutBuffer[2] = ConfigBuffer.offset >> 8;
GenericHidOutBuffer[2] = buffer.offset >> 8;
} }
void setLedPwm() void setLedPwm()