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

Make reading and writing the hardware and user configuration possible via USB. Remove readEeprom() and writeEeprom(). Use enums instead of macros.

Browse Source
This commit is contained in:
László Monda
2017-07-23 17:37:25 +02:00
parent 3d98a66b64
commit d73a5e7880
2 changed files with 73 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
right/src/usb_protocol_handler.c
View File

@@ -68,51 +68,11 @@ void setTestLed(void)
UhkModuleStates[0].isTestLedOn = ledState; UhkModuleStates[0].isTestLedOn = ledState;
} }
void writeEeprom(void)
{
uint8_t i2cPayloadSize = GenericHidInBuffer[1];
if (i2cPayloadSize > USB_GENERIC_HID_OUT_BUFFER_LENGTH-2) {
setError(WRITE_EEPROM_RESPONSE_INVALID_PAYLOAD_SIZE);
return;
}
// I2cWrite(I2C_EEPROM_BUS_BASEADDR, I2C_ADDRESS_EEPROM, GenericHidInBuffer+2, i2cPayloadSize);
}
void readEeprom(void)
{
uint8_t i2cPayloadSize = GenericHidInBuffer[1];
if (i2cPayloadSize > USB_GENERIC_HID_OUT_BUFFER_LENGTH-1) {
setError(WRITE_EEPROM_RESPONSE_INVALID_PAYLOAD_SIZE);
return;
}
// I2cWrite(I2C_EEPROM_BUS_BASEADDR, I2C_ADDRESS_EEPROM, GenericHidInBuffer+2, 2);
// I2cRead(I2C_EEPROM_BUS_BASEADDR, I2C_ADDRESS_EEPROM, GenericHidOutBuffer+1, i2cPayloadSize);
GenericHidOutBuffer[0] = UsbResponse_Success;
}
void readMergeSensor(void) void readMergeSensor(void)
{ {
SetResponseByte(MERGE_SENSOR_IS_MERGED); SetResponseByte(MERGE_SENSOR_IS_MERGED);
} }
void uploadConfig(void)
{
uint8_t byteCount = GenericHidInBuffer[1];
uint16_t memoryOffset = *((uint16_t*)(GenericHidInBuffer+2));
if (byteCount > USB_GENERIC_HID_OUT_BUFFER_LENGTH-4) {
setError(UPLOAD_CONFIG_INVALID_PAYLOAD_SIZE);
return;
}
memcpy(UserConfigBuffer.buffer+memoryOffset, GenericHidInBuffer+4, byteCount);
}
void applyConfig(void) void applyConfig(void)
{ {
UserConfigBuffer.offset = 0; UserConfigBuffer.offset = 0;
@@ -143,6 +103,48 @@ void launchEepromTransfer(void)
EEPROM_LaunchTransfer(transferType); EEPROM_LaunchTransfer(transferType);
} }
void readConfiguration(bool isHardware)
{
uint8_t length = GenericHidInBuffer[1];
uint16_t offset = *((uint16_t*)GenericHidInBuffer+2);
if (length > USB_GENERIC_HID_OUT_BUFFER_LENGTH-1) {
setError(ConfigTransferResponse_LengthTooLarge);
return;
}
uint8_t *buffer = isHardware ? HardwareConfigBuffer.buffer : UserConfigBuffer.buffer;
uint16_t bufferLength = isHardware ? HARDWARE_CONFIG_SIZE : USER_CONFIG_SIZE;
if (offset + length > bufferLength) {
setError(ConfigTransferResponse_BufferOutOfBounds);
return;
}
memcpy(GenericHidOutBuffer+1, buffer+offset, length);
}
void writeConfiguration(bool isHardware)
{
uint8_t length = GenericHidInBuffer[1];
uint16_t offset = *((uint16_t*)(GenericHidInBuffer+1+1));
if (length > USB_GENERIC_HID_OUT_BUFFER_LENGTH-1-1-2) {
setError(ConfigTransferResponse_LengthTooLarge);
return;
}
uint8_t *buffer = isHardware ? HardwareConfigBuffer.buffer : UserConfigBuffer.buffer;
uint16_t bufferLength = isHardware ? HARDWARE_CONFIG_SIZE : USER_CONFIG_SIZE;
if (offset + length > bufferLength) {
setError(ConfigTransferResponse_BufferOutOfBounds);
return;
}
memcpy(buffer+offset, GenericHidInBuffer+1+1+2, length);
}
// The main protocol handler function // The main protocol handler function
void usbProtocolHandler(void) void usbProtocolHandler(void)
@@ -161,17 +163,12 @@ void usbProtocolHandler(void)
break; break;
case UsbCommand_WriteLedDriver: case UsbCommand_WriteLedDriver:
break; break;
case UsbCommand_WriteEeprom:
writeEeprom();
break;
case UsbCommand_ReadEeprom:
readEeprom();
break;
case UsbCommand_ReadMergeSensor: case UsbCommand_ReadMergeSensor:
readMergeSensor(); readMergeSensor();
break; break;
case UsbCommand_UploadConfig: case UsbCommand_WriteUserConfiguration:
uploadConfig(); writeConfiguration(false);
//uploadConfig();
break; break;
case UsbCommand_ApplyConfig: case UsbCommand_ApplyConfig:
applyConfig(); applyConfig();
@@ -185,6 +182,15 @@ void usbProtocolHandler(void)
case UsbCommand_LaunchEepromTransfer: case UsbCommand_LaunchEepromTransfer:
launchEepromTransfer(); launchEepromTransfer();
break; break;
case UsbCommand_ReadHardwareConfiguration:
readConfiguration(true);
break;
case UsbCommand_WriteHardwareConfiguration:
writeConfiguration(true);
break;
case UsbCommand_ReadUserConfiguration:
readConfiguration(false);
break;
default: default:
break; break;
} }

