Compare commits
No commits in common. "957ab589cb3ac16c60db386af396936853198968" and "d3bfa39aee3af49cedc1f2d960974988a9fc0e5e" have entirely different histories.
957ab589cb
...
d3bfa39aee
265
.clang-format
265
.clang-format
@ -1,265 +0,0 @@
|
||||
---
|
||||
Language: Cpp
|
||||
AccessModifierOffset: -4
|
||||
AlignAfterOpenBracket: Align
|
||||
AlignArrayOfStructures: None
|
||||
AlignConsecutiveAssignments:
|
||||
Enabled: false
|
||||
AcrossEmptyLines: false
|
||||
AcrossComments: false
|
||||
AlignCompound: false
|
||||
PadOperators: false
|
||||
AlignConsecutiveBitFields:
|
||||
Enabled: false
|
||||
AcrossEmptyLines: false
|
||||
AcrossComments: false
|
||||
AlignCompound: false
|
||||
PadOperators: false
|
||||
AlignConsecutiveDeclarations:
|
||||
Enabled: false
|
||||
AcrossEmptyLines: false
|
||||
AcrossComments: false
|
||||
AlignCompound: false
|
||||
PadOperators: false
|
||||
AlignConsecutiveMacros:
|
||||
Enabled: false
|
||||
AcrossEmptyLines: false
|
||||
AcrossComments: false
|
||||
AlignCompound: false
|
||||
PadOperators: false
|
||||
AlignConsecutiveShortCaseStatements:
|
||||
Enabled: false
|
||||
AcrossEmptyLines: false
|
||||
AcrossComments: false
|
||||
AlignCaseColons: false
|
||||
AlignEscapedNewlines: DontAlign
|
||||
AlignOperands: Align
|
||||
AlignTrailingComments:
|
||||
Kind: Always
|
||||
OverEmptyLines: 0
|
||||
AllowAllArgumentsOnNextLine: true
|
||||
AllowAllParametersOfDeclarationOnNextLine: true
|
||||
AllowShortBlocksOnASingleLine: Never
|
||||
AllowShortCaseLabelsOnASingleLine: false
|
||||
AllowShortEnumsOnASingleLine: false
|
||||
AllowShortFunctionsOnASingleLine: Inline
|
||||
AllowShortIfStatementsOnASingleLine: Never
|
||||
AllowShortLambdasOnASingleLine: All
|
||||
AllowShortLoopsOnASingleLine: false
|
||||
AlwaysBreakAfterDefinitionReturnType: None
|
||||
AlwaysBreakAfterReturnType: None
|
||||
AlwaysBreakBeforeMultilineStrings: false
|
||||
AlwaysBreakTemplateDeclarations: Yes
|
||||
AttributeMacros:
|
||||
- __capability
|
||||
BinPackArguments: false
|
||||
BinPackParameters: false
|
||||
BitFieldColonSpacing: Both
|
||||
BraceWrapping:
|
||||
AfterCaseLabel: false
|
||||
AfterClass: true
|
||||
AfterControlStatement: Never
|
||||
AfterEnum: false
|
||||
AfterExternBlock: false
|
||||
AfterFunction: true
|
||||
AfterNamespace: false
|
||||
AfterObjCDeclaration: false
|
||||
AfterStruct: true
|
||||
AfterUnion: false
|
||||
BeforeCatch: false
|
||||
BeforeElse: false
|
||||
BeforeLambdaBody: false
|
||||
BeforeWhile: false
|
||||
IndentBraces: false
|
||||
SplitEmptyFunction: false
|
||||
SplitEmptyRecord: false
|
||||
SplitEmptyNamespace: false
|
||||
BreakAfterAttributes: Never
|
||||
BreakAfterJavaFieldAnnotations: false
|
||||
BreakArrays: true
|
||||
BreakBeforeBinaryOperators: All
|
||||
BreakBeforeConceptDeclarations: Always
|
||||
BreakBeforeBraces: Custom
|
||||
BreakBeforeInlineASMColon: OnlyMultiline
|
||||
BreakBeforeTernaryOperators: true
|
||||
BreakConstructorInitializers: BeforeComma
|
||||
BreakInheritanceList: BeforeColon
|
||||
BreakStringLiterals: true
|
||||
ColumnLimit: 180
|
||||
CommentPragmas: '^ IWYU pragma:'
|
||||
CompactNamespaces: false
|
||||
ConstructorInitializerIndentWidth: 4
|
||||
ContinuationIndentWidth: 4
|
||||
Cpp11BracedListStyle: true
|
||||
DerivePointerAlignment: true
|
||||
DisableFormat: false
|
||||
EmptyLineAfterAccessModifier: Never
|
||||
EmptyLineBeforeAccessModifier: LogicalBlock
|
||||
ExperimentalAutoDetectBinPacking: false
|
||||
FixNamespaceComments: true
|
||||
ForEachMacros:
|
||||
- forever
|
||||
- foreach
|
||||
- Q_FOREACH
|
||||
- BOOST_FOREACH
|
||||
IfMacros:
|
||||
- KJ_IF_MAYBE
|
||||
IncludeBlocks: Preserve
|
||||
IncludeCategories:
|
||||
- Regex: '^<Q.*'
|
||||
Priority: 200
|
||||
SortPriority: 200
|
||||
CaseSensitive: true
|
||||
IncludeIsMainRegex: '(Test)?$'
|
||||
IncludeIsMainSourceRegex: ''
|
||||
IndentAccessModifiers: false
|
||||
IndentCaseBlocks: false
|
||||
IndentCaseLabels: false
|
||||
IndentExternBlock: AfterExternBlock
|
||||
IndentGotoLabels: true
|
||||
IndentPPDirectives: None
|
||||
IndentRequiresClause: true
|
||||
IndentWidth: 4
|
||||
IndentWrappedFunctionNames: false
|
||||
InsertBraces: false
|
||||
InsertNewlineAtEOF: false
|
||||
InsertTrailingCommas: None
|
||||
IntegerLiteralSeparator:
|
||||
Binary: 0
|
||||
BinaryMinDigits: 0
|
||||
Decimal: 0
|
||||
DecimalMinDigits: 0
|
||||
Hex: 0
|
||||
HexMinDigits: 0
|
||||
JavaScriptQuotes: Leave
|
||||
JavaScriptWrapImports: true
|
||||
KeepEmptyLinesAtTheStartOfBlocks: false
|
||||
KeepEmptyLinesAtEOF: false
|
||||
LambdaBodyIndentation: Signature
|
||||
LineEnding: DeriveLF
|
||||
MacroBlockBegin: ''
|
||||
MacroBlockEnd: ''
|
||||
MaxEmptyLinesToKeep: 1
|
||||
NamespaceIndentation: None
|
||||
ObjCBinPackProtocolList: Auto
|
||||
ObjCBlockIndentWidth: 4
|
||||
ObjCBreakBeforeNestedBlockParam: true
|
||||
ObjCSpaceAfterProperty: false
|
||||
ObjCSpaceBeforeProtocolList: true
|
||||
PackConstructorInitializers: BinPack
|
||||
PenaltyBreakAssignment: 150
|
||||
PenaltyBreakBeforeFirstCallParameter: 300
|
||||
PenaltyBreakComment: 500
|
||||
PenaltyBreakFirstLessLess: 400
|
||||
PenaltyBreakOpenParenthesis: 0
|
||||
PenaltyBreakString: 600
|
||||
PenaltyBreakTemplateDeclaration: 10
|
||||
PenaltyExcessCharacter: 50
|
||||
PenaltyIndentedWhitespace: 0
|
||||
PenaltyReturnTypeOnItsOwnLine: 300
|
||||
PointerAlignment: Right
|
||||
PPIndentWidth: -1
|
||||
QualifierAlignment: Leave
|
||||
ReferenceAlignment: Pointer
|
||||
ReflowComments: false
|
||||
RemoveBracesLLVM: false
|
||||
RemoveParentheses: Leave
|
||||
RemoveSemicolon: false
|
||||
RequiresClausePosition: OwnLine
|
||||
RequiresExpressionIndentation: OuterScope
|
||||
SeparateDefinitionBlocks: Leave
|
||||
ShortNamespaceLines: 1
|
||||
SortIncludes: CaseSensitive
|
||||
SortJavaStaticImport: Before
|
||||
SortUsingDeclarations: Lexicographic
|
||||
SpaceAfterCStyleCast: true
|
||||
SpaceAfterLogicalNot: false
|
||||
SpaceAfterTemplateKeyword: false
|
||||
SpaceAroundPointerQualifiers: Default
|
||||
SpaceBeforeAssignmentOperators: true
|
||||
SpaceBeforeCaseColon: false
|
||||
SpaceBeforeCpp11BracedList: false
|
||||
SpaceBeforeCtorInitializerColon: true
|
||||
SpaceBeforeInheritanceColon: true
|
||||
SpaceBeforeJsonColon: false
|
||||
SpaceBeforeParens: ControlStatements
|
||||
SpaceBeforeParensOptions:
|
||||
AfterControlStatements: true
|
||||
AfterForeachMacros: true
|
||||
AfterFunctionDefinitionName: false
|
||||
AfterFunctionDeclarationName: false
|
||||
AfterIfMacros: true
|
||||
AfterOverloadedOperator: false
|
||||
AfterRequiresInClause: false
|
||||
AfterRequiresInExpression: false
|
||||
BeforeNonEmptyParentheses: false
|
||||
SpaceBeforeRangeBasedForLoopColon: true
|
||||
SpaceBeforeSquareBrackets: false
|
||||
SpaceInEmptyBlock: false
|
||||
SpacesBeforeTrailingComments: 1
|
||||
SpacesInAngles: Never
|
||||
SpacesInContainerLiterals: false
|
||||
SpacesInLineCommentPrefix:
|
||||
Minimum: 1
|
||||
Maximum: -1
|
||||
SpacesInParens: Never
|
||||
SpacesInParensOptions:
|
||||
InCStyleCasts: false
|
||||
InConditionalStatements: false
|
||||
InEmptyParentheses: false
|
||||
Other: false
|
||||
SpacesInSquareBrackets: false
|
||||
Standard: Auto
|
||||
StatementAttributeLikeMacros:
|
||||
- Q_EMIT
|
||||
StatementMacros:
|
||||
- Q_UNUSED
|
||||
- QT_REQUIRE_VERSION
|
||||
- Q_CLASSINFO
|
||||
- Q_ENUM
|
||||
- Q_ENUM_NS
|
||||
- Q_FLAG
|
||||
- Q_FLAG_NS
|
||||
- Q_GADGET
|
||||
- Q_GADGET_EXPORT
|
||||
- Q_INTERFACES
|
||||
- Q_MOC_INCLUDE
|
||||
- Q_NAMESPACE
|
||||
- Q_NAMESPACE_EXPORT
|
||||
- Q_OBJECT
|
||||
- Q_PROPERTY
|
||||
- Q_REVISION
|
||||
- Q_DISABLE_COPY
|
||||
- Q_SET_OBJECT_NAME
|
||||
- QT_BEGIN_NAMESPACE
|
||||
- QT_END_NAMESPACE
|
||||
- QML_ADDED_IN_MINOR_VERSION
|
||||
- QML_ANONYMOUS
|
||||
- QML_ATTACHED
|
||||
- QML_DECLARE_TYPE
|
||||
- QML_DECLARE_TYPEINFO
|
||||
- QML_ELEMENT
|
||||
- QML_EXTENDED
|
||||
- QML_EXTENDED_NAMESPACE
|
||||
- QML_EXTRA_VERSION
|
||||
- QML_FOREIGN
|
||||
- QML_FOREIGN_NAMESPACE
|
||||
- QML_IMPLEMENTS_INTERFACES
|
||||
- QML_INTERFACE
|
||||
- QML_NAMED_ELEMENT
|
||||
- QML_REMOVED_IN_MINOR_VERSION
|
||||
- QML_SINGLETON
|
||||
- QML_UNAVAILABLE
|
||||
- QML_UNCREATABLE
|
||||
- QML_VALUE_TYPE
|
||||
TabWidth: 4
|
||||
UseTab: Never
|
||||
VerilogBreakBetweenInstancePorts: true
|
||||
WhitespaceSensitiveMacros:
|
||||
- BOOST_PP_STRINGIZE
|
||||
- CF_SWIFT_NAME
|
||||
- NS_SWIFT_NAME
|
||||
- PP_STRINGIZE
|
||||
- STRINGIZE
|
||||
...
|
||||
|
||||
@ -1,46 +1,3 @@
|
||||
nymea-plugins (1.14.2+etm3) powersync-stable; urgency=low
|
||||
|
||||
* Keba: show IP address in setup params when thingParamValueAddress is empty (fallback to direct IP)
|
||||
|
||||
-- ETM Schurig <dev@etm-schurig.eu> Tue, 01 Apr 2026 09:00:00 +0200
|
||||
|
||||
nymea-plugins (1.14.2+etm2) powersync-stable; urgency=high
|
||||
|
||||
* Keba: fix product code parser for PV-Edition Shutter connector (KC-P30-ESS400U2-E00-PV)
|
||||
- Fix: current rating compared against connectorTypeValue ('S') instead of
|
||||
connectorCurrentValue ('4') causing m_isValid=false for all Shutter models
|
||||
- Add: explicit step labels on all parser failure points for easier debugging
|
||||
- Add: phase switching support via UDP x2src/x2 (IEC 61851, 5 min cooldown)
|
||||
- Add: states phaseSwitchSource, phaseSwitchActive, desiredPhaseCount
|
||||
- Add: action setPhaseCount (1 or 3 phases)
|
||||
|
||||
-- ETM Schurig <dev@etm-schurig.eu> Tue, 01 Apr 2026 08:00:00 +0200
|
||||
|
||||
nymea-plugins (1.14.2+etm1) powersync-stable; urgency=low
|
||||
|
||||
* Renommage : nymea-plugin-* -> powersync-plugin-*
|
||||
* Ajout Provides/Conflicts/Replaces pour compatibilité nymea
|
||||
|
||||
-- ETM Schurig <dev@etm-schurig.eu> Mon, 30 Mar 2026 20:00:00 +0200
|
||||
|
||||
nymea-plugins (1.14.2) noble; urgency=medium
|
||||
|
||||
|
||||
-- jenkins <developer@nymea.io> Thu, 19 Feb 2026 12:13:26 +0100
|
||||
|
||||
nymea-plugins (1.14.1) noble; urgency=medium
|
||||
|
||||
|
||||
-- jenkins <developer@nymea.io> Thu, 29 Jan 2026 21:29:16 +0100
|
||||
|
||||
nymea-plugins (1.14.0) noble; urgency=medium
|
||||
|
||||
[ Simon Stürz ]
|
||||
* Tado: Synch cached states delayed
|
||||
* Update EV charger interface and add full charging current resolution
|
||||
|
||||
-- jenkins <developer@nymea.io> Mon, 12 Jan 2026 10:47:41 +0100
|
||||
|
||||
nymea-plugins (1.13.0) jammy; urgency=medium
|
||||
|
||||
[ Simon Stürz ]
|
||||
|
||||
@ -143,11 +143,10 @@
|
||||
"displayName": "Charging current",
|
||||
"displayNameEvent": "Charging current changed",
|
||||
"displayNameAction": "Set charging current",
|
||||
"type": "double",
|
||||
"type": "uint",
|
||||
"unit": "Ampere",
|
||||
"minValue": 6,
|
||||
"maxValue": 32,
|
||||
"stepSize": 1.0,
|
||||
"defaultValue": 16,
|
||||
"writable": true,
|
||||
"suggestLogging": true
|
||||
|
||||
@ -113,11 +113,7 @@ void IntegrationPluginKeba::discoverThings(ThingDiscoveryInfo *info)
|
||||
ParamList params;
|
||||
params << Param(m_macAddressParamTypeIds.value(discoveredThingClassId), result.networkDeviceInfo.thingParamValueMacAddress());
|
||||
params << Param(m_hostNameParamTypeIds.value(discoveredThingClassId), result.networkDeviceInfo.thingParamValueHostName());
|
||||
// Fallback to direct IP when thingParamValueAddress() is empty (occurs when MAC is known and IP is tracked dynamically)
|
||||
QString addressValue = result.networkDeviceInfo.thingParamValueAddress();
|
||||
if (addressValue.isEmpty())
|
||||
addressValue = result.address.toString();
|
||||
params << Param(m_addressParamTypeIds.value(discoveredThingClassId), addressValue);
|
||||
params << Param(m_addressParamTypeIds.value(discoveredThingClassId), result.networkDeviceInfo.thingParamValueAddress());
|
||||
params << Param(m_modelParamTypeIds.value(discoveredThingClassId), result.product);
|
||||
params << Param(m_serialNumberParamTypeIds.value(discoveredThingClassId), result.serialNumber);
|
||||
descriptor.setParams(params);
|
||||
@ -285,7 +281,7 @@ void IntegrationPluginKeba::executeAction(ThingActionInfo *info)
|
||||
QUuid requestId;
|
||||
if (thing->thingClassId() == kebaThingClassId) {
|
||||
if (action.actionTypeId() == kebaMaxChargingCurrentActionTypeId) {
|
||||
int milliAmpere = qRound(action.paramValue(kebaMaxChargingCurrentActionMaxChargingCurrentParamTypeId).toDouble() * 1000);
|
||||
int milliAmpere = action.paramValue(kebaMaxChargingCurrentActionMaxChargingCurrentParamTypeId).toUInt() * 1000;
|
||||
requestId = keba->setMaxAmpereGeneral(milliAmpere);
|
||||
} else if (action.actionTypeId() == kebaPowerActionTypeId) {
|
||||
requestId = keba->enableOutput(action.param(kebaPowerActionTypeId).value().toBool());
|
||||
@ -293,9 +289,6 @@ void IntegrationPluginKeba::executeAction(ThingActionInfo *info)
|
||||
requestId = keba->displayMessage(action.param(kebaDisplayActionMessageParamTypeId).value().toByteArray());
|
||||
} else if (action.actionTypeId() == kebaOutputX2ActionTypeId) {
|
||||
requestId = keba->setOutputX2(action.param(kebaOutputX2ActionOutputX2ParamTypeId).value().toBool());
|
||||
} else if (action.actionTypeId() == kebaSetPhaseCountActionTypeId) {
|
||||
int phaseCount = action.paramValue(kebaSetPhaseCountActionPhaseCountParamTypeId).toInt();
|
||||
requestId = keba->setPhaseSwitch(phaseCount);
|
||||
} else if (action.actionTypeId() == kebaFailsafeModeActionTypeId) {
|
||||
int timeout = 0;
|
||||
if (action.param(kebaFailsafeModeActionFailsafeModeParamTypeId).value().toBool()) {
|
||||
@ -309,7 +302,7 @@ void IntegrationPluginKeba::executeAction(ThingActionInfo *info)
|
||||
|
||||
} else if (thing->thingClassId() == kebaSimpleThingClassId) {
|
||||
if (action.actionTypeId() == kebaSimpleMaxChargingCurrentActionTypeId) {
|
||||
int milliAmpere = qRound(action.paramValue(kebaSimpleMaxChargingCurrentActionMaxChargingCurrentParamTypeId).toDouble() * 1000);
|
||||
int milliAmpere = action.paramValue(kebaSimpleMaxChargingCurrentActionMaxChargingCurrentParamTypeId).toUInt() * 1000;
|
||||
requestId = keba->setMaxAmpereGeneral(milliAmpere);
|
||||
} else if (action.actionTypeId() == kebaSimplePowerActionTypeId) {
|
||||
requestId = keba->enableOutput(action.param(kebaSimplePowerActionTypeId).value().toBool());
|
||||
@ -433,7 +426,6 @@ void IntegrationPluginKeba::setupKeba(ThingSetupInfo *info, const QHostAddress &
|
||||
case KebaProductInfo::SeriesX4G:
|
||||
case KebaProductInfo::SeriesSpecial:
|
||||
qCDebug(dcKeba()) << "The keba" << productInformation.series() << "is capable of communicating using UDP";
|
||||
qCDebug(dcKeba()) << "Series Special detected:" << productInformation.productString().right(2) << "(PV-Edition ou autre variante spéciale)";
|
||||
supported = true;
|
||||
break;
|
||||
default:
|
||||
@ -489,7 +481,7 @@ void IntegrationPluginKeba::onCommandExecuted(QUuid requestId, bool success)
|
||||
if (thing->thingClassId() == kebaThingClassId) {
|
||||
// Set the value to the state so we don't have to wait for the report 2 response
|
||||
if (info->action().actionTypeId() == kebaMaxChargingCurrentActionTypeId) {
|
||||
double value = info->action().paramValue(kebaMaxChargingCurrentActionMaxChargingCurrentParamTypeId).toDouble();
|
||||
uint value = info->action().paramValue(kebaMaxChargingCurrentActionMaxChargingCurrentParamTypeId).toUInt();
|
||||
info->thing()->setStateValue("maxChargingCurrent", value);
|
||||
} else if (info->action().actionTypeId() == kebaPowerActionTypeId) {
|
||||
info->thing()->setStateValue("power", info->action().paramValue(kebaPowerActionTypeId).toBool());
|
||||
@ -497,7 +489,7 @@ void IntegrationPluginKeba::onCommandExecuted(QUuid requestId, bool success)
|
||||
} else if (thing->thingClassId() == kebaSimpleThingClassId) {
|
||||
// Set the value to the state so we don't have to wait for the report 2 response
|
||||
if (info->action().actionTypeId() == kebaSimpleMaxChargingCurrentActionTypeId) {
|
||||
double value = info->action().paramValue(kebaSimpleMaxChargingCurrentActionMaxChargingCurrentParamTypeId).toDouble();
|
||||
uint value = info->action().paramValue(kebaSimpleMaxChargingCurrentActionMaxChargingCurrentParamTypeId).toUInt();
|
||||
info->thing()->setStateValue("maxChargingCurrent", value);
|
||||
} else if (info->action().actionTypeId() == kebaPowerActionTypeId) {
|
||||
info->thing()->setStateValue("power", info->action().paramValue(kebaSimplePowerActionTypeId).toBool());
|
||||
@ -606,7 +598,7 @@ void IntegrationPluginKeba::onReportTwoReceived(const KeContact::ReportTwo &repo
|
||||
qCDebug(dcKeba()) << " - Output:" << reportTwo.output;
|
||||
qCDebug(dcKeba()) << " - Input:" << reportTwo.input;
|
||||
qCDebug(dcKeba()) << " - Serial number:" << reportTwo.serialNumber;
|
||||
qCDebug(dcKeba()) << " - Uptime:" << reportTwo.seconds / 60 << "[min]";
|
||||
qCDebug(dcKeba()) << " - Uptime:" << reportTwo.seconds/60 << "[min]";
|
||||
|
||||
if (reportTwo.serialNumber == thing->paramValue(m_serialNumberParamTypeIds.value(thing->thingClassId())).toString()) {
|
||||
setDeviceState(thing, reportTwo.state);
|
||||
@ -617,7 +609,7 @@ void IntegrationPluginKeba::onReportTwoReceived(const KeContact::ReportTwo &repo
|
||||
thing->setStateValue("error2", reportTwo.error2);
|
||||
thing->setStateValue("systemEnabled", reportTwo.enableSys);
|
||||
|
||||
thing->setStateValue("maxChargingCurrent", reportTwo.currentUser);
|
||||
thing->setStateValue("maxChargingCurrent", qRound(reportTwo.currentUser));
|
||||
thing->setStateValue("maxChargingCurrentPercent", reportTwo.maxCurrentPercentage);
|
||||
thing->setStateValue("maxChargingCurrentHardware", reportTwo.currentHardwareLimitation);
|
||||
|
||||
@ -631,12 +623,6 @@ void IntegrationPluginKeba::onReportTwoReceived(const KeContact::ReportTwo &repo
|
||||
thing->setStateValue("outputX2", reportTwo.output);
|
||||
thing->setStateValue("input", reportTwo.input);
|
||||
|
||||
// Phase switch state (PV-Edition / SeriesSpecial)
|
||||
thing->setStateValue("phaseSwitchSource", reportTwo.x2PhaseSwitchSource);
|
||||
thing->setStateValue("phaseSwitchActive", reportTwo.x2PhaseSwitchSource == 4);
|
||||
// x2PhaseSwitch: 0 = 1 phase, 1 = 3 phases
|
||||
thing->setStateValue("desiredPhaseCount", reportTwo.x2PhaseSwitch == 1 ? 3 : 1);
|
||||
|
||||
thing->setStateValue("uptime", reportTwo.seconds / 60);
|
||||
} else {
|
||||
qCWarning(dcKeba()) << "Received report but the serial number didn't match";
|
||||
|
||||
@ -136,12 +136,11 @@
|
||||
"displayName": "Maximal charging current",
|
||||
"displayNameEvent": "Maximal charging current changed",
|
||||
"displayNameAction": "Set maximal charging current",
|
||||
"type": "double",
|
||||
"type": "uint",
|
||||
"unit": "Ampere",
|
||||
"defaultValue": 6,
|
||||
"minValue": 6,
|
||||
"maxValue": 32,
|
||||
"stepSize": 0.001,
|
||||
"writable": true,
|
||||
"suggestLogging": true
|
||||
},
|
||||
@ -299,35 +298,6 @@
|
||||
"writable": true,
|
||||
"defaultValue": false
|
||||
},
|
||||
{
|
||||
"id": "f8e39ab6-53a7-45a4-96df-8644cbd57036",
|
||||
"name": "phaseSwitchSource",
|
||||
"displayName": "Phase switch source",
|
||||
"displayNameEvent": "Phase switch source changed",
|
||||
"type": "int",
|
||||
"defaultValue": 0,
|
||||
"cached": true
|
||||
},
|
||||
{
|
||||
"id": "bea5e94f-95e0-44ad-a37b-5111415fc093",
|
||||
"name": "phaseSwitchActive",
|
||||
"displayName": "Phase switch active",
|
||||
"displayNameEvent": "Phase switch active changed",
|
||||
"type": "bool",
|
||||
"defaultValue": false,
|
||||
"cached": true
|
||||
},
|
||||
{
|
||||
"id": "c8830dc8-4f12-4aeb-be07-e5024bbe34b4",
|
||||
"name": "desiredPhaseCount",
|
||||
"displayName": "Desired phase count",
|
||||
"displayNameEvent": "Desired phase count changed",
|
||||
"type": "uint",
|
||||
"defaultValue": 3,
|
||||
"minValue": 1,
|
||||
"maxValue": 3,
|
||||
"cached": true
|
||||
},
|
||||
{
|
||||
"id": "ba600276-8b36-4404-b8ec-415245e5bc15",
|
||||
"name": "input",
|
||||
@ -405,23 +375,6 @@
|
||||
"defaultValue": ""
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "f6bedafe-ade4-47ec-894a-b9114da9ad38",
|
||||
"name": "setPhaseCount",
|
||||
"displayName": "Set phase count",
|
||||
"paramTypes": [
|
||||
{
|
||||
"id": "39ff68f6-1cd9-4395-8d87-ccb2c69436b3",
|
||||
"name": "phaseCount",
|
||||
"displayName": "Phase count",
|
||||
"type": "int",
|
||||
"defaultValue": 3,
|
||||
"minValue": 1,
|
||||
"maxValue": 3,
|
||||
"allowedValues": [1, 3]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"eventTypes": [
|
||||
@ -596,12 +549,11 @@
|
||||
"displayName": "Maximal charging current",
|
||||
"displayNameEvent": "Maximal charging current changed",
|
||||
"displayNameAction": "Set maximal charging current",
|
||||
"type": "double",
|
||||
"type": "uint",
|
||||
"unit": "Ampere",
|
||||
"defaultValue": 6,
|
||||
"minValue": 6,
|
||||
"maxValue": 32,
|
||||
"stepSize": 0.001,
|
||||
"writable": true,
|
||||
"suggestLogging": true
|
||||
},
|
||||
|
||||
@ -35,7 +35,6 @@ KebaProductInfo::KebaProductInfo(const QString &productString) :
|
||||
// KC-P30-EC220112-000-DE
|
||||
// KC-P30-EC2404B2-M0A-GE
|
||||
// KC-P30-EC2204U2-E00-PV
|
||||
// KC-P30-ESS400U2-E00-PV (PV-Edition, Shutter T2, 32A, triphasé, marché FR)
|
||||
|
||||
qCDebug(dcKeba()) << "Parsing product information from" << productString.count() << productString;
|
||||
if (m_productString.count() < 19) {
|
||||
@ -77,7 +76,6 @@ KebaProductInfo::KebaProductInfo(const QString &productString) :
|
||||
m_connector = ConnectorCable;
|
||||
qCDebug(dcKeba()) << "Connector: Cable";
|
||||
} else {
|
||||
qCWarning(dcKeba()) << "Invalid at step: connector" << connectorValue;
|
||||
m_isValid = false;
|
||||
return;
|
||||
}
|
||||
@ -90,7 +88,6 @@ KebaProductInfo::KebaProductInfo(const QString &productString) :
|
||||
} else if (connectorTypeValue.toLower() == QChar('s')) {
|
||||
m_connectorType = Shutter;
|
||||
} else {
|
||||
qCWarning(dcKeba()) << "Invalid at step: connectorType" << connectorTypeValue;
|
||||
m_isValid = false;
|
||||
return;
|
||||
}
|
||||
@ -98,27 +95,7 @@ KebaProductInfo::KebaProductInfo(const QString &productString) :
|
||||
qCDebug(dcKeba()) << "Connector type:" << m_connectorType;
|
||||
|
||||
QChar connectorCurrentValue = descriptor.at(3);
|
||||
if (m_connectorType == Shutter) {
|
||||
// Shutter: le courant est encodé directement en position 3
|
||||
// (indépendant de connectorTypeValue qui vaut 'S')
|
||||
if (connectorCurrentValue == QChar('4')) {
|
||||
m_current = Current32A;
|
||||
qCDebug(dcKeba()) << "Current (Shutter): 32A";
|
||||
} else if (connectorCurrentValue == QChar('3')) {
|
||||
m_current = Current20A;
|
||||
qCDebug(dcKeba()) << "Current (Shutter): 20A";
|
||||
} else if (connectorCurrentValue == QChar('2')) {
|
||||
m_current = Current16A;
|
||||
qCDebug(dcKeba()) << "Current (Shutter): 16A";
|
||||
} else if (connectorCurrentValue == QChar('1')) {
|
||||
m_current = Current13A;
|
||||
qCDebug(dcKeba()) << "Current (Shutter): 13A";
|
||||
} else {
|
||||
qCWarning(dcKeba()) << "Invalid at step: current (Shutter)" << connectorCurrentValue;
|
||||
m_isValid = false;
|
||||
return;
|
||||
}
|
||||
} else if (connectorCurrentValue.isDigit() && connectorTypeValue == QChar('1')) {
|
||||
if (connectorCurrentValue.isDigit() && connectorTypeValue == QChar('1')) {
|
||||
m_current = Current13A;
|
||||
} else if (connectorCurrentValue.isDigit() && connectorTypeValue == QChar('2')) {
|
||||
m_current = Current16A;
|
||||
@ -127,7 +104,6 @@ KebaProductInfo::KebaProductInfo(const QString &productString) :
|
||||
} else if (connectorCurrentValue.isDigit() && connectorTypeValue == QChar('4')) {
|
||||
m_current = Current32A;
|
||||
} else {
|
||||
qCWarning(dcKeba()) << "Invalid at step: current" << connectorCurrentValue << "connectorType" << connectorTypeValue;
|
||||
m_isValid = false;
|
||||
return;
|
||||
}
|
||||
@ -152,7 +128,6 @@ KebaProductInfo::KebaProductInfo(const QString &productString) :
|
||||
m_cable = Cable5p5m;
|
||||
qCDebug(dcKeba()) << "Cable: 5.5 meter";
|
||||
} else {
|
||||
qCWarning(dcKeba()) << "Invalid at step: cable" << cableValue;
|
||||
m_isValid = false;
|
||||
return;
|
||||
}
|
||||
@ -190,7 +165,7 @@ KebaProductInfo::KebaProductInfo(const QString &productString) :
|
||||
m_series = SeriesSpecial;
|
||||
qCDebug(dcKeba()) << "Series: Special" + m_productString.right(2);
|
||||
} else {
|
||||
qCWarning(dcKeba()) << "Invalid at step: series" << seriesValue;
|
||||
qCWarning(dcKeba()) << "Series: Unknown" << productString << "value:" << seriesValue;
|
||||
m_isValid = false;
|
||||
return;
|
||||
}
|
||||
@ -202,7 +177,6 @@ KebaProductInfo::KebaProductInfo(const QString &productString) :
|
||||
} else if (phaseCountValue == QChar('2')) {
|
||||
m_phaseCount = 3;
|
||||
} else {
|
||||
qCWarning(dcKeba()) << "Invalid at step: phaseCount" << phaseCountValue;
|
||||
m_isValid = false;
|
||||
return;
|
||||
}
|
||||
@ -226,7 +200,6 @@ KebaProductInfo::KebaProductInfo(const QString &productString) :
|
||||
m_meter = MeterCalibratedNationalCertified;
|
||||
qCDebug(dcKeba()) << "Meter: Calibrated meter (national certified)";
|
||||
} else {
|
||||
qCWarning(dcKeba()) << "Invalid at step: meter" << meterValue;
|
||||
m_isValid = false;
|
||||
return;
|
||||
}
|
||||
|
||||
@ -327,29 +327,6 @@ void KeContact::getReport1XX(int reportNumber)
|
||||
getReport(reportNumber);
|
||||
}
|
||||
|
||||
QUuid KeContact::setPhaseSwitch(int phaseCount)
|
||||
{
|
||||
if (!m_dataLayer) {
|
||||
qCWarning(dcKeba()) << "UDP socket not initialized";
|
||||
setReachable(false);
|
||||
return QUuid();
|
||||
}
|
||||
|
||||
// 1. Activate UDP phase control source
|
||||
KeContactRequest activateRequest(QUuid::createUuid(), "x2src 4");
|
||||
m_requestQueue.enqueue(activateRequest);
|
||||
|
||||
// 2. Set phase count: x2 0 = 1 phase, x2 1 = 3 phases
|
||||
// Note: IEC 61851 requires a 5 min cooldown between phase switches
|
||||
QByteArray cmd = QString("x2 %1").arg(phaseCount == 3 ? 1 : 0).toLatin1();
|
||||
KeContactRequest phaseRequest(QUuid::createUuid(), cmd);
|
||||
qCDebug(dcKeba()) << "Phase switch:" << phaseCount << "phases. Datagram:" << cmd;
|
||||
m_requestQueue.enqueue(phaseRequest);
|
||||
|
||||
sendNextCommand();
|
||||
return phaseRequest.requestId();
|
||||
}
|
||||
|
||||
QUuid KeContact::setOutputX2(bool state)
|
||||
{
|
||||
if (!m_dataLayer) {
|
||||
@ -523,8 +500,6 @@ void KeContact::onReceivedDatagram(const QHostAddress &address, const QByteArray
|
||||
reportTwo.setEnergy = data.value("Setenergy").toInt() / 10000.00;
|
||||
reportTwo.output = data.value("Output").toInt();
|
||||
reportTwo.input= data.value("Input").toInt();
|
||||
reportTwo.x2PhaseSwitchSource = data.value("X2 phaseSwitch source").toInt();
|
||||
reportTwo.x2PhaseSwitch = data.value("X2 phaseSwitch").toInt();
|
||||
reportTwo.serialNumber = data.value("Serial").toString();
|
||||
reportTwo.seconds = data.value("Sec").toInt();
|
||||
// Not documented:
|
||||
|
||||
@ -130,7 +130,7 @@ public:
|
||||
double maxCurrent; //Current preset value via Control pilot in ampere.
|
||||
double maxCurrentPercentage; //Current preset value via Control pilot in 0,1% of the PWM value
|
||||
double currentHardwareLimitation; //Highest possible charging current of the charging connection. Contains device maximum, DIP-switch setting, cable coding and temperature reduction.
|
||||
double currentUser; //Current preset value of the user via UDP; A.
|
||||
double currentUser; //Current preset value of the user via UDP; Default = 63000mA.
|
||||
double currentFailsafe; //Current preset value for the Failsafe function.
|
||||
int timeoutFailsafe; //Communication timeout before triggering the Failsafe function.
|
||||
int currTimer; //Shows the current preset value of currtime.
|
||||
@ -138,8 +138,6 @@ public:
|
||||
double setEnergy; //Shows the set energy limit
|
||||
bool output; //State of the output X2.
|
||||
bool input; //State of the potential free Enable input X1. When using the input, please pay attention to the information in the installation manual.
|
||||
int x2PhaseSwitchSource = 0; //Source of phase switching control (4 = UDP)
|
||||
int x2PhaseSwitch = 0; //Current phase state (0 = 1 phase, 1 = 3 phases)
|
||||
QString serialNumber; //Serial number
|
||||
int seconds; //Current system clock since restart of the charging station.
|
||||
};
|
||||
@ -200,7 +198,6 @@ public:
|
||||
|
||||
// Command “currtime”
|
||||
QUuid setOutputX2(bool state); // Command “output”
|
||||
QUuid setPhaseSwitch(int phaseCount); // Commands “x2src 4” + “x2 0/1” (IEC 61851: 5 min cooldown between switches)
|
||||
|
||||
private:
|
||||
KeContactDataLayer *m_dataLayer = nullptr;
|
||||
|
||||
@ -29,87 +29,20 @@
|
||||
#include <network/networkaccessmanager.h>
|
||||
|
||||
#include <QDebug>
|
||||
#include <QUrlQuery>
|
||||
#include <QJsonDocument>
|
||||
#include <QTimer>
|
||||
#include <QUrlQuery>
|
||||
#include <QtMath>
|
||||
|
||||
namespace {
|
||||
void finishPendingActions(const QList<ThingActionInfo *> &actions, Thing::ThingError error)
|
||||
{
|
||||
for (ThingActionInfo *info : actions) {
|
||||
if (info) {
|
||||
info->finish(error);
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace
|
||||
|
||||
IntegrationPluginTado::IntegrationPluginTado()
|
||||
{
|
||||
m_stateSyncTimer.setInterval(5000);
|
||||
connect(&m_stateSyncTimer, &QTimer::timeout, this, &IntegrationPluginTado::syncPendingOverlays);
|
||||
|
||||
}
|
||||
|
||||
QString IntegrationPluginTado::buildZoneKey(const ThingId &accountThingId, const QString &homeId, const QString &zoneId)
|
||||
void IntegrationPluginTado::init()
|
||||
{
|
||||
return accountThingId.toString() + ":" + homeId + ":" + zoneId;
|
||||
|
||||
}
|
||||
|
||||
bool IntegrationPluginTado::overlayStatesEqual(const OverlayState &first, const OverlayState &second)
|
||||
{
|
||||
if (first.deleteOverlay != second.deleteOverlay) {
|
||||
return false;
|
||||
}
|
||||
if (first.deleteOverlay) {
|
||||
return true;
|
||||
}
|
||||
if (first.power != second.power) {
|
||||
return false;
|
||||
}
|
||||
return qAbs(first.temperature - second.temperature) < 0.01;
|
||||
}
|
||||
|
||||
void IntegrationPluginTado::queueOverlayChange(ThingActionInfo *info, const QString &homeId, const QString &zoneId, const OverlayState &desired)
|
||||
{
|
||||
if (!info) {
|
||||
return;
|
||||
}
|
||||
|
||||
Thing *thing = info->thing();
|
||||
if (!thing) {
|
||||
return;
|
||||
}
|
||||
|
||||
ThingId accountThingId = thing->parentId();
|
||||
QString zoneKey = buildZoneKey(accountThingId, homeId, zoneId);
|
||||
PendingOverlayChange &pending = m_pendingOverlayChanges[zoneKey];
|
||||
pending.accountThingId = accountThingId;
|
||||
pending.homeId = homeId;
|
||||
pending.zoneId = zoneId;
|
||||
pending.desired = desired;
|
||||
pending.dirty = true;
|
||||
pending.pendingActions.append(info);
|
||||
|
||||
connect(info, &ThingActionInfo::aborted, this, [this, info]() { removePendingAction(info); });
|
||||
|
||||
if (!m_stateSyncTimer.isActive()) {
|
||||
m_stateSyncTimer.start();
|
||||
}
|
||||
}
|
||||
|
||||
void IntegrationPluginTado::removePendingAction(ThingActionInfo *info)
|
||||
{
|
||||
for (auto it = m_pendingOverlayChanges.begin(); it != m_pendingOverlayChanges.end(); ++it) {
|
||||
it->pendingActions.removeAll(info);
|
||||
}
|
||||
for (auto it = m_pendingRequests.begin(); it != m_pendingRequests.end(); ++it) {
|
||||
it->actions.removeAll(info);
|
||||
}
|
||||
}
|
||||
|
||||
void IntegrationPluginTado::init() {}
|
||||
|
||||
void IntegrationPluginTado::startPairing(ThingPairingInfo *info)
|
||||
{
|
||||
qCDebug(dcTado()) << "Start pairing process ...";
|
||||
@ -123,7 +56,7 @@ void IntegrationPluginTado::startPairing(ThingPairingInfo *info)
|
||||
tado->deleteLater();
|
||||
});
|
||||
|
||||
connect(tado, &Tado::getLoginUrlFinished, info, [info, tado, this](bool success) {
|
||||
connect(tado, &Tado::getLoginUrlFinished, info, [info, tado, this] (bool success) {
|
||||
if (!success) {
|
||||
info->finish(Thing::ThingErrorAuthenticationFailure);
|
||||
return;
|
||||
@ -134,6 +67,8 @@ void IntegrationPluginTado::startPairing(ThingPairingInfo *info)
|
||||
m_unfinishedTadoAccounts.take(info->thingId())->deleteLater();
|
||||
});
|
||||
|
||||
|
||||
|
||||
qCDebug(dcTado()) << "Tado server is reachable. Starting the OAuth pairing process using" << tado->loginUrl();
|
||||
info->setOAuthUrl(QUrl(tado->loginUrl()));
|
||||
info->finish(Thing::ThingErrorNoError);
|
||||
@ -149,8 +84,8 @@ void IntegrationPluginTado::confirmPairing(ThingPairingInfo *info, const QString
|
||||
qCDebug(dcTado()) << "Confirm pairing" << password;
|
||||
Tado *tado = m_unfinishedTadoAccounts.value(info->thingId());
|
||||
|
||||
connect(tado, &Tado::connectionError, info, [info](QNetworkReply::NetworkError error) {
|
||||
if (error != QNetworkReply::NetworkError::NoError) {
|
||||
connect(tado, &Tado::connectionError, info, [info] (QNetworkReply::NetworkError error){
|
||||
if (error != QNetworkReply::NetworkError::NoError){
|
||||
qCWarning(dcTado()) << "Confirm pairing failed" << error;
|
||||
info->finish(Thing::ThingErrorSetupFailed, QT_TR_NOOP("A connection error occurred."));
|
||||
}
|
||||
@ -178,6 +113,7 @@ void IntegrationPluginTado::setupThing(ThingSetupInfo *info)
|
||||
Thing *thing = info->thing();
|
||||
|
||||
if (thing->thingClassId() == tadoAccountThingClassId) {
|
||||
|
||||
qCDebug(dcTado) << "Setting up Tado account" << thing->name() << thing->params();
|
||||
|
||||
Tado *tado = nullptr;
|
||||
@ -197,6 +133,7 @@ void IntegrationPluginTado::setupThing(ThingSetupInfo *info)
|
||||
pluginStorage()->setValue("refreshToken", tado->refreshToken());
|
||||
pluginStorage()->endGroup();
|
||||
} else {
|
||||
|
||||
// Load refresh token
|
||||
pluginStorage()->beginGroup(thing->id().toString());
|
||||
QString refreshToken = pluginStorage()->value("refreshToken").toString();
|
||||
@ -226,7 +163,7 @@ void IntegrationPluginTado::setupThing(ThingSetupInfo *info)
|
||||
}
|
||||
});
|
||||
|
||||
connect(tado, &Tado::refreshTokenReceived, this, [thing, this](const QString &refreshToken) {
|
||||
connect(tado, &Tado::refreshTokenReceived, this, [thing, this](const QString &refreshToken){
|
||||
pluginStorage()->beginGroup(thing->id().toString());
|
||||
pluginStorage()->setValue("refreshToken", refreshToken);
|
||||
pluginStorage()->endGroup();
|
||||
@ -237,8 +174,8 @@ void IntegrationPluginTado::setupThing(ThingSetupInfo *info)
|
||||
info->finish(Thing::ThingErrorNoError);
|
||||
});
|
||||
|
||||
connect(tado, &Tado::connectionError, info, [this, info](QNetworkReply::NetworkError error) {
|
||||
if (error != QNetworkReply::NetworkError::NoError) {
|
||||
connect(tado, &Tado::connectionError, info, [this, info] (QNetworkReply::NetworkError error) {
|
||||
if (error != QNetworkReply::NetworkError::NoError){
|
||||
if (m_tadoAccounts.contains(info->thing()->id())) {
|
||||
Tado *tado = m_tadoAccounts.take(info->thing()->id());
|
||||
tado->deleteLater();
|
||||
@ -265,10 +202,10 @@ void IntegrationPluginTado::setupThing(ThingSetupInfo *info)
|
||||
} else if (thing->thingClassId() == zoneThingClassId) {
|
||||
qCDebug(dcTado) << "Setup Tado zone" << thing->params();
|
||||
Thing *parentThing = myThings().findById(thing->parentId());
|
||||
if (parentThing->setupComplete()) {
|
||||
if(parentThing->setupComplete()) {
|
||||
return info->finish(Thing::ThingErrorNoError);
|
||||
} else {
|
||||
connect(parentThing, &Thing::setupStatusChanged, info, [parentThing, info] {
|
||||
connect(parentThing, &Thing::setupStatusChanged, info, [parentThing, info]{
|
||||
if (parentThing->setupComplete()) {
|
||||
info->finish(Thing::ThingErrorNoError);
|
||||
}
|
||||
@ -285,57 +222,15 @@ void IntegrationPluginTado::thingRemoved(Thing *thing)
|
||||
{
|
||||
if (thing->thingClassId() == tadoAccountThingClassId) {
|
||||
Tado *tado = m_tadoAccounts.take(thing->id());
|
||||
if (tado) {
|
||||
tado->deleteLater();
|
||||
}
|
||||
|
||||
for (auto it = m_pendingOverlayChanges.begin(); it != m_pendingOverlayChanges.end();) {
|
||||
if (it->accountThingId == thing->id()) {
|
||||
finishPendingActions(it->pendingActions, Thing::ThingErrorThingNotFound);
|
||||
it = m_pendingOverlayChanges.erase(it);
|
||||
continue;
|
||||
}
|
||||
++it;
|
||||
}
|
||||
|
||||
QString accountPrefix = thing->id().toString() + ":";
|
||||
for (auto it = m_pendingRequests.begin(); it != m_pendingRequests.end();) {
|
||||
if (it->zoneKey.startsWith(accountPrefix)) {
|
||||
finishPendingActions(it->actions, Thing::ThingErrorThingNotFound);
|
||||
it = m_pendingRequests.erase(it);
|
||||
continue;
|
||||
}
|
||||
++it;
|
||||
}
|
||||
} else if (thing->thingClassId() == zoneThingClassId) {
|
||||
QString homeId = thing->paramValue(zoneThingHomeIdParamTypeId).toString();
|
||||
QString zoneId = thing->paramValue(zoneThingZoneIdParamTypeId).toString();
|
||||
QString zoneKey = buildZoneKey(thing->parentId(), homeId, zoneId);
|
||||
if (m_pendingOverlayChanges.contains(zoneKey)) {
|
||||
PendingOverlayChange pending = m_pendingOverlayChanges.take(zoneKey);
|
||||
finishPendingActions(pending.pendingActions, Thing::ThingErrorThingNotFound);
|
||||
}
|
||||
for (auto it = m_pendingRequests.begin(); it != m_pendingRequests.end();) {
|
||||
if (it->zoneKey == zoneKey) {
|
||||
finishPendingActions(it->actions, Thing::ThingErrorThingNotFound);
|
||||
it = m_pendingRequests.erase(it);
|
||||
continue;
|
||||
}
|
||||
++it;
|
||||
}
|
||||
tado->deleteLater();
|
||||
}
|
||||
|
||||
// Clean up storage
|
||||
pluginStorage()->remove(thing->id().toString());
|
||||
|
||||
if (myThings().isEmpty()) {
|
||||
if (m_pluginTimer) {
|
||||
m_pluginTimer->deleteLater();
|
||||
m_pluginTimer = nullptr;
|
||||
}
|
||||
if (m_stateSyncTimer.isActive()) {
|
||||
m_stateSyncTimer.stop();
|
||||
}
|
||||
if (myThings().isEmpty() && m_pluginTimer) {
|
||||
m_pluginTimer->deleteLater();
|
||||
m_pluginTimer = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
@ -345,9 +240,6 @@ void IntegrationPluginTado::postSetupThing(Thing *thing)
|
||||
m_pluginTimer = hardwareManager()->pluginTimerManager()->registerTimer(10);
|
||||
connect(m_pluginTimer, &PluginTimer::timeout, this, &IntegrationPluginTado::onPluginTimer);
|
||||
}
|
||||
if (!m_stateSyncTimer.isActive()) {
|
||||
m_stateSyncTimer.start();
|
||||
}
|
||||
|
||||
if (thing->thingClassId() == tadoAccountThingClassId) {
|
||||
Tado *tado = m_tadoAccounts.value(thing->id());
|
||||
@ -370,45 +262,51 @@ void IntegrationPluginTado::executeAction(ThingActionInfo *info)
|
||||
Action action = info->action();
|
||||
|
||||
if (thing->thingClassId() == zoneThingClassId) {
|
||||
if (!m_tadoAccounts.contains(thing->parentId())) {
|
||||
Tado *tado = m_tadoAccounts.value(thing->parentId());
|
||||
if (!tado) {
|
||||
info->finish(Thing::ThingErrorThingNotFound);
|
||||
return;
|
||||
}
|
||||
QString homeId = thing->paramValue(zoneThingHomeIdParamTypeId).toString();
|
||||
QString zoneId = thing->paramValue(zoneThingZoneIdParamTypeId).toString();
|
||||
if (action.actionTypeId() == zoneModeActionTypeId) {
|
||||
OverlayState desired;
|
||||
QString mode = action.param(zoneModeActionModeParamTypeId).value().toString();
|
||||
if (mode == "Tado") {
|
||||
desired.deleteOverlay = true;
|
||||
} else if (mode == "Off") {
|
||||
desired.power = false;
|
||||
desired.temperature = thing->stateValue(zoneTargetTemperatureStateTypeId).toDouble();
|
||||
QUuid requestId;
|
||||
if (action.param(zoneModeActionModeParamTypeId).value().toString() == "Tado") {
|
||||
requestId = tado->deleteOverlay(homeId, zoneId);
|
||||
} else if (action.param(zoneModeActionModeParamTypeId).value().toString() == "Off") {
|
||||
requestId = tado->setOverlay(homeId, zoneId, false, thing->stateValue(zoneTargetTemperatureStateTypeId).toDouble());
|
||||
} else {
|
||||
desired.power = true;
|
||||
double targetTemperature = thing->stateValue(zoneTargetTemperatureStateTypeId).toDouble();
|
||||
desired.temperature = targetTemperature <= 5.0 ? 5.0 : targetTemperature;
|
||||
if(thing->stateValue(zoneTargetTemperatureStateTypeId).toDouble() <= 5.0) {
|
||||
requestId = tado->setOverlay(homeId, zoneId, true, 5);
|
||||
} else {
|
||||
requestId = tado->setOverlay(homeId, zoneId, true, thing->stateValue(zoneTargetTemperatureStateTypeId).toDouble());
|
||||
}
|
||||
}
|
||||
queueOverlayChange(info, homeId, zoneId, desired);
|
||||
m_asyncActions.insert(requestId, info);
|
||||
connect(info, &ThingActionInfo::aborted, thing, [requestId, this] {m_asyncActions.remove(requestId);});
|
||||
} else if (action.actionTypeId() == zoneTargetTemperatureActionTypeId) {
|
||||
|
||||
double temperature = action.param(zoneTargetTemperatureActionTargetTemperatureParamTypeId).value().toDouble();
|
||||
OverlayState desired;
|
||||
QUuid requestId;
|
||||
if (temperature <= 0) {
|
||||
desired.power = false;
|
||||
desired.temperature = 0;
|
||||
requestId = tado->setOverlay(homeId, zoneId, false, 0);
|
||||
} else {
|
||||
desired.power = true;
|
||||
desired.temperature = temperature;
|
||||
requestId = tado->setOverlay(homeId, zoneId, true, temperature);
|
||||
}
|
||||
queueOverlayChange(info, homeId, zoneId, desired);
|
||||
m_asyncActions.insert(requestId, info);
|
||||
connect(info, &ThingActionInfo::aborted, thing, [requestId, this] {m_asyncActions.remove(requestId);});
|
||||
} else if (action.actionTypeId() == zonePowerActionTypeId) {
|
||||
bool power = action.param(zonePowerActionPowerParamTypeId).value().toBool();
|
||||
thing->setStateValue(zonePowerStateTypeId, power); // the actual power set response might be slow
|
||||
OverlayState desired;
|
||||
QUuid requestId;
|
||||
double temperature = thing->stateValue(zoneTargetTemperatureStateTypeId).toDouble();
|
||||
desired.power = power;
|
||||
desired.temperature = power ? temperature : 0;
|
||||
queueOverlayChange(info, homeId, zoneId, desired);
|
||||
if (!power) {
|
||||
requestId = tado->setOverlay(homeId, zoneId, false, 0);
|
||||
} else {
|
||||
requestId = tado->setOverlay(homeId, zoneId, true, temperature);
|
||||
}
|
||||
m_asyncActions.insert(requestId, info);
|
||||
connect(info, &ThingActionInfo::aborted, thing, [requestId, this] {m_asyncActions.remove(requestId);});
|
||||
} else {
|
||||
qCWarning(dcTado()) << "Execute action, unhandled actionTypeId" << action.actionTypeId();
|
||||
info->finish(Thing::ThingErrorActionTypeNotFound);
|
||||
@ -419,69 +317,9 @@ void IntegrationPluginTado::executeAction(ThingActionInfo *info)
|
||||
}
|
||||
}
|
||||
|
||||
void IntegrationPluginTado::syncPendingOverlays()
|
||||
{
|
||||
if (m_pendingOverlayChanges.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (auto it = m_pendingOverlayChanges.begin(); it != m_pendingOverlayChanges.end(); ++it) {
|
||||
PendingOverlayChange &pending = it.value();
|
||||
if (!pending.dirty) {
|
||||
if (!pending.pendingActions.isEmpty()) {
|
||||
finishPendingActions(pending.pendingActions, Thing::ThingErrorNoError);
|
||||
pending.pendingActions.clear();
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if (pending.inFlightValid) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (pending.lastSyncedValid && overlayStatesEqual(pending.desired, pending.lastSynced)) {
|
||||
pending.dirty = false;
|
||||
if (!pending.pendingActions.isEmpty()) {
|
||||
finishPendingActions(pending.pendingActions, Thing::ThingErrorNoError);
|
||||
pending.pendingActions.clear();
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
Tado *tado = m_tadoAccounts.value(pending.accountThingId);
|
||||
if (!tado) {
|
||||
if (!pending.pendingActions.isEmpty()) {
|
||||
finishPendingActions(pending.pendingActions, Thing::ThingErrorThingNotFound);
|
||||
pending.pendingActions.clear();
|
||||
}
|
||||
pending.dirty = false;
|
||||
continue;
|
||||
}
|
||||
|
||||
QUuid requestId;
|
||||
if (pending.desired.deleteOverlay) {
|
||||
requestId = tado->deleteOverlay(pending.homeId, pending.zoneId);
|
||||
} else {
|
||||
requestId = tado->setOverlay(pending.homeId, pending.zoneId, pending.desired.power, pending.desired.temperature);
|
||||
}
|
||||
|
||||
if (requestId.isNull()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
PendingRequest request;
|
||||
request.zoneKey = it.key();
|
||||
request.actions = pending.pendingActions;
|
||||
request.sentState = pending.desired;
|
||||
pending.pendingActions.clear();
|
||||
pending.inFlightValid = true;
|
||||
m_pendingRequests.insert(requestId, request);
|
||||
}
|
||||
}
|
||||
|
||||
void IntegrationPluginTado::onPluginTimer()
|
||||
{
|
||||
Q_FOREACH (Tado *tado, m_tadoAccounts) {
|
||||
Q_FOREACH(Tado *tado, m_tadoAccounts){
|
||||
ThingId accountThingId = m_tadoAccounts.key(tado);
|
||||
if (!tado->authenticated()) {
|
||||
tado->getAccessToken();
|
||||
@ -499,9 +337,9 @@ void IntegrationPluginTado::onPluginTimer()
|
||||
|
||||
void IntegrationPluginTado::onConnectionChanged(bool connected)
|
||||
{
|
||||
Tado *tado = static_cast<Tado *>(sender());
|
||||
Tado *tado = static_cast<Tado*>(sender());
|
||||
|
||||
if (m_tadoAccounts.values().contains(tado)) {
|
||||
if (m_tadoAccounts.values().contains(tado)){
|
||||
Thing *thing = myThings().findById(m_tadoAccounts.key(tado));
|
||||
if (!thing)
|
||||
return;
|
||||
@ -519,11 +357,11 @@ void IntegrationPluginTado::onConnectionChanged(bool connected)
|
||||
|
||||
void IntegrationPluginTado::onAuthenticationStatusChanged(bool authenticated)
|
||||
{
|
||||
Tado *tado = static_cast<Tado *>(sender());
|
||||
Tado *tado = static_cast<Tado*>(sender());
|
||||
|
||||
if (m_tadoAccounts.values().contains(tado)) {
|
||||
if (m_tadoAccounts.values().contains(tado)){
|
||||
Thing *thing = myThings().findById(m_tadoAccounts.key(tado));
|
||||
if (!thing) {
|
||||
if (!thing){
|
||||
qCWarning(dcTado()) << "OnAuthenticationChanged no thing found by ID" << m_tadoAccounts.key(tado);
|
||||
return;
|
||||
}
|
||||
@ -540,9 +378,9 @@ void IntegrationPluginTado::onAuthenticationStatusChanged(bool authenticated)
|
||||
|
||||
void IntegrationPluginTado::onUsernameChanged(const QString &username)
|
||||
{
|
||||
Tado *tado = static_cast<Tado *>(sender());
|
||||
Tado *tado = static_cast<Tado*>(sender());
|
||||
|
||||
if (m_tadoAccounts.values().contains(tado)) {
|
||||
if (m_tadoAccounts.values().contains(tado)){
|
||||
Thing *thing = myThings().findById(m_tadoAccounts.key(tado));
|
||||
thing->setStateValue(tadoAccountUserDisplayNameStateTypeId, username);
|
||||
}
|
||||
@ -550,39 +388,20 @@ void IntegrationPluginTado::onUsernameChanged(const QString &username)
|
||||
|
||||
void IntegrationPluginTado::onRequestExecuted(QUuid requestId, bool success)
|
||||
{
|
||||
if (!m_pendingRequests.contains(requestId)) {
|
||||
return;
|
||||
}
|
||||
|
||||
PendingRequest request = m_pendingRequests.take(requestId);
|
||||
finishPendingActions(request.actions, success ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareNotAvailable);
|
||||
|
||||
if (!m_pendingOverlayChanges.contains(request.zoneKey)) {
|
||||
return;
|
||||
}
|
||||
|
||||
PendingOverlayChange &pending = m_pendingOverlayChanges[request.zoneKey];
|
||||
pending.inFlightValid = false;
|
||||
if (success) {
|
||||
pending.lastSynced = request.sentState;
|
||||
pending.lastSyncedValid = true;
|
||||
}
|
||||
|
||||
if (pending.lastSyncedValid && overlayStatesEqual(pending.desired, pending.lastSynced)) {
|
||||
pending.dirty = false;
|
||||
if (!pending.pendingActions.isEmpty()) {
|
||||
finishPendingActions(pending.pendingActions, Thing::ThingErrorNoError);
|
||||
pending.pendingActions.clear();
|
||||
if (m_asyncActions.contains(requestId)) {
|
||||
ThingActionInfo *info = m_asyncActions.take(requestId);
|
||||
if (success) {
|
||||
info->finish(Thing::ThingErrorNoError);
|
||||
} else {
|
||||
info->finish(Thing::ThingErrorHardwareNotAvailable);
|
||||
}
|
||||
} else {
|
||||
pending.dirty = true;
|
||||
}
|
||||
}
|
||||
|
||||
void IntegrationPluginTado::onHomesReceived(QList<Tado::Home> homes)
|
||||
{
|
||||
qCDebug(dcTado()) << "Homes received";
|
||||
Tado *tado = static_cast<Tado *>(sender());
|
||||
Tado *tado = static_cast<Tado*>(sender());
|
||||
foreach (Tado::Home home, homes) {
|
||||
tado->getZones(home.id);
|
||||
}
|
||||
@ -590,14 +409,16 @@ void IntegrationPluginTado::onHomesReceived(QList<Tado::Home> homes)
|
||||
|
||||
void IntegrationPluginTado::onZonesReceived(const QString &homeId, QList<Tado::Zone> zones)
|
||||
{
|
||||
Tado *tado = static_cast<Tado *>(sender());
|
||||
Tado *tado = static_cast<Tado*>(sender());
|
||||
|
||||
if (m_tadoAccounts.values().contains(tado)) {
|
||||
|
||||
Thing *parentDevice = myThings().findById(m_tadoAccounts.key(tado));
|
||||
qCDebug(dcTado()) << "Zones received:" << zones.count() << parentDevice->name();
|
||||
|
||||
ThingDescriptors descriptors;
|
||||
foreach (Tado::Zone zone, zones) {
|
||||
|
||||
ThingDescriptor descriptor(zoneThingClassId, zone.name, "Type:" + zone.type, parentDevice->id());
|
||||
ParamList params;
|
||||
params.append(Param(zoneThingHomeIdParamTypeId, homeId));
|
||||
@ -617,7 +438,7 @@ void IntegrationPluginTado::onZonesReceived(const QString &homeId, QList<Tado::Z
|
||||
|
||||
void IntegrationPluginTado::onZoneStateReceived(const QString &homeId, const QString &zoneId, Tado::ZoneState state)
|
||||
{
|
||||
Tado *tado = static_cast<Tado *>(sender());
|
||||
Tado *tado = static_cast<Tado*>(sender());
|
||||
ThingId parentId = m_tadoAccounts.key(tado);
|
||||
ParamList params;
|
||||
params.append(Param(zoneThingHomeIdParamTypeId, homeId));
|
||||
@ -626,7 +447,7 @@ void IntegrationPluginTado::onZoneStateReceived(const QString &homeId, const QSt
|
||||
if (!thing)
|
||||
return;
|
||||
|
||||
if (state.overlayIsSet) {
|
||||
if (state.overlayIsSet) {
|
||||
if (state.overlaySettingPower) {
|
||||
thing->setStateValue(zoneModeStateTypeId, "Manual");
|
||||
} else {
|
||||
@ -647,7 +468,7 @@ void IntegrationPluginTado::onZoneStateReceived(const QString &homeId, const QSt
|
||||
|
||||
void IntegrationPluginTado::onOverlayReceived(const QString &homeId, const QString &zoneId, const Tado::Overlay &overlay)
|
||||
{
|
||||
Tado *tado = static_cast<Tado *>(sender());
|
||||
Tado *tado = static_cast<Tado*>(sender());
|
||||
ThingId parentId = m_tadoAccounts.key(tado);
|
||||
ParamList params;
|
||||
params.append(Param(zoneThingHomeIdParamTypeId, homeId));
|
||||
@ -657,7 +478,7 @@ void IntegrationPluginTado::onOverlayReceived(const QString &homeId, const QStri
|
||||
return;
|
||||
thing->setStateValue(zoneTargetTemperatureStateTypeId, overlay.temperature);
|
||||
|
||||
if (overlay.tadoMode == "MANUAL") {
|
||||
if (overlay.tadoMode == "MANUAL") {
|
||||
if (overlay.power) {
|
||||
thing->setStateValue(zoneModeStateTypeId, "Manual");
|
||||
} else {
|
||||
|
||||
@ -26,11 +26,10 @@
|
||||
#define INTEGRATIONPLUGINTADO_H
|
||||
|
||||
#include <integrations/integrationplugin.h>
|
||||
#include <network/oauth2.h>
|
||||
#include <plugintimer.h>
|
||||
#include <network/oauth2.h>
|
||||
|
||||
#include <QHash>
|
||||
#include <QList>
|
||||
#include <QTimer>
|
||||
|
||||
#include "extern-plugininfo.h"
|
||||
@ -56,49 +55,14 @@ public:
|
||||
void executeAction(ThingActionInfo *info) override;
|
||||
|
||||
private:
|
||||
struct OverlayState
|
||||
{
|
||||
bool deleteOverlay = false;
|
||||
bool power = false;
|
||||
double temperature = 0.0;
|
||||
};
|
||||
|
||||
struct PendingOverlayChange
|
||||
{
|
||||
ThingId accountThingId;
|
||||
QString homeId;
|
||||
QString zoneId;
|
||||
OverlayState desired;
|
||||
OverlayState lastSynced;
|
||||
bool dirty = false;
|
||||
bool lastSyncedValid = false;
|
||||
bool inFlightValid = false;
|
||||
QList<ThingActionInfo *> pendingActions;
|
||||
};
|
||||
|
||||
struct PendingRequest
|
||||
{
|
||||
QString zoneKey;
|
||||
QList<ThingActionInfo *> actions;
|
||||
OverlayState sentState;
|
||||
};
|
||||
|
||||
PluginTimer *m_pluginTimer = nullptr;
|
||||
QHash<ThingId, Tado *> m_unfinishedTadoAccounts;
|
||||
|
||||
QHash<ThingId, Tado *> m_tadoAccounts;
|
||||
QTimer m_stateSyncTimer;
|
||||
QHash<QString, PendingOverlayChange> m_pendingOverlayChanges;
|
||||
QHash<QUuid, PendingRequest> m_pendingRequests;
|
||||
|
||||
static QString buildZoneKey(const ThingId &accountThingId, const QString &homeId, const QString &zoneId);
|
||||
static bool overlayStatesEqual(const OverlayState &first, const OverlayState &second);
|
||||
void queueOverlayChange(ThingActionInfo *info, const QString &homeId, const QString &zoneId, const OverlayState &desired);
|
||||
void removePendingAction(ThingActionInfo *info);
|
||||
QHash<QUuid, ThingActionInfo *> m_asyncActions;
|
||||
|
||||
private slots:
|
||||
void onPluginTimer();
|
||||
void syncPendingOverlays();
|
||||
|
||||
void onConnectionChanged(bool connected);
|
||||
void onAuthenticationStatusChanged(bool authenticated);
|
||||
@ -106,7 +70,7 @@ private slots:
|
||||
void onRequestExecuted(QUuid requestId, bool success);
|
||||
void onHomesReceived(QList<Tado::Home> homes);
|
||||
void onZonesReceived(const QString &homeId, QList<Tado::Zone> zones);
|
||||
void onZoneStateReceived(const QString &homeId, const QString &zoneId, Tado::ZoneState sate);
|
||||
void onZoneStateReceived(const QString &homeId,const QString &zoneId, Tado::ZoneState sate);
|
||||
void onOverlayReceived(const QString &homeId, const QString &zoneId, const Tado::Overlay &overlay);
|
||||
};
|
||||
|
||||
|
||||
@ -25,14 +25,14 @@
|
||||
#include "tado.h"
|
||||
#include "extern-plugininfo.h"
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QUrlQuery>
|
||||
|
||||
Tado::Tado(NetworkAccessManager *networkManager, QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_networkManager(networkManager)
|
||||
Tado::Tado(NetworkAccessManager *networkManager, QObject *parent) :
|
||||
QObject(parent),
|
||||
m_networkManager(networkManager)
|
||||
{
|
||||
m_baseControlUrl = "https://my.tado.com/api/v2";
|
||||
m_baseAuthorizationUrl = "https://login.tado.com/oauth2";
|
||||
@ -40,14 +40,14 @@ Tado::Tado(NetworkAccessManager *networkManager, QObject *parent)
|
||||
m_clientId = "1bb50063-6b0c-4d11-bd99-387f4a91cc46";
|
||||
|
||||
m_refreshTimer.setSingleShot(true);
|
||||
connect(&m_refreshTimer, &QTimer::timeout, this, [this]() {
|
||||
connect(&m_refreshTimer, &QTimer::timeout, this, [this](){
|
||||
qCDebug(dcTado()) << "Refresh token...";
|
||||
getAccessToken();
|
||||
});
|
||||
|
||||
m_pollAuthenticationTimer.setSingleShot(true);
|
||||
m_pollAuthenticationTimer.setInterval(2000);
|
||||
connect(&m_pollAuthenticationTimer, &QTimer::timeout, this, [this]() {
|
||||
connect(&m_pollAuthenticationTimer, &QTimer::timeout, this, [this](){
|
||||
qCDebug(dcTado()) << "Checking authentication status...";
|
||||
requestAuthenticationToken();
|
||||
});
|
||||
@ -68,6 +68,7 @@ bool Tado::connected()
|
||||
return m_connectionStatus;
|
||||
}
|
||||
|
||||
|
||||
QString Tado::loginUrl() const
|
||||
{
|
||||
return m_loginUrl;
|
||||
@ -111,6 +112,7 @@ void Tado::getLoginUrl()
|
||||
QNetworkReply *reply = m_networkManager->post(request, payload);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, this, [reply, this] {
|
||||
|
||||
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
// Check HTTP status code
|
||||
if (status != 200 || reply->error() != QNetworkReply::NoError) {
|
||||
@ -155,6 +157,7 @@ void Tado::getLoginUrl()
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
void Tado::getAccessToken()
|
||||
{
|
||||
QNetworkRequest request = QNetworkRequest(QUrl(m_baseAuthorizationUrl + "/token"));
|
||||
@ -172,10 +175,12 @@ void Tado::getAccessToken()
|
||||
QNetworkReply *reply = m_networkManager->post(request, payload);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, this, [reply, this] {
|
||||
|
||||
QByteArray data = reply->readAll();
|
||||
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
// Check HTTP status code
|
||||
if (status != 200 || reply->error() != QNetworkReply::NoError) {
|
||||
|
||||
emit connectionError(reply->error());
|
||||
|
||||
if (reply->error() == QNetworkReply::HostNotFoundError)
|
||||
@ -211,6 +216,7 @@ void Tado::getAccessToken()
|
||||
emit refreshTokenReceived(m_refreshToken);
|
||||
}
|
||||
|
||||
|
||||
setAuthenticationStatus(true);
|
||||
|
||||
// Refresh 10 sekonds before expiration
|
||||
@ -226,7 +232,7 @@ void Tado::getHomes()
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_accessToken.isEmpty()) {
|
||||
if(m_accessToken.isEmpty()) {
|
||||
qCWarning(dcTado()) << "Not sending request, get the access token first";
|
||||
return;
|
||||
}
|
||||
@ -238,6 +244,7 @@ void Tado::getHomes()
|
||||
//qCDebug(dcTado()) << "Sending request" << request.url() << request.rawHeaderList();
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, this, [reply, this] {
|
||||
|
||||
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
|
||||
// Check HTTP status code
|
||||
@ -292,7 +299,7 @@ void Tado::getZones(const QString &homeId)
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_accessToken.isEmpty()) {
|
||||
if(m_accessToken.isEmpty()) {
|
||||
qCWarning(dcTado()) << "Not sending request, get the access token first";
|
||||
return;
|
||||
}
|
||||
@ -305,6 +312,7 @@ void Tado::getZones(const QString &homeId)
|
||||
//qCDebug(dcTado()) << "Sending request" << request.url() << request.rawHeaderList();
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, this, [reply, homeId, this] {
|
||||
|
||||
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
|
||||
// Check HTTP status code
|
||||
@ -348,7 +356,7 @@ void Tado::getZoneState(const QString &homeId, const QString &zoneId)
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_accessToken.isEmpty()) {
|
||||
if(m_accessToken.isEmpty()) {
|
||||
qCWarning(dcTado()) << "Not sending request, get the access token first";
|
||||
return;
|
||||
}
|
||||
@ -361,6 +369,7 @@ void Tado::getZoneState(const QString &homeId, const QString &zoneId)
|
||||
//qCDebug(dcTado()) << "Sending request" << request.url() << request.rawHeaderList();
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, this, [reply, homeId, zoneId, this] {
|
||||
|
||||
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
|
||||
// Check HTTP status code
|
||||
@ -377,6 +386,7 @@ void Tado::getZoneState(const QString &homeId, const QString &zoneId)
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
setConnectionStatus(true);
|
||||
setAuthenticationStatus(true);
|
||||
|
||||
@ -406,7 +416,7 @@ void Tado::getZoneState(const QString &homeId, const QString &zoneId)
|
||||
state.temperature = dataMap["insideTemperature"].toMap().value("celsius").toDouble();
|
||||
state.humidity = dataMap["humidity"].toMap().value("percentage").toDouble();
|
||||
|
||||
if (!map["overlay"].toMap().isEmpty()) {
|
||||
if (!map["overlay"].toMap().isEmpty()){
|
||||
state.overlayIsSet = true;
|
||||
QVariantMap overlayMap = map["overlay"].toMap();
|
||||
state.overlayType = map["overlayType"].toString();
|
||||
@ -426,7 +436,7 @@ QUuid Tado::setOverlay(const QString &homeId, const QString &zoneId, bool power,
|
||||
return QUuid();
|
||||
}
|
||||
|
||||
if (m_accessToken.isEmpty()) {
|
||||
if(m_accessToken.isEmpty()) {
|
||||
qCWarning(dcTado()) << "Not sending request, get the access token first";
|
||||
return QUuid();
|
||||
}
|
||||
@ -444,13 +454,13 @@ QUuid Tado::setOverlay(const QString &homeId, const QString &zoneId, bool power,
|
||||
else
|
||||
powerString = "OFF";
|
||||
|
||||
body.append("{\"setting\":{\"type\":\"HEATING\",\"power\":\"" + powerString + "\",\"temperature\":{\"celsius\":" + QVariant(targetTemperature).toByteArray()
|
||||
+ "}},\"termination\":{\"type\":\"MANUAL\"}}");
|
||||
body.append("{\"setting\":{\"type\":\"HEATING\",\"power\":\"" + powerString + "\",\"temperature\":{\"celsius\":" + QVariant(targetTemperature).toByteArray() + "}},\"termination\":{\"type\":\"MANUAL\"}}");
|
||||
|
||||
//qCDebug(dcTado()) << "Sending request" << body;
|
||||
QNetworkReply *reply = m_networkManager->put(request, body);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, this, [homeId, zoneId, requestId, reply, this] {
|
||||
|
||||
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
if (status != 200 || reply->error() != QNetworkReply::NoError) {
|
||||
emit requestExecuted(requestId, false);
|
||||
@ -503,7 +513,7 @@ QUuid Tado::deleteOverlay(const QString &homeId, const QString &zoneId)
|
||||
return QUuid();
|
||||
}
|
||||
|
||||
if (m_accessToken.isEmpty()) {
|
||||
if(m_accessToken.isEmpty()) {
|
||||
qCWarning(dcTado()) << "Not sending request, get the access token first";
|
||||
return QUuid();
|
||||
}
|
||||
@ -515,9 +525,11 @@ QUuid Tado::deleteOverlay(const QString &homeId, const QString &zoneId)
|
||||
QNetworkReply *reply = m_networkManager->deleteResource(request);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, this, [homeId, zoneId, requestId, reply, this] {
|
||||
|
||||
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
if (status < 200 || status > 210 || reply->error() != QNetworkReply::NoError) {
|
||||
emit requestExecuted(requestId, false);
|
||||
|
||||
emit requestExecuted(requestId ,false);
|
||||
emit connectionError(reply->error());
|
||||
|
||||
if (reply->error() == QNetworkReply::HostNotFoundError) {
|
||||
@ -578,6 +590,7 @@ void Tado::requestAuthenticationToken()
|
||||
QNetworkReply *reply = m_networkManager->post(request, payload);
|
||||
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
|
||||
connect(reply, &QNetworkReply::finished, this, [reply, this] {
|
||||
|
||||
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
if (status != 200 || reply->error() != QNetworkReply::NoError) {
|
||||
qCDebug(dcTado()) << "Request error:" << status << "Retrying:" << m_pollAuthenticationCount << "/" << m_pollAuthenticationLimit;
|
||||
@ -630,6 +643,7 @@ void Tado::setAuthenticationStatus(bool status)
|
||||
|
||||
if (!status)
|
||||
m_refreshTimer.stop();
|
||||
|
||||
}
|
||||
|
||||
void Tado::setConnectionStatus(bool status)
|
||||
|
||||
27
tado/tado.h
27
tado/tado.h
@ -25,8 +25,8 @@
|
||||
#ifndef TADO_H
|
||||
#define TADO_H
|
||||
|
||||
#include <integrations/thing.h>
|
||||
#include <network/networkaccessmanager.h>
|
||||
#include <integrations/thing.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
@ -36,24 +36,21 @@ class Tado : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
struct Zone
|
||||
{
|
||||
struct Zone {
|
||||
QString id;
|
||||
QString name;
|
||||
QString type;
|
||||
};
|
||||
|
||||
struct Overlay
|
||||
{
|
||||
bool power;
|
||||
double temperature;
|
||||
QString zoneType;
|
||||
QString terminationType;
|
||||
QString tadoMode;
|
||||
struct Overlay {
|
||||
bool power;
|
||||
double temperature;
|
||||
QString zoneType;
|
||||
QString terminationType;
|
||||
QString tadoMode;
|
||||
};
|
||||
|
||||
struct ZoneState
|
||||
{
|
||||
struct ZoneState {
|
||||
bool connected = false;
|
||||
bool power = false;
|
||||
QString tadoMode;
|
||||
@ -71,8 +68,7 @@ public:
|
||||
QString overlayType;
|
||||
};
|
||||
|
||||
struct Home
|
||||
{
|
||||
struct Home {
|
||||
QString id;
|
||||
QString name;
|
||||
};
|
||||
@ -142,9 +138,10 @@ signals:
|
||||
|
||||
void homesReceived(QList<Tado::Home> homes);
|
||||
void zonesReceived(const QString &homeId, QList<Tado::Zone> zones);
|
||||
void zoneStateReceived(const QString &homeId, const QString &zoneId, Tado::ZoneState sate);
|
||||
void zoneStateReceived(const QString &homeId,const QString &zoneId, Tado::ZoneState sate);
|
||||
void overlayReceived(const QString &homeId, const QString &zoneId, const Tado::Overlay &overlay);
|
||||
void connectionError(QNetworkReply::NetworkError error);
|
||||
|
||||
};
|
||||
|
||||
#endif // TADO_H
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user