Skip to content

Commit

Permalink
Revert "incorporate #347"
Browse files Browse the repository at this point in the history
This reverts commit bd519a5.
  • Loading branch information
Apollon77 committed Jan 25, 2025
1 parent bd519a5 commit 7cdc578
Show file tree
Hide file tree
Showing 4 changed files with 105 additions and 62 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ With the ioBroker Matter Adapter it is possible to map the following use cases:
### __WORK IN PROGRESS__
* (@Apollon77) Fixed Thermostat initialization logic and added more logging
* (@Apollon77) Updated matter.js for further optimizations
* (@bluefox) Optimized UI

### 0.4.4 (2025-01-24)
* (@Apollon77) Added OPEN state for all Door Locks to open door again
Expand Down
142 changes: 93 additions & 49 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"dependencies": {
"@iobroker/adapter-core": "^3.2.3",
"@iobroker/i18n": "^0.3.1",
"@iobroker/dm-utils": "^1.0.8",
"@iobroker/dm-utils": "^1.0.7",
"@iobroker/type-detector": "^4.1.1",
"@matter/main": "0.12.1",
"@matter/nodejs": "0.12.1",
Expand All @@ -40,17 +40,17 @@
"@alcalzone/release-script": "^3.8.0",
"@alcalzone/release-script-plugin-iobroker": "^3.7.2",
"@alcalzone/release-script-plugin-license": "^3.7.0",
"@iobroker/build-tools": "^2.0.15",
"@iobroker/build-tools": "^2.0.14",
"@iobroker/dev-server": "^0.7.3",
"@iobroker/eslint-config": "^1.0.0",
"@iobroker/legacy-testing": "^2.0.2",
"@iobroker/types": "^7.0.6",
"@types/jsonwebtoken": "^9.0.8",
"@types/node": "^22.10.10",
"@types/jsonwebtoken": "^9.0.7",
"@types/node": "^22.10.7",
"chai": "^4.5.0",
"colorette": "^2.0.20",
"mocha": "^11.1.0",
"puppeteer": "^24.1.1",
"mocha": "^11.0.1",
"puppeteer": "^24.1.0",
"typescript": "~5.7.3"
},
"bugs": {
Expand Down
12 changes: 6 additions & 6 deletions src/lib/DeviceManagement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class MatterAdapterDeviceManagement extends DeviceManagement<MatterAdapter> {
/**
* Create the "Node" device entry and also add all Endpoint-"Devices" for Device-Manager
*/
async #getNodeEntry(ioNode: GeneralMatterNode, backgroundColor: 'primary' | 'secondary'): Promise<DeviceInfo[]> {
async #getNodeEntry(ioNode: GeneralMatterNode, color: 'primary' | 'secondary'): Promise<DeviceInfo[]> {
const status: DeviceStatus = await ioNode.getStatus();
const isEnabled = ioNode.isEnabled;
const isConnected = ioNode.isConnected;
Expand Down Expand Up @@ -193,8 +193,8 @@ class MatterAdapterDeviceManagement extends DeviceManagement<MatterAdapter> {
connectionType,
hasDetails: true,
actions: actions.length ? (actions as DeviceAction<'adapter'>[]) : undefined,
backgroundColor,
color: '#002346',
color,
headerTextColor: '#002346',
group: {
key: 'node',
name: this.#adapter.getText('Node'),
Expand All @@ -213,7 +213,7 @@ class MatterAdapterDeviceManagement extends DeviceManagement<MatterAdapter> {
details,
isConnected,
connectionType,
backgroundColor,
color,
);
res.push(deviceInfo);
deviceCount++;
Expand All @@ -236,15 +236,15 @@ class MatterAdapterDeviceManagement extends DeviceManagement<MatterAdapter> {
nodeDetails: NodeDetails,
nodeConnected: boolean,
nodeConnectionType: ConfigConnectionType,
backgroundColor: 'primary' | 'secondary',
color: 'primary' | 'secondary',
): Promise<DeviceInfo> {
const icon = device.iconDeviceType;
const data: DeviceInfo = {
id: `${nodeId}-${device.number}`,
name: device.name,
icon,
...nodeDetails,
backgroundColor,
color,
status: await device.getStatus({
connection: nodeConnected ? 'connected' : 'disconnected',
}),
Expand Down

0 comments on commit 7cdc578

Please sign in to comment.