40
right/src/usb_protocol_handler.h
View File

@@ -3,31 +3,24 @@
// Includes: // Includes:
#include "usb_interfaces/usb_interface_generic_hid.h" #include "usb_interfaces/usb_interface_generic_hid.h"
// Macros:
#define WRITE_LED_DRIVER_RESPONSE_INVALID_ADDRESS 1
#define WRITE_LED_DRIVER_RESPONSE_INVALID_PAYLOAD_SIZE 2
#define WRITE_EEPROM_RESPONSE_INVALID_PAYLOAD_SIZE 1
#define UPLOAD_CONFIG_INVALID_PAYLOAD_SIZE 1
// Typedefs: // Typedefs:
typedef enum { typedef enum {
UsbCommand_GetSystemProperty = 0, UsbCommand_GetSystemProperty = 0,
UsbCommand_Reenumerate = 1, UsbCommand_Reenumerate = 1,
UsbCommand_SetTestLed = 2, UsbCommand_SetTestLed = 2,
UsbCommand_WriteLedDriver = 3, UsbCommand_WriteLedDriver = 3,
UsbCommand_WriteEeprom = 5, UsbCommand_ReadMergeSensor = 7,
UsbCommand_ReadEeprom = 6, UsbCommand_WriteUserConfiguration = 8,
UsbCommand_ReadMergeSensor = 7, UsbCommand_ApplyConfig = 9,
UsbCommand_UploadConfig = 8, UsbCommand_SetLedPwm = 10,
UsbCommand_ApplyConfig = 9, UsbCommand_GetAdcValue = 11,
UsbCommand_SetLedPwm = 10, UsbCommand_LaunchEepromTransfer = 12,
UsbCommand_GetAdcValue = 11, UsbCommand_ReadHardwareConfiguration = 13,
UsbCommand_LaunchEepromTransfer = 12, UsbCommand_WriteHardwareConfiguration = 14,
UsbCommand_ReadUserConfiguration = 15,
} usb_command_t; } usb_command_t;
typedef enum { typedef enum {
@@ -42,6 +35,11 @@
UsbResponse_GenericError = 1, UsbResponse_GenericError = 1,
} usb_response_t; } usb_response_t;
typedef enum {
ConfigTransferResponse_LengthTooLarge = 1,
ConfigTransferResponse_BufferOutOfBounds = 2,
} config_transfer_response_t;
// Functions: // Functions:
extern void usbProtocolHandler(); extern void usbProtocolHandler();