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

Extract USB commands as enums of the same type.

Browse Source
This commit is contained in:
László Monda
2017-07-23 00:49:50 +02:00
parent 0acb1c54ca
commit e0dcf81421
2 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
right/src/usb_protocol_handler.c
+12 -12
View File
@@ -53,39 +53,39 @@ void usbProtocolHandler()
bzero(GenericHidOutBuffer, USB_GENERIC_HID_OUT_BUFFER_LENGTH); bzero(GenericHidOutBuffer, USB_GENERIC_HID_OUT_BUFFER_LENGTH);
uint8_t command = GenericHidInBuffer[0]; uint8_t command = GenericHidInBuffer[0];
switch (command) { switch (command) {
case USB_COMMAND_GET_SYSTEM_PROPERTY: case UsbCommand_GetSystemProperty:
getSystemProperty(); getSystemProperty();
break; break;
case USB_COMMAND_REENUMERATE: case UsbCommand_Reenumerate:
reenumerate(); reenumerate();
break; break;
case USB_COMMAND_SET_TEST_LED: case UsbCommand_SetTestLed:
setTestLed(); setTestLed();
break; break;
case USB_COMMAND_WRITE_LED_DRIVER: case UsbCommand_WriteLedDriver:
break; break;
case USB_COMMAND_WRITE_EEPROM: case UsbCommand_WriteEeprom:
writeEeprom(); writeEeprom();
break; break;
case USB_COMMAND_READ_EEPROM: case UsbCommand_ReadEeprom:
readEeprom(); readEeprom();
break; break;
case USB_COMMAND_READ_MERGE_SENSOR: case UsbCommand_ReadMergeSensor:
readMergeSensor(); readMergeSensor();
break; break;
case USB_COMMAND_UPLOAD_CONFIG: case UsbCommand_UploadConfig:
uploadConfig(); uploadConfig();
break; break;
case USB_COMMAND_APPLY_CONFIG: case UsbCommand_ApplyConfig:
applyConfig(); applyConfig();
break; break;
case USB_COMMAND_SET_LED_PWM: case UsbCommand_SetLedPwm:
setLedPwm(); setLedPwm();
break; break;
case USB_COMMAND_GET_ADC_VALUE: case UsbCommand_GetAdcValue:
getAdcValue(); getAdcValue();
break; break;
case USB_COMMAND_LAUNCH_EEPROM_TRANSFER: case UsbCommand_LaunchEepromTransfer:
launchEepromTransfer(); launchEepromTransfer();
default: default:
break; break;
right/src/usb_protocol_handler.h
+25 -20
View File
@@ -10,26 +10,31 @@
#define PROTOCOL_RESPONSE_SUCCESS 0 #define PROTOCOL_RESPONSE_SUCCESS 0
#define PROTOCOL_RESPONSE_GENERIC_ERROR 1 #define PROTOCOL_RESPONSE_GENERIC_ERROR 1
#define USB_COMMAND_GET_SYSTEM_PROPERTY 0 #define SYSTEM_PROPERTY_USB_PROTOCOL_VERSION_ID 0
#define SYSTEM_PROPERTY_USB_PROTOCOL_VERSION_ID 0 #define SYSTEM_PROPERTY_BRIDGE_PROTOCOL_VERSION_ID 1
#define SYSTEM_PROPERTY_BRIDGE_PROTOCOL_VERSION_ID 1 #define SYSTEM_PROPERTY_DATA_MODEL_VERSION_ID 2
#define SYSTEM_PROPERTY_DATA_MODEL_VERSION_ID 2 #define SYSTEM_PROPERTY_FIRMWARE_VERSION_ID 3
#define SYSTEM_PROPERTY_FIRMWARE_VERSION_ID 3 #define WRITE_LED_DRIVER_RESPONSE_INVALID_ADDRESS 1
#define USB_COMMAND_REENUMERATE 1 #define WRITE_LED_DRIVER_RESPONSE_INVALID_PAYLOAD_SIZE 2
#define USB_COMMAND_SET_TEST_LED 2 #define WRITE_EEPROM_RESPONSE_INVALID_PAYLOAD_SIZE 1
#define USB_COMMAND_WRITE_LED_DRIVER 3 #define UPLOAD_CONFIG_INVALID_PAYLOAD_SIZE 1
#define WRITE_LED_DRIVER_RESPONSE_INVALID_ADDRESS 1
#define WRITE_LED_DRIVER_RESPONSE_INVALID_PAYLOAD_SIZE 2 // Typedefs:
#define USB_COMMAND_WRITE_EEPROM 5
#define WRITE_EEPROM_RESPONSE_INVALID_PAYLOAD_SIZE 1 typedef enum {
#define USB_COMMAND_READ_EEPROM 6 UsbCommand_GetSystemProperty = 0,
#define USB_COMMAND_READ_MERGE_SENSOR 7 UsbCommand_Reenumerate = 1,
#define USB_COMMAND_UPLOAD_CONFIG 8 UsbCommand_SetTestLed = 2,
#define UPLOAD_CONFIG_INVALID_PAYLOAD_SIZE 1 UsbCommand_WriteLedDriver = 3,
#define USB_COMMAND_APPLY_CONFIG 9 UsbCommand_WriteEeprom = 5,
#define USB_COMMAND_SET_LED_PWM 10 UsbCommand_ReadEeprom = 6,
#define USB_COMMAND_GET_ADC_VALUE 11 UsbCommand_ReadMergeSensor = 7,
#define USB_COMMAND_LAUNCH_EEPROM_TRANSFER 12 UsbCommand_UploadConfig = 8,
UsbCommand_ApplyConfig = 9,
UsbCommand_SetLedPwm = 10,
UsbCommand_GetAdcValue = 11,
UsbCommand_LaunchEepromTransfer = 12,
} usb_command_t;
// Functions: // Functions: