Rename some files and identifiers that are related to USB commands.
This commit is contained in:
@@ -1,14 +1,14 @@
|
|||||||
#include "usb_protocol_handler.h"
|
#include "usb_protocol_handler.h"
|
||||||
#include "usb_commands/usb_command_jump_to_slave_bootloader.h"
|
#include "usb_commands/usb_command_jump_to_module_bootloader.h"
|
||||||
#include "slot.h"
|
#include "slot.h"
|
||||||
#include "slave_drivers/uhk_module_driver.h"
|
#include "slave_drivers/uhk_module_driver.h"
|
||||||
|
|
||||||
void UsbCommand_JumpToSlaveBootloader(void)
|
void UsbCommand_JumpToModuleBootloader(void)
|
||||||
{
|
{
|
||||||
uint8_t slotId = GetUsbRxBufferUint8(1);
|
uint8_t slotId = GetUsbRxBufferUint8(1);
|
||||||
|
|
||||||
if (!IS_VALID_SLAVE_SLOT(slotId)) {
|
if (!IS_VALID_SLAVE_SLOT(slotId)) {
|
||||||
SetUsbTxBufferUint8(0, UsbStatusCode_JumpToSlaveBootloader_InvalidSlaveSlotId);
|
SetUsbTxBufferUint8(0, UsbStatusCode_JumpToModuleBootloader_InvalidSlaveSlotId);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
#ifndef __USB_COMMAND_JUMP_TO_MODULE_BOOTLOADER_H__
|
||||||
|
#define __USB_COMMAND_JUMP_TO_MODULE_BOOTLOADER_H__
|
||||||
|
|
||||||
|
// Functions:
|
||||||
|
|
||||||
|
void UsbCommand_JumpToModuleBootloader(void);
|
||||||
|
|
||||||
|
// Typedefs:
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
UsbStatusCode_JumpToModuleBootloader_InvalidSlaveSlotId = 2,
|
||||||
|
} usb_status_code_jump_to_module_bootloader_t;
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
#ifndef __USB_COMMAND_JUMP_TO_SLAVE_BOOTLOADER_H__
|
|
||||||
#define __USB_COMMAND_JUMP_TO_SLAVE_BOOTLOADER_H__
|
|
||||||
|
|
||||||
// Functions:
|
|
||||||
|
|
||||||
void UsbCommand_JumpToSlaveBootloader(void);
|
|
||||||
|
|
||||||
// Typedefs:
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
UsbStatusCode_JumpToSlaveBootloader_InvalidSlaveSlotId = 2,
|
|
||||||
} usb_status_code_jump_to_slave_bootloader_t;
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
#ifndef __USB_COMMAND_SEND_KBOOT_COMMAND_H__
|
|
||||||
#define __USB_COMMAND_SEND_KBOOT_COMMAND_H__
|
|
||||||
|
|
||||||
// Functions:
|
|
||||||
|
|
||||||
void UsbCommand_SendKbootCommand(void);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
#include "usb_protocol_handler.h"
|
#include "usb_protocol_handler.h"
|
||||||
#include "usb_commands/usb_command_send_kboot_command.h"
|
#include "usb_commands/usb_command_send_kboot_command_to_module.h"
|
||||||
#include "slave_drivers/kboot_driver.h"
|
#include "slave_drivers/kboot_driver.h"
|
||||||
|
|
||||||
void UsbCommand_SendKbootCommand(void)
|
void UsbCommand_SendKbootCommandToModule(void)
|
||||||
{
|
{
|
||||||
KbootDriverState.phase = 0;
|
KbootDriverState.phase = 0;
|
||||||
KbootDriverState.i2cAddress = GetUsbRxBufferUint8(2);
|
KbootDriverState.i2cAddress = GetUsbRxBufferUint8(2);
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
#ifndef __USB_COMMAND_SEND_KBOOT_COMMAND_TO_MODULE_H__
|
||||||
|
#define __USB_COMMAND_SEND_KBOOT_COMMAND_TO_MODULE_H__
|
||||||
|
|
||||||
|
// Functions:
|
||||||
|
|
||||||
|
void UsbCommand_SendKbootCommandToModule(void);
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -11,8 +11,8 @@
|
|||||||
#include "usb_commands/usb_command_read_config.h"
|
#include "usb_commands/usb_command_read_config.h"
|
||||||
#include "usb_commands/usb_command_get_keyboard_state.h"
|
#include "usb_commands/usb_command_get_keyboard_state.h"
|
||||||
#include "usb_commands/usb_command_get_debug_buffer.h"
|
#include "usb_commands/usb_command_get_debug_buffer.h"
|
||||||
#include "usb_commands/usb_command_jump_to_slave_bootloader.h"
|
#include "usb_commands/usb_command_jump_to_module_bootloader.h"
|
||||||
#include "usb_commands/usb_command_send_kboot_command.h"
|
#include "usb_commands/usb_command_send_kboot_command_to_module.h"
|
||||||
|
|
||||||
void UsbProtocolHandler(void)
|
void UsbProtocolHandler(void)
|
||||||
{
|
{
|
||||||
@@ -55,14 +55,14 @@ void UsbProtocolHandler(void)
|
|||||||
case UsbCommandId_GetKeyboardState:
|
case UsbCommandId_GetKeyboardState:
|
||||||
UsbCommand_GetKeyboardState();
|
UsbCommand_GetKeyboardState();
|
||||||
break;
|
break;
|
||||||
case UsbCommandId_GetDebugInfo:
|
case UsbCommandId_GetDebugBuffer:
|
||||||
UsbCommand_GetDebugBuffer();
|
UsbCommand_GetDebugBuffer();
|
||||||
break;
|
break;
|
||||||
case UsbCommandId_JumpToModuleBootloader:
|
case UsbCommandId_JumpToModuleBootloader:
|
||||||
UsbCommand_JumpToSlaveBootloader();
|
UsbCommand_JumpToModuleBootloader();
|
||||||
break;
|
break;
|
||||||
case UsbCommandId_SendKbootCommandToModule:
|
case UsbCommandId_SendKbootCommandToModule:
|
||||||
UsbCommand_SendKbootCommand();
|
UsbCommand_SendKbootCommandToModule();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
SetUsbTxBufferUint8(0, UsbStatusCode_InvalidCommand);
|
SetUsbTxBufferUint8(0, UsbStatusCode_InvalidCommand);
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
UsbCommandId_WriteHardwareConfig = 14,
|
UsbCommandId_WriteHardwareConfig = 14,
|
||||||
UsbCommandId_ReadUserConfig = 15,
|
UsbCommandId_ReadUserConfig = 15,
|
||||||
UsbCommandId_GetKeyboardState = 16,
|
UsbCommandId_GetKeyboardState = 16,
|
||||||
UsbCommandId_GetDebugInfo = 17,
|
UsbCommandId_GetDebugBuffer = 17,
|
||||||
UsbCommandId_JumpToModuleBootloader = 18,
|
UsbCommandId_JumpToModuleBootloader = 18,
|
||||||
UsbCommandId_SendKbootCommandToModule = 19,
|
UsbCommandId_SendKbootCommandToModule = 19,
|
||||||
} usb_command_id_t;
|
} usb_command_id_t;
|
||||||
|
|||||||
Reference in New Issue
Block a user