Skip to content

Commit

Permalink
Merge pull request #84 from Luligu/dev
Browse files Browse the repository at this point in the history
Release 2.2.2
  • Loading branch information
Luligu authored Nov 26, 2024
2 parents dc90fec + 2958474 commit 1e49c14
Show file tree
Hide file tree
Showing 21 changed files with 10,102 additions and 1,183 deletions.
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,5 @@ hs_err_pid*
replay_pid*

# zigbee2mqtt
bridge-info.json
bridge-devices.json
bridge-groups.json
temp/
TODO.md
2 changes: 2 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -162,5 +162,7 @@ jest.config.js
screenshot

# other stuff
temp/
mock/
TODO.md
yellow-button.png
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,32 @@ If you like this project and find it useful, please consider giving it a star on

All notable changes to this project will be documented in this file.

## [2.2.2] - 2024-11-26

### Added

- [thermostat]: Added min_temperature_limit and max_temperature_limit converter to thermostats.
- [thermostat]: Added min_heat_setpoint_limit and max_heat_setpoint_limit converter to thermostats.
- [thermostat]: Added configuration for heat only and cool only thermostats.
- [matter]: Added tagList to child endpoints.

### Changed

- [mqtt]: Username and password are passed like undefined unless set.
- [readme]: Updated install script.
- [readme]: Updated build script.
- [package]: Updated dependencies.
- [plugin]: Requires Matterbridge 1.6.2.

### Fixed

- [thermostat]: Fixed the case when instead of current_heating_setpoint the property is occupied_heating_setpoint.
- [thermostat]: Fixed the case when instead of current_cooling_setpoint the property is occupied_cooling_setpoint.

<a href="https://www.buymeacoffee.com/luligugithub">
<img src="./yellow-button.png" alt="Buy me a coffee" width="120">
</a>

## [2.2.1] - 2024-10-11

### Fixed
Expand Down
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ Follow these steps to install or update Matterbridge if it is not already instal
on Windows:

```
npm install -g matterbridge
npm install -g matterbridge --omit=dev
```

on Linux (you need the necessary permissions):

```
sudo npm install -g matterbridge
sudo npm install -g matterbridge --omit=dev
```

See the complete guidelines on [Matterbridge](https://github.com/Luligu/matterbridge/blob/main/README.md) for more information.
Expand All @@ -57,15 +57,15 @@ On windows:

```
cd $HOME\Matterbridge
npm install -g matterbridge-zigbee2mqtt
npm install -g matterbridge-zigbee2mqtt --omit=dev
matterbridge -add matterbridge-zigbee2mqtt
```

On linux:

```
cd ~/Matterbridge
sudo npm install -g matterbridge-zigbee2mqtt
sudo npm install -g matterbridge-zigbee2mqtt --omit=dev
matterbridge -add matterbridge-zigbee2mqtt
```

Expand All @@ -83,7 +83,8 @@ On windows:
cd $HOME\Matterbridge
git clone https://github.com/Luligu/matterbridge-zigbee2mqtt
cd matterbridge-zigbee2mqtt
npm install
npm ci
npm run dev:link
npm run build
matterbridge -add .\
```
Expand All @@ -94,7 +95,8 @@ On linux:
cd ~/Matterbridge
git clone https://github.com/Luligu/matterbridge-zigbee2mqtt
cd matterbridge-zigbee2mqtt
npm install
npm ci
npm run dev:link
npm run build
matterbridge -add ./
```
Expand Down
Empty file removed TODO.md
Empty file.
81 changes: 0 additions & 81 deletions create-release.js

This file was deleted.

17 changes: 4 additions & 13 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import eslintPluginPrettier from 'eslint-plugin-prettier/recommended';
export default [
{
name: 'global ignores',
ignores: ['dist/', 'build/', 'node_modules/', 'coverage/', 'frontend/'],
ignores: ['**/dist/', '**/build/', '**/node_modules/', '**/coverage/', '**/frontend/', '**/rock-s0/'],
},
eslint.configs.recommended,
...tseslint.configs.strict,
Expand All @@ -20,13 +20,6 @@ export default [
languageOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
/*
parser: tseslint.parser,
parserOptions: {
project: './tsconfig.eslint.json',
tsconfigRootDir: import.meta.dirname,
},
*/
},
linterOptions: {
reportUnusedDisableDirectives: 'warn',
Expand All @@ -41,7 +34,7 @@ export default [
{
name: 'javascript',
files: ['**/*.js'],
// ...tseslint.configs.disableTypeChecked,
...tseslint.configs.disableTypeChecked,
},
{
name: 'typescript',
Expand All @@ -66,13 +59,11 @@ export default [
{
name: 'jest',
files: ['**/__test__/*', '**/*.test.ts', '**/*.spec.ts'],
// ...tseslint.configs.disableTypeChecked,
plugins: {
'@typescript-eslint': tseslint.plugin,
jest: jesteslint,
},
rules: {
...jesteslint.configs['flat/recommended'].rules,
},
...tseslint.configs.disableTypeChecked,
...jesteslint.configs['flat/recommended'],
},
];
1 change: 0 additions & 1 deletion link-matterbridge-script.js

This file was deleted.

11 changes: 4 additions & 7 deletions matterbridge-zigbee2mqtt.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
"title": "Matterbridge zigbee2mqtt plugin",
"description": "matterbridge-zigbee2mqtt v. 2.0.17 by https://github.com/Luligu",
"type": "object",
"required": [
"host",
"port",
"topic"
],
"required": ["host", "port", "topic"],
"properties": {
"name": {
"description": "Plugin name",
Expand Down Expand Up @@ -43,7 +39,8 @@
},
"topic": {
"description": "MQTT base topic for Zigbee2MQTT MQTT messages",
"type": "string"
"type": "string",
"default": "zigbee2mqtt"
},
"blackList": {
"description": "The devices in the list will not be exposed.",
Expand Down Expand Up @@ -113,4 +110,4 @@
"default": false
}
}
}
}
Loading

0 comments on commit 1e49c14

Please sign in to comment.