Skip to content

Commit

Permalink
v3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
demel42 committed Oct 15, 2023
1 parent 09f4e44 commit 06a690b
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .style
Submodule .style updated 1 files
+1 −1 .php-cs-fixer.php
14 changes: 9 additions & 5 deletions AutomowerConnectConfig/module.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@ class AutomowerConnectConfig extends IPSModule
use AutomowerConnect\StubsCommonLib;
use AutomowerConnectLocalLib;

private $ModuleDir;

public function __construct(string $InstanceID)
{
parent::__construct($InstanceID);

$this->ModuleDir = __DIR__;
$this->CommonContruct(__DIR__);
}

public function __destruct()
{
$this->CommonDestruct();
}

public function Create()
Expand All @@ -25,8 +28,9 @@ public function Create()

$this->RegisterPropertyInteger('ImportCategoryID', 0);

$this->RegisterAttributeString('UpdateInfo', '');
$this->RegisterAttributeString('DataCache', '');
$this->RegisterAttributeString('UpdateInfo', json_encode([]));
$this->RegisterAttributeString('ModuleStats', json_encode([]));
$this->RegisterAttributeString('DataCache', json_encode([]));

$this->ConnectParent('{AEEFAA3E-8802-086D-6620-E971C03CBEFC}');
}
Expand Down
17 changes: 8 additions & 9 deletions AutomowerConnectDevice/module.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@ class AutomowerConnectDevice extends IPSModule
use AutomowerConnect\StubsCommonLib;
use AutomowerConnectLocalLib;

private $ModuleDir;

public function __construct(string $InstanceID)
{
parent::__construct($InstanceID);

$this->ModuleDir = __DIR__;
$this->CommonContruct(__DIR__);
}

public function __destruct()
{
$this->CommonDestruct();
}

public function Create()
Expand Down Expand Up @@ -47,7 +50,8 @@ public function Create()
$this->RegisterAttributeInteger('WorkingStart', 0);
$this->RegisterAttributeInteger('DailyWorking', 0);

$this->RegisterAttributeString('UpdateInfo', '');
$this->RegisterAttributeString('UpdateInfo', json_encode([]));
$this->RegisterAttributeString('ModuleStats', json_encode([]));

$this->InstallVarProfiles(false);

Expand Down Expand Up @@ -366,11 +370,6 @@ private function GetFormActions()
'caption' => 'Update status',
'onClick' => 'IPS_RequestAction(' . $this->InstanceID . ', "UpdateStatus", "");',
];
$formActions[] = [
'type' => 'Button',
'caption' => 'force restart',
'onClick' => 'IPS_RequestAction(' . $this->InstanceID . ', "MowerActionStart", 0);',
];

$formActions[] = [
'type' => 'ExpansionPanel',
Expand Down
11 changes: 8 additions & 3 deletions AutomowerConnectSplitter/module.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,21 @@ class AutomowerConnectSplitter extends IPSModule

private static $semaphoreTM = 5 * 1000;

private $ModuleDir;
private $SemaphoreID;

public function __construct(string $InstanceID)
{
parent::__construct($InstanceID);

$this->ModuleDir = __DIR__;
$this->CommonContruct(__DIR__);
$this->SemaphoreID = __CLASS__ . '_' . $InstanceID;
}

public function __destruct()
{
$this->CommonDestruct();
}

public function Create()
{
parent::Create();
Expand All @@ -43,8 +47,9 @@ public function Create()
$this->RegisterPropertyString('api_key', '');
$this->RegisterPropertyString('api_secret', '');

$this->RegisterAttributeString('UpdateInfo', '');
$this->RegisterAttributeString('UpdateInfo', json_encode([]));
$this->RegisterAttributeString('ApiCallStats', json_encode([]));
$this->RegisterAttributeString('ModuleStats', json_encode([]));

$this->SetBuffer('LastApiCall', 0);

Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,11 @@ Quellen:

## 7. Versions-Historie

- 3.1 @ 15.10.2023 13:51
- Neu: Ermittlung von Speicherbedarf und Laufzeit (aktuell und für 31 Tage) und Anzeige im Panel "Information"
- Fix: ApiCalls werden nicht mehr nach uri sondern nur noch host+cmd differenzieren
- update submodule CommonStubs

- 3.0 @ 05.07.2023 17:02
- Neu: unlimited Symcon-API-Key (bei Login via OAuth mittels SymconConnect)
- Neu: Benutzung der WebSocket-Schnittstelle von Husqvarna. Hierüber werden alle Änderungsmeldung des Mähers umgehend empfangen ohne zyklischen Datenabruf!
Expand Down
4 changes: 2 additions & 2 deletions library.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"compatibility": {
"version": "6.2"
},
"version": "3.0",
"version": "3.1",
"build": 0,
"date": 1688570166
"date": 1697112940
}
2 changes: 1 addition & 1 deletion libs/CommonStubs
Submodule CommonStubs updated 3 files
+10 −0 README.md
+329 −30 common.php
+10 −0 translation.json

0 comments on commit 06a690b

Please sign in to comment.