Extract UsbCommand_GetKeyboardState() into its own file.

This commit is contained in:
László Monda
2017-11-04 10:30:37 +01:00
parent 4de340967c
commit 67e304a787
3 changed files with 25 additions and 10 deletions

View File

@@ -0,0 +1,15 @@
#include "fsl_common.h"
#include "usb_commands/usb_command_get_keyboard_state.h"
#include "usb_protocol_handler.h"
#include "eeprom.h"
#include "peripherals/merge_sensor.h"
#include "slave_drivers/uhk_module_driver.h"
void UsbCommand_GetKeyboardState(void)
{
GenericHidOutBuffer[1] = IsEepromBusy;
GenericHidOutBuffer[2] = MERGE_SENSOR_IS_MERGED;
GenericHidOutBuffer[3] = UhkModuleStates[UhkModuleDriverId_LeftKeyboardHalf].moduleId;
GenericHidOutBuffer[4] = UhkModuleStates[UhkModuleDriverId_LeftAddon].moduleId;
GenericHidOutBuffer[5] = UhkModuleStates[UhkModuleDriverId_RightAddon].moduleId;
}

View File

@@ -0,0 +1,8 @@
#ifndef __USB_COMMAND_GET_KEYBOARD_STATE_H__
#define __USB_COMMAND_GET_KEYBOARD_STATE_H__
// Functions:
void UsbCommand_GetKeyboardState(void);
#endif

View File

@@ -22,6 +22,7 @@
#include "usb_commands/usb_command_jump_to_slave_bootloader.h" #include "usb_commands/usb_command_jump_to_slave_bootloader.h"
#include "usb_commands/usb_command_send_kboot_command.h" #include "usb_commands/usb_command_send_kboot_command.h"
#include "usb_commands/usb_command_launch_eeprom_transfer_legacy.h" #include "usb_commands/usb_command_launch_eeprom_transfer_legacy.h"
#include "usb_commands/usb_command_get_keyboard_state.h"
uint8_t UsbDebugInfo[USB_GENERIC_HID_OUT_BUFFER_LENGTH]; uint8_t UsbDebugInfo[USB_GENERIC_HID_OUT_BUFFER_LENGTH];
@@ -77,15 +78,6 @@ void getAdcValue(void)
*(uint32_t*)(GenericHidOutBuffer+1) = ADC_Measure(); *(uint32_t*)(GenericHidOutBuffer+1) = ADC_Measure();
} }
void getKeyboardState(void)
{
GenericHidOutBuffer[1] = IsEepromBusy;
GenericHidOutBuffer[2] = MERGE_SENSOR_IS_MERGED;
GenericHidOutBuffer[3] = UhkModuleStates[UhkModuleDriverId_LeftKeyboardHalf].moduleId;
GenericHidOutBuffer[4] = UhkModuleStates[UhkModuleDriverId_LeftAddon].moduleId;
GenericHidOutBuffer[5] = UhkModuleStates[UhkModuleDriverId_RightAddon].moduleId;
}
void getDebugInfo(void) void getDebugInfo(void)
{ {
*(uint32_t*)(UsbDebugInfo+1) = I2C_Watchdog; *(uint32_t*)(UsbDebugInfo+1) = I2C_Watchdog;
@@ -148,7 +140,7 @@ void UsbProtocolHandler(void)
UsbCommand_ReadConfig(false); UsbCommand_ReadConfig(false);
break; break;
case UsbCommandId_GetKeyboardState: case UsbCommandId_GetKeyboardState:
getKeyboardState(); UsbCommand_GetKeyboardState();
break; break;
case UsbCommandId_GetDebugInfo: case UsbCommandId_GetDebugInfo:
getDebugInfo(); getDebugInfo();