doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Included variant ID in target pin descriptor

Browse Source
This commit is contained in:
Nav
2021-09-04 17:58:05 +01:00
parent 90a4f1ce29
commit 1bc881e9ae
9 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/TargetController/TargetController.cpp
View File

@@ -630,11 +630,11 @@ void TargetController::onSetPinStateEvent(const Events::SetTargetPinState& event
);
}
this->target->setPinState(event.variantId, event.pinDescriptor, event.pinState);
this->target->setPinState(event.pinDescriptor, event.pinState);
auto pinStatesUpdateEvent = std::make_shared<Events::TargetPinStatesRetrieved>();
pinStatesUpdateEvent->correlationId = event.id;
pinStatesUpdateEvent->variantId = event.variantId;
pinStatesUpdateEvent->variantId = event.pinDescriptor.variantId;
pinStatesUpdateEvent->pinSatesByNumber = {
{event.pinDescriptor.number, event.pinState}
};

5
src/TargetController/TargetControllerConsole.cpp
View File

@@ -123,11 +123,10 @@ Targets::TargetPinStateMappingType TargetControllerConsole::getPinStates(int var
return this->triggerTargetControllerEventAndWaitForResponse(requestEvent)->pinSatesByNumber;
}
void TargetControllerConsole::setPinState(int variantId, TargetPinDescriptor pinDescriptor, TargetPinState pinState) {
void TargetControllerConsole::setPinState(TargetPinDescriptor pinDescriptor, TargetPinState pinState) {
auto updateEvent = std::make_shared<SetTargetPinState>();
updateEvent->variantId = variantId;
updateEvent->pinDescriptor = std::move(pinDescriptor);
updateEvent->pinState = pinState;
this->eventManager.triggerEvent(updateEvent);
this->triggerTargetControllerEventAndWaitForResponse(updateEvent);
}

5
src/TargetController/TargetControllerConsole.hpp
View File

@@ -197,12 +197,11 @@ namespace Bloom
Targets::TargetPinStateMappingType getPinStates(int variantId);
/**
* Requests a pin state update on the target, for a specific pin.
* Updates the pin state on the target, for a specific pin.
*
* @param variantId
* @param pinDescriptor
* @param pinState
*/
void setPinState(int variantId, Targets::TargetPinDescriptor pinDescriptor, Targets::TargetPinState pinState);
void setPinState(Targets::TargetPinDescriptor pinDescriptor, Targets::TargetPinState pinState);
};
}