Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding Z2M Devices #1275

Merged
merged 12 commits into from
Sep 6, 2021
Merged

Conversation

VonOx and others added 5 commits June 28, 2021 09:18
[pull] master from GladysAssistant:master
* Fit map only on users (GladysAssistant#1223)

* Fix GladysAssistant#1197: Fix Websocket bug when accessToken is expired (GladysAssistant#1227)

* Fix bugs in scene, dashboard & settings (GladysAssistant#1228)

* Fix GladysAssistant#1225: Remove max height on user presence box

* Fix GladysAssistant#1207: In send message action in scene, going backspace should not delete variable in Firefox

* Fix GladysAssistant#1222: Make it possible to enter negative value in scene triggers

* Fix GladysAssistant#1106: Make it possible to use decimal numbers in scene

* Fix GladysAssistant#1055: Fix validation error message in house settings

* Fix GladysAssistant#1220: Add IKEA LED1836G9 (GladysAssistant#1224)

Co-authored-by: Pierre-Gilles Leymarie <pierregilles.leymarie@gmail.com>

* fix(zigbee2mqtt): Add Philips 9290022166 (GladysAssistant#1219)

Fix GladysAssistant#1209

Co-authored-by: Pierre-Gilles Leymarie <pierregilles.leymarie@gmail.com>

* 4.4.1

* Zigbee2mqtt: Add light color feature (GladysAssistant#1203)

* feat(zigbee2mqtt): Add color feature to devices

* feat(zigbee2mqtt): Add light color feature

Close GladysAssistant#1156

* feat(utils): Add XY color conversion to Int

https://gist.github.com/popcorn245/30afa0f98eea1c2fd34d

* feat(zigbee2mqtt): Fix PR feedbacks

* feat(core): Add Light Temperature Box Row

* fix(zigbee2mqtt): Fix Light Temperature min max values

Co-authored-by: Pierre-Gilles Leymarie <pierregilles.leymarie@gmail.com>

* Generate CHANGELOG

* Be able to disable a scene (GladysAssistant#1229)

* Add scene.active in DB

* Add active switch to scene list

* Add a way to update active in edit scene

* Rollback toggle if request fails

* Only checkTrigger if the scene is active or not

* Fix tests

* Add active attribute to demo file

* Add Cypress tests

* Multiple dashboard feature (GladysAssistant#1230)

* In user presence dashboard box, it's possible to select the users displayed (GladysAssistant#1238)

* In user presence dashboard box, it's possible to select the users displayed

* Add Cypress test on user presence box

* Edit empty state message

* Add device.setValue action in scene (GladysAssistant#1239)

* Configure Webpack stats file to calculate bundle evolution (GladysAssistant#1240)

* Fix bug when light color has no initial state and is displayed black (GladysAssistant#1235)

Co-authored-by: Pierre-Gilles Leymarie <pierregilles.leymarie@gmail.com>

* Stop using vis-network library in Z-Wave network tab to reduce bundle size (GladysAssistant#1241)

* Upgrade preact-cli to major version 3 (GladysAssistant#1242)

* Move config file to src folder

* Migrating to preact-cli 3

* sw-esm.js is not cached as well

* Use optimized version of tabler

* Add a service worker to unregister the old one

* Fix bug in edithouse component

* Fix tests & upgrade react-select

* Use actions/cache@v2 in Github Actions to better cache npm install

* Add ios splash screen PWA

* Add apple-mobile-web-app-status-bar-style

* copy old sw.js after building

* Dynamically import demo.json file save size

* Fix dashboard responsive (GladysAssistant#1243)

* Bluetooth check state before scan + stop presence scanner (GladysAssistant#1194)

* Bluettoth stop presence scanner

* Bluetooth check state before scan

Co-authored-by: Pierre-Gilles Leymarie <pierregilles.leymarie@gmail.com>

* Zigbee2mqtt: Add TuYa TS0601_air_quality_sensor and CO2 feature (GladysAssistant#1247)

* feat(zigbee2mqtt): Add CO2 feature management

* feat(zigbee2mqtt): Add TuYa TS0601_air_quality_sensor

Co-authored-by: Pierre-Gilles Leymarie <pierregilles.leymarie@gmail.com>

Co-authored-by: Vincent KULAK <vkulak62@gmail.com>
Co-authored-by: Pierre-Gilles Leymarie <pierregilles.leymarie@gmail.com>
Co-authored-by: Cyril Beslay <cicoub13@users.noreply.github.com>
Co-authored-by: Alexandre Trovato <1839717+atrovato@users.noreply.github.com>
@codecov
Copy link

codecov bot commented Sep 5, 2021

Codecov Report

Merging #1275 (b8c2422) into master (3cb07f3) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1275   +/-   ##
=======================================
  Coverage   96.52%   96.52%           
=======================================
  Files         669      669           
  Lines        8595     8595           
=======================================
  Hits         8296     8296           
  Misses        299      299           
Impacted Files Coverage Δ
server/services/zigbee2mqtt/model/IKEA.js 100.00% <ø> (ø)
server/services/zigbee2mqtt/model/TuYa.js 100.00% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3cb07f3...b8c2422. Read the comment docs.

@VonOx VonOx marked this pull request as ready for review September 5, 2021 08:25
Pierre-Gilles
Pierre-Gilles previously approved these changes Sep 6, 2021
Copy link
Contributor

@Pierre-Gilles Pierre-Gilles left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your PR! Looks good to me (I don't have a strong Zigbee2mqtt expertise so if @cicoub13 you have a feedbacks on this don't hesitate :D)

@cicoub13
Copy link
Contributor

cicoub13 commented Sep 6, 2021

Approved for all expected the battery feature, it's auto detected and added to devices with battery.

I'm adding an answer in the issue #1254

@Pierre-Gilles Pierre-Gilles merged commit af87134 into GladysAssistant:master Sep 6, 2021
@Pierre-Gilles
Copy link
Contributor

Merged, thanks! 🙏

@relativeci
Copy link

relativeci bot commented Sep 6, 2021

Job #46: Bundle Size — 5.67MB (0%).

af87134 vs 3cb07f3

No changes


View Job #46 report on app.relative-ci.com

VonOx added a commit to VonOx/Gladys that referenced this pull request Sep 6, 2021
* Update Light bulb GladysAssistant#1269
* Add LED1924G9 GladysAssistant#1275
* Add LED1934G3 GladysAssistant#1232
* Add battery feature to RTCGQ11LM GladysAssistant#1254
* Add LED1837R5 GladysAssistant#1255
* Add TS0503B GladysAssistant#1260
* Revert back to original as battery feature is auto detected

Co-authored-by: pull[bot] <39814207+pull[bot]@users.noreply.github.com>
Co-authored-by: Pierre-Gilles Leymarie <pierregilles.leymarie@gmail.com>
Co-authored-by: Cyril Beslay <cicoub13@users.noreply.github.com>
Co-authored-by: Alexandre Trovato <1839717+atrovato@users.noreply.github.com>

Co-authored-by: Vincent KULAK <vkulak62@gmail.com>
Co-authored-by: pull[bot] <39814207+pull[bot]@users.noreply.github.com>
Co-authored-by: Pierre-Gilles Leymarie <pierregilles.leymarie@gmail.com>
Co-authored-by: Cyril Beslay <cicoub13@users.noreply.github.com>
Co-authored-by: Alexandre Trovato <1839717+atrovato@users.noreply.github.com>
@VonOx VonOx deleted the z2m-new-devices branch September 10, 2021 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants