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

Expose the currently attached module ids via getKeyboardState()

Browse Source
This commit is contained in:
László Monda
2017-10-05 20:53:15 +02:00
parent 8c067b9190
commit fd7f2c3b25
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
right/src/slave_drivers/uhk_module_driver.c
+1 -2
View File
@@ -151,7 +151,6 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId)
bool isMessageValid = CRC16_IsMessageValid(rxMessage); bool isMessageValid = CRC16_IsMessageValid(rxMessage);
if (isMessageValid) { if (isMessageValid) {
memcpy(&uhkModuleState->features, rxMessage->data, sizeof(uhk_module_features_t)); memcpy(&uhkModuleState->features, rxMessage->data, sizeof(uhk_module_features_t));
uhkModuleState->isEnumerated = true;
} }
status = kStatus_Uhk_NoTransfer; status = kStatus_Uhk_NoTransfer;
*uhkModulePhase = isMessageValid ? UhkModulePhase_RequestKeyStates : UhkModulePhase_RequestModuleFeatures; *uhkModulePhase = isMessageValid ? UhkModulePhase_RequestKeyStates : UhkModulePhase_RequestModuleFeatures;
@@ -215,5 +214,5 @@ void UhkModuleSlaveDriver_Disconnect(uint8_t uhkModuleDriverId)
if (uhkModuleDriverId == SlaveId_LeftKeyboardHalf) { if (uhkModuleDriverId == SlaveId_LeftKeyboardHalf) {
Slaves[SlaveId_LeftLedDriver].isConnected = false; Slaves[SlaveId_LeftLedDriver].isConnected = false;
} }
UhkModuleStates[uhkModuleDriverId].isEnumerated = false; UhkModuleStates[uhkModuleDriverId].moduleId = 0;
} }
right/src/slave_drivers/uhk_module_driver.h
-1
View File
@@ -67,7 +67,6 @@
uint8_t firmwareI2cAddress; uint8_t firmwareI2cAddress;
uint8_t bootloaderI2cAddress; uint8_t bootloaderI2cAddress;
uhk_module_features_t features; uhk_module_features_t features;
bool isEnumerated;
} uhk_module_state_t; } uhk_module_state_t;
typedef struct { typedef struct {
right/src/usb_protocol_handler.c
+3
View File
@@ -224,6 +224,9 @@ void getKeyboardState(void)
{ {
GenericHidOutBuffer[1] = IsEepromBusy; GenericHidOutBuffer[1] = IsEepromBusy;
GenericHidOutBuffer[2] = MERGE_SENSOR_IS_MERGED; 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)