ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #618: Use dynamic min/max values for io connections

Browse Source
This commit is contained in:
jenkins 2023-02-21 17:43:33 +01:00
commit 8cb4a264e9
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libnymea-core/integrations/thingmanagerimplementation.cpp
View File

@ -1892,12 +1892,15 @@ void ThingManagerImplementation::syncIOConnection(Thing *thing, const StateTypeI
continue; continue;
} }
StateType inputStateType = inputThing->thingClass().getStateType(stateTypeId); StateType inputStateType = inputThing->thingClass().getStateType(stateTypeId);
State inputState = inputThing->state(stateTypeId);
StateType outputStateType = outputThing->thingClass().getStateType(ioConnection.outputStateTypeId()); StateType outputStateType = outputThing->thingClass().getStateType(ioConnection.outputStateTypeId());
if (outputStateType.id().isNull()) { if (outputStateType.id().isNull()) {
qCWarning(dcThingManager()) << "Could not find output state type for IO connection."; qCWarning(dcThingManager()) << "Could not find output state type for IO connection.";
continue; continue;
} }
State outputState = outputThing->state(ioConnection.outputStateTypeId());
QVariant outputValue; QVariant outputValue;
if (outputStateType.ioType() == Types::IOTypeDigitalOutput) { if (outputStateType.ioType() == Types::IOTypeDigitalOutput) {
// Digital IOs are mapped as-is // Digital IOs are mapped as-is
@ -1909,7 +1912,7 @@ void ThingManagerImplementation::syncIOConnection(Thing *thing, const StateTypeI
} }
} else { } else {
// Analog IOs are mapped within the according min/max ranges // Analog IOs are mapped within the according min/max ranges
outputValue = mapValue(inputValue, inputStateType, outputStateType, ioConnection.inverted()); outputValue = mapValue(inputValue, inputState, outputState, ioConnection.inverted());
// We're already in sync (fuzzy, good enough)! Skipping action. // We're already in sync (fuzzy, good enough)! Skipping action.
if (qFuzzyCompare(1.0 + outputThing->stateValue(outputStateType.id()).toDouble(), 1.0 + outputValue.toDouble())) { if (qFuzzyCompare(1.0 + outputThing->stateValue(outputStateType.id()).toDouble(), 1.0 + outputValue.toDouble())) {
@ -1929,7 +1932,7 @@ void ThingManagerImplementation::syncIOConnection(Thing *thing, const StateTypeI
if (inputStateType.ioType() == Types::IOTypeDigitalInput) { if (inputStateType.ioType() == Types::IOTypeDigitalInput) {
inputThing->setStateValue(inputStateType.id(), outputThing->stateValue(outputStateType.id())); inputThing->setStateValue(inputStateType.id(), outputThing->stateValue(outputStateType.id()));
} else { } else {
inputThing->setStateValue(inputStateType.id(), mapValue(outputThing->stateValue(outputStateType.id()), outputStateType, inputStateType, ioConnection.inverted())); inputThing->setStateValue(inputStateType.id(), mapValue(outputThing->stateValue(outputStateType.id()), outputState, inputState, ioConnection.inverted()));
} }
} }
}); });
@ -1951,12 +1954,14 @@ void ThingManagerImplementation::syncIOConnection(Thing *thing, const StateTypeI
continue; continue;
} }
StateType outputStateType = outputThing->thingClass().getStateType(stateTypeId); StateType outputStateType = outputThing->thingClass().getStateType(stateTypeId);
State outputState = outputThing->state(stateTypeId);
StateType inputStateType = inputThing->thingClass().getStateType(ioConnection.inputStateTypeId()); StateType inputStateType = inputThing->thingClass().getStateType(ioConnection.inputStateTypeId());
if (inputStateType.id().isNull()) { if (inputStateType.id().isNull()) {
qCWarning(dcThingManager()) << "Could not find input state type for IO connection."; qCWarning(dcThingManager()) << "Could not find input state type for IO connection.";
continue; continue;
} }
State inputState = inputThing->state(ioConnection.inputStateTypeId());
if (!inputStateType.writable()) { if (!inputStateType.writable()) {
qCDebug(dcThingManager()) << "Input state is not writable. This connection is unidirectional."; qCDebug(dcThingManager()) << "Input state is not writable. This connection is unidirectional.";
@ -1974,7 +1979,7 @@ void ThingManagerImplementation::syncIOConnection(Thing *thing, const StateTypeI
} }
} else { } else {
// Analog IOs are mapped within the according min/max ranges // Analog IOs are mapped within the according min/max ranges
inputValue = mapValue(outputValue, outputStateType, inputStateType, ioConnection.inverted()); inputValue = mapValue(outputValue, outputState, inputState, ioConnection.inverted());
// Prevent looping even if the above calculation has rounding errors... Just skip this action if we're close enough already // Prevent looping even if the above calculation has rounding errors... Just skip this action if we're close enough already
if (qFuzzyCompare(1.0 + inputThing->stateValue(inputStateType.id()).toDouble(), 1.0 + inputValue.toDouble())) { if (qFuzzyCompare(1.0 + inputThing->stateValue(inputStateType.id()).toDouble(), 1.0 + inputValue.toDouble())) {
@ -2224,12 +2229,12 @@ void ThingManagerImplementation::loadIOConnections()
connectionSettings.endGroup(); connectionSettings.endGroup();
} }
QVariant ThingManagerImplementation::mapValue(const QVariant &value, const StateType &fromStateType, const StateType &toStateType, bool inverted) const QVariant ThingManagerImplementation::mapValue(const QVariant &value, const State &fromState, const State &toState, bool inverted) const
{ {
double fromMin = fromStateType.minValue().toDouble(); double fromMin = fromState.minValue().toDouble();
double fromMax = fromStateType.maxValue().toDouble(); double fromMax = fromState.maxValue().toDouble();
double toMin = toStateType.minValue().toDouble(); double toMin = toState.minValue().toDouble();
double toMax = toStateType.maxValue().toDouble(); double toMax = toState.maxValue().toDouble();
double fromValue = value.toDouble(); double fromValue = value.toDouble();
double fromPercent = (fromValue - fromMin) / (fromMax - fromMin); double fromPercent = (fromValue - fromMin) / (fromMax - fromMin);
fromPercent = inverted ? 1 - fromPercent : fromPercent; fromPercent = inverted ? 1 - fromPercent : fromPercent;

2
libnymea-core/integrations/thingmanagerimplementation.h
View File

@ -170,7 +170,7 @@ private:
void storeIOConnections(); void storeIOConnections();
void loadIOConnections(); void loadIOConnections();
void syncIOConnection(Thing *inputThing, const StateTypeId &stateTypeId); void syncIOConnection(Thing *inputThing, const StateTypeId &stateTypeId);
QVariant mapValue(const QVariant &value, const StateType &fromStateType, const StateType &toStateType, bool inverted) const; QVariant mapValue(const QVariant &value, const State &fromState, const State &toState, bool inverted) const;
IntegrationPlugin *createCppIntegrationPlugin(const QString &absoluteFilePath); IntegrationPlugin *createCppIntegrationPlugin(const QString &absoluteFilePath);