diff --git a/right/src/usb_commands/usb_command_get_keyboard_state.c b/right/src/usb_commands/usb_command_get_keyboard_state.c
new file mode 100644
index 0000000..1eaafcd
--- /dev/null
+++ b/right/src/usb_commands/usb_command_get_keyboard_state.c
@@ -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;
+}
diff --git a/right/src/usb_commands/usb_command_get_keyboard_state.h b/right/src/usb_commands/usb_command_get_keyboard_state.h
new file mode 100644
index 0000000..7669151
--- /dev/null
+++ b/right/src/usb_commands/usb_command_get_keyboard_state.h
@@ -0,0 +1,8 @@
+#ifndef __USB_COMMAND_GET_KEYBOARD_STATE_H__
+#define __USB_COMMAND_GET_KEYBOARD_STATE_H__
+
+// Functions:
+
+    void UsbCommand_GetKeyboardState(void);
+
+#endif
diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c
index 5835bd6..03fc999 100644
--- a/right/src/usb_protocol_handler.c
+++ b/right/src/usb_protocol_handler.c
@@ -22,6 +22,7 @@
 #include "usb_commands/usb_command_jump_to_slave_bootloader.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_get_keyboard_state.h"
 
 uint8_t UsbDebugInfo[USB_GENERIC_HID_OUT_BUFFER_LENGTH];
 
@@ -77,15 +78,6 @@ void getAdcValue(void)
     *(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)
 {
     *(uint32_t*)(UsbDebugInfo+1) = I2C_Watchdog;
@@ -148,7 +140,7 @@ void UsbProtocolHandler(void)
             UsbCommand_ReadConfig(false);
             break;
         case UsbCommandId_GetKeyboardState:
-            getKeyboardState();
+            UsbCommand_GetKeyboardState();
             break;
         case UsbCommandId_GetDebugInfo:
             getDebugInfo();