Commit Graph

648 Commits

Author SHA1 Message Date
Koenkk
2b7aeed4fb Add support for MQTT client ID. #148 2018-07-24 18:31:16 +02:00
Koen Kanters
b3cedc4ad1
Merge pull request #206 from tb-killa/rename-devices
Rename devices (friendly_name) ->  (#177)
2018-07-24 18:27:04 +02:00
Koenkk
8ea62f535e Update change friendly name of device. 2018-07-24 18:25:16 +02:00
Koenkk
de879858a5 Update zigbee-shepherd-converters to 2.0.33. 2018-07-22 18:49:45 +02:00
Koenkk
0e608c7b2e Add disable_led option. #133 2018-07-21 21:13:28 +02:00
tb-killa
aab18de88d
ADD Rename Function via MQTT Command 2018-07-21 18:19:11 +02:00
tb-killa
6d684b7c11
ADD RenameFriendlyName Function 2018-07-21 18:15:56 +02:00
Koenkk
396e4b1bed Update zigbee-shepherd-converters. 2018-07-18 22:50:28 +02:00
Koenkk
04d7a87765 Fix logging of unsupported cid. #199 2018-07-18 22:30:51 +02:00
Koenkk
49878e093d Log message on unsupported cid. 2018-07-14 21:22:50 +02:00
Koenkk
209624cbef Update zigbee-shepherd-converters to 2.0.28. 2018-07-14 21:10:46 +02:00
Koen Kanters
ad41ed6dcf
Merge branch 'dev' into gledopto-rgbcct-controller-support 2018-07-12 17:43:44 +02:00
Tom Usher
b494136c22 Add mapping for Gledopto RGB+CCT controller for Home Assistant 2018-07-11 13:19:01 +01:00
Koenkk
356ed9fa39 Update zigbee-shepherd and zigbee-shepherd-conveters for 324131092621 support. #36 2018-07-10 18:43:31 +02:00
Koenkk
8b5938f73f Update zigbee-shepherd-converters. 2018-07-07 23:39:30 +02:00
Koenkk
3897541366 Log zigbee-shepherd information on startup. #178 2018-07-05 20:06:38 +02:00
Koenkk
7cec5f2d96 Update zigbee-shepherd-converters to 2.0.20. 2018-06-30 23:47:51 +02:00
Koen Kanters
c1f9f630b1
Merge branch 'master' into feat/home-assistant-config-for-nanoleaf-bulb 2018-06-30 23:38:49 +02:00
iain
fef68c122f feat: home assistant nanoleaf mapping 2018-06-30 18:56:13 +01:00
Koenkk
f2ec895ec0 Update zigbee-shepherd-converters to 2.0.19. https://github.com/Koenkk/zigbee2mqtt/issues/154#issuecomment-401495951 2018-06-30 09:48:21 +02:00
Koenkk
52c51b687d And instructions on how to (soft) reset stick. #156 2018-06-28 19:49:16 +02:00
Koenkk
a1cb4ca214 Update zigbee-shepherd-converters to 2.0.18. 2018-06-27 21:31:00 +02:00
Koen Kanters
2ba2864f87
Merge pull request #152 from Koenkk/issue_138
Homeassistant: dont set unique_id when friendlyName set. #138
2018-06-26 21:36:14 +02:00
Koen Kanters
420171e060
Add '9290011370' to homeassistant.js 2018-06-25 22:06:11 +02:00
Koenkk
f03ade2775 Don't log 'Connecting with device' when device is already known. 2018-06-25 20:18:50 +02:00
Koenkk
19f6d5f72a Homeassistant: dont set unique_id when friendlyName set. #138 2018-06-24 14:21:56 +02:00
Kees Schollaart
a43e3969ed
Show why we have an error during initialization 2018-06-21 20:11:08 +02:00
Koenkk
9dbdfc0a2e Set send cached state for home assistant to 20 seconds. #105 2018-06-20 22:02:29 +02:00
Koenkk
7d2474060a Update zigbee-shepherd-converters. 2018-06-20 20:17:42 +02:00
Koenkk
4c4fcd7216 Update zigbee-shepherd-converters. 2018-06-17 17:15:43 +02:00
Koenkk
d980d0abcc Update zigbee-shepherd-converters. 2018-06-16 22:17:01 +02:00
Koenkk
0d6c001f2c Fix report on/off for devices with multiple states (e.g. state_left/state_right). #117 2018-06-16 20:38:44 +02:00
Koenkk
95db22e12b Update zigbee-shepherd-converters. 2018-06-16 01:43:51 +02:00
Koenkk
df99c7edf5 Log zigbee message data on one line. 2018-06-16 01:04:32 +02:00
Koen Kanters
c372618eac
Merge pull request #125 from ciotlosm/add_version_support
Add support for version numbers and hash
2018-06-16 00:15:36 +02:00
Koenkk
d69111f577 Add .hash.json for Docker. 2018-06-16 00:10:08 +02:00
Koenkk
96191a2836 Update log version on startup 2018-06-15 17:49:15 +02:00
Marius Ciotlos
b6aabcca64 Add support for version numbers and hash 2018-06-15 14:02:40 +03:00
Marius Ciotlos
01effab24c Fixes #97 2018-06-14 22:48:25 +03:00
Koenkk
ae9f071ffc Update logger.js 2018-06-14 20:27:43 +02:00
Marius Ciotlos
4cb98b6257 Added debug for mqtt message as well 2018-06-14 20:11:08 +02:00
Marius Ciotlos
7fe9d6731a Force debug on logger if DEBUG is set 2018-06-14 20:09:43 +02:00
Marius Ciotlos
15fca170ad Fixed travis error from lint 2018-06-14 20:09:43 +02:00
Marius Ciotlos
2071b0f69f Added possibility to update log_level from configuration 2018-06-14 20:09:43 +02:00
Marius Ciotlos
2b4fc21585 Updated debug and moved message to info 2018-06-14 20:09:43 +02:00
Marius Ciotlos
f40de00d32 Rollback of debug as it doesn't cover dependencies this way 2018-06-14 20:09:43 +02:00
Marius Ciotlos
1d49f349b9 Added message data logging in debug mode 2018-06-14 20:09:43 +02:00
Marius Ciotlos
e29d5f70ae Added allowed levels when setting level fails 2018-06-14 20:09:43 +02:00
Marius Ciotlos
dc5a090d44 Corrections @c727 suggestions 2018-06-14 20:09:43 +02:00
Marius Ciotlos
06142115af Fixed lint problems 2018-06-14 20:09:43 +02:00
Marius Ciotlos
c1b597c02f Added loging level through mqtt 2018-06-14 20:09:43 +02:00
Koenkk
744444ceb9 logger.debug incoming MQTT messages. #105 #110 2018-06-14 20:06:35 +02:00
Koenkk
7a13626da7 Fix crash on MQTT message device model not known. 2018-06-14 20:00:57 +02:00
Koenkk
d86aa10875 Xiaomi devices: check if exsist. #116 2018-06-14 18:19:54 +02:00
Koenkk
b3108a26d0 Update zigbee-shepherd-converters to 2.0.6. 2018-06-13 20:23:26 +02:00
Koenkk
3196c0a974 Send all cached status on hass/status:online. #105 2018-06-13 19:51:40 +02:00
Koenkk
7041637e5b Update zigbee-shepherd-converters to 2.0.5. 2018-06-12 21:02:24 +02:00
Koenkk
3c062a330d Resend cached states on MQTT reconnect. #105 2018-06-11 20:31:05 +02:00
Koenkk
cd13286ca7 Homeassisant: rediscover devices on MQTT reconnect. #105 2018-06-11 20:20:18 +02:00
Koen Kanters
b7252379b9
Merge pull request #99 from ciotlosm/add_device_remove
Add device remove
2018-06-10 17:41:25 +02:00
Koenkk
cbc1b3ab39 removed_device -> device_removed 2018-06-10 17:37:16 +02:00
Koenkk
db0d8c1cdd Best effort remove device 2018-06-10 17:35:14 +02:00
Koenkk
884e3aa475 Refactor remove device & remove from home assistant 2018-06-09 12:33:40 +02:00
Koenkk
63c0a962ae Add ICTC-G-1 homeassistant mapping. 2018-06-08 20:34:34 +02:00
Koenkk
cf3775e0b8 Update zigbee-shepherd-converters to 2.0.0. 2018-06-08 20:20:35 +02:00
Marius Ciotlos
7c53e9bb15 Added settings removal and bug fixes 2018-06-07 20:41:11 +03:00
Marius Ciotlos
9bc87b765a Formatting 2018-06-06 22:19:50 +03:00
Marius Ciotlos
0f2f7462a5 Added force remove 2018-06-06 22:13:32 +03:00
tb-killa
34feef6cf4 Update controller.js
ADD "remove" MQTT Topic with "message" - Check
2018-06-06 21:45:36 +03:00
tb-killa
0328ad7cb6 Update zigbee.js
Add "removedevice" Function into zigbee.js
2018-06-06 21:45:36 +03:00
Koen Kanters
ca27f9faf2
Add homeassistant mappings 2018-06-05 20:27:36 +02:00
Marius Ciotlos
584a5f1b19 Added unique id for easier renamig of sensors in HA 2018-06-04 23:05:34 +03:00
Koenkk
a976c1db93 Update zigbee-shepherd-converters to 1.0.1. #36 #62 2018-06-04 21:36:51 +02:00
Koenkk
eae8a80588 Update zigbee-shepherd-converters to 1.0.0. 2018-06-04 20:03:53 +02:00
Koenkk
bb9b6dd550 Update zigbee-shepherd-converters to 0.2.0. 2018-06-04 19:23:23 +02:00
Koenkk
b7c525de65 Increase recovery timeout. #79 2018-06-04 17:36:46 +02:00
Koenkk
8ada85e1ce Log to MQTT when pairing with device. #85 2018-06-03 00:50:30 +02:00
Koenkk
a8dca627d9 Allow spaces in MQTT device commands (for friendly names with spaces in it). #86 2018-06-03 00:42:15 +02:00
Koenkk
ab64d079aa Don't mutate stateCache. #82 2018-06-02 19:11:49 +02:00
Koenkk
993908eb19 Update zigbee-shepherd-converters to 0.1.11 2018-06-01 22:05:49 +02:00
Koenkk
f0b19cc696 Try to recover in zigbee-shepherd start failure. #79 2018-06-01 21:04:48 +02:00
Koenkk
3377853dab Update zigbee-shepherd-converters to 0.1.10. 2018-05-31 19:21:31 +02:00
Koenkk
ffa6012079 Support light transitions. #72 2018-05-30 22:28:08 +02:00
Koenkk
7b2763a053 Log devices to bridge/log. #77 2018-05-30 18:09:24 +02:00
Koenkk
77f344198c MQTT publish log message when new device connects. #77 2018-05-30 18:00:08 +02:00
Koenkk
6d73dd143c Add endpoint to request connected devices. #77 2018-05-30 17:52:46 +02:00
Koenkk
625b6c51d8 Update zigbee-shepherd-converters to 0.1.7 2018-05-29 19:12:45 +02:00
Koenkk
9396bde1f3 Add cache_state option to configuration.yaml. #70 2018-05-28 21:10:58 +02:00
Koenkk
ae01f30f71 Log device type on startup. #26 2018-05-28 20:40:30 +02:00
Koenkk
b8fb13043b Add AB3257001NJ. #62 2018-05-28 20:01:28 +02:00
Koenkk
2d7a6ecaf3 homeassistant discovery: fix crash when not in configuration.yaml. #63 2018-05-28 19:41:27 +02:00
Koenkk
7801493a7a Update zigbee-shepherd-converters to 0.1.5. #71 2018-05-28 19:33:29 +02:00
Koenkk
5666a59524 Add Hive active light bulb (HALIGHTDIMWWE27). #68 2018-05-27 17:16:01 +02:00
Koenkk
fd894a9ce3 Add homeassistant configuration for AA70155 and AA69697 2018-05-26 11:00:56 +02:00
Koenkk
08f3f96d73 Use js-yaml as yaml parser instead of yawn-yaml. #64 2018-05-25 16:42:29 +02:00
Koenkk
312ed033db Dont add advanced configuration by default. 2018-05-24 20:19:04 +02:00
Koenkk
fb27bd292f Use zigbee-shepherd-converters. #45 2018-05-24 13:09:58 +02:00
Koenkk
ad4f77b5ce Link to How to support new devices page. 2018-05-24 12:09:36 +02:00
Koenkk
f25e6a50b9 Refactor mqtt2zigbee to toZigbee and add convertes move devices. #45 2018-05-23 18:23:51 +02:00
Koenkk
5be2c412c1 Parsers -> converters. 2018-05-23 17:57:45 +02:00
Koenkk
3fdfc6f57f Move converters to devices.js. #45 2018-05-23 17:55:30 +02:00
Koenkk
bc4dff65ff Remove disableCache. #45 2018-05-22 19:10:16 +02:00
Koenkk
bcbe3eb075 Update docs 2018-05-22 18:25:09 +02:00
Diogo Gomes
567bdca276 Edp redy - Power Plug (#53)
* fixed json

* added mqtt commands

* added endpoints

* support battery status

* added firmware for CC2531 USB Stick with maximum number of possible devices (48)

* support aqara magnet

* added support for wall switch

* update regex

* Update README.md

* added automatic chip selection

* fix reconnect

* Update README.md

* added missing dependency

* fix magnets

* fix topic

* support for aqara button

* yaml based configuration

* restore project defaults

* save bridgeID

* default values

Don’t change the configured bridgeID (backward compatible with bridgeID
= “bridge”)

* personal configuration

* added EDP RE:DY

* don't mess remote

* don't mess remote

* don't mess remote

* fix

* clean

* lint

* generic

* lint

* Update devices.js

* Update zigbee2mqtt.js

* lint

* Refactor configure reports.

* Fix lint.
2018-05-21 13:21:18 +02:00
Koen Kanters
b912386786
Merge pull request #50 from ptvoinfo/master
Some improvements
2018-05-21 12:03:36 +02:00
Koenkk
b38eb76274 Change comment in controller.js 2018-05-21 12:00:35 +02:00
Koenkk
02818ddaf5 Refactor softResetTimeout 2018-05-21 11:59:01 +02:00
Koenkk
78c4f43496 Update controller.js 2018-05-21 11:52:16 +02:00
Koenkk
26f378237f Update sensor_power. 2018-05-21 11:50:14 +02:00
Koenkk
f886259f92 Refactor controller.js. 2018-05-21 11:49:02 +02:00
Koenkk
2f607c4cad Support LED1536G5 E12 version. #57 2018-05-21 11:17:28 +02:00
Koenkk
1b111c1250 Support LED1622G12. #56 2018-05-21 11:11:24 +02:00
Koenkk
f58b0fa4f2 Add voltage to homeassisant power sensor. 2018-05-17 18:41:03 +02:00
Koenkk
8207321c30 Update ZNCZ02LM converters. 2018-05-17 18:33:32 +02:00
Koenkk
7f5865aaf9 Update lumi.router device specification. 2018-05-17 18:03:54 +02:00
Koenkk
0fdec7c225 Refactor zigbee.js 2018-05-17 17:48:41 +02:00
ptvoinfo
55a1709103 Added polling for routers (prevents deep sleep mode of Xiaomi routers)
Added more parsers for Xiaomi Power Plug
Added a custom router
2018-05-17 17:39:01 +02:00
Koenkk
c5cb60e998 Enforce code style. #45 2018-05-17 17:20:46 +02:00
Koenkk
5a95e2fc8c Add 'WXKG02LM' and 'WXKG03LM' to battery parser. #43 2018-05-16 20:21:22 +02:00
Koenkk
f750bb34f9 Support JTYJ-GD-01LM/BW. #4 2018-05-16 20:15:50 +02:00
Koenkk
5ee79b28d9 Add homeassistant configuration for F7C033. #40 2018-05-16 19:52:44 +02:00
Koenkk
efd2fba1b5 Support Belkin WeMo smart LED bulb (F7C033). #40 2018-05-16 19:44:38 +02:00
Koenkk
9d82ad32d0 battery -> battery3V. #45 2018-05-16 19:40:21 +02:00
Koenkk
8559ea2301 Refactor homeassistant configuration out of devices.js. #45 2018-05-16 19:40:05 +02:00
Koenkk
ca40cf622a Move logging devices on startup to controller.js. #45 2018-05-16 19:29:47 +02:00
Koenkk
e3c9448656 cId -> cid. #45 2018-05-16 19:22:47 +02:00
Koenkk
2521af7d78 Allow device specific QoS configuration. #47 2018-05-15 18:42:26 +02:00
Koenkk
debc96c232 Allow to set device specific occupancy_timeout. #27 2018-05-15 18:06:16 +02:00
Koenkk
17aba009af Set default occupancy timeout to 60 seconds. #27 2018-05-15 18:00:06 +02:00
Koenkk
ff61f24b74 Make panID configurable. #34 2018-05-12 15:54:02 +02:00
Koen Kanters
604fa925e4
Merge pull request #39 from danielwelch/master
configure datapath with env variable
2018-05-12 15:31:23 +02:00
Koenkk
b01b1a07bb Add support for TRADFRI bulb E27 W opal 1000lm. #21 2018-05-12 15:05:18 +02:00
Koenkk
44002ed1c3 Update configure data path code 2018-05-12 10:58:06 +02:00
Koen Kanters
d3f271f984
Update description of LED1536G5 2018-05-12 09:21:36 +02:00
Daniel Welch
03123fb783 configure datapath with env variable 2018-05-11 23:04:15 -04:00
Marcus Aram
8d0623f24e Add support for IKEA TRADFRI bulb E14 WS opal 400lm 2018-05-11 20:19:47 +02:00
Koenkk
1a688cf363 Add disableCache option and remove disablePublish option for converters. #32 2018-05-11 19:14:18 +02:00
Marius Ciotlos
54f3843a03 Fixed TODO in devices.js 2018-05-11 09:25:33 +03:00
Marius Ciotlos
8b8604dbf4 Add battery support for cube 2018-05-10 11:36:21 +03:00
Koenkk
02a747066a Move MFKZQ01LM ignore parsers to end. 2018-05-10 11:34:56 +03:00
Koenkk
c8df9747ad Refactor MFKZQ01LM converters to use homeassistant.sensor_action 2018-05-10 11:34:56 +03:00
Koenkk
b41cacd992 Add homeassistant sensor_action 2018-05-10 11:34:56 +03:00
Marius Ciotlos
06fb89da3a Added credits and corrected comment to reflect code 2018-05-10 11:34:56 +03:00
Marius Ciotlos
50103e381c Added xiaomi cube 2018-05-10 11:34:56 +03:00
Marcus Aram
4e214a0686 Support for IKEA TRADFRI bulb GU10 W 400lm 2018-05-10 09:25:33 +02:00
Koenkk
4fc4c7b83a Add ssIasZone parser for SJCGQ11LM to directly detect water_leak. #17 2018-05-08 20:47:33 +02:00
Koenkk
beb2c5efb0 Rename sensor_button to sensor_click to keep naming for sensors consistent. #23 2018-05-08 20:13:01 +02:00
Koenkk
b3257c714a Add debug logging for incoming zigbee messages. #25 2018-05-08 19:57:50 +02:00
Koenkk
8523aa61b0 Support LED1623G12. #21 2018-05-06 18:08:10 +02:00
Koenkk
8ad1d49870 Also log to file. #16 2018-05-04 23:01:02 +02:00
Koenkk
17cb59b958 Support QBKG03LM. #4 2018-04-29 14:09:49 +02:00
Koenkk
78b0e00d14 Support QBKG04LM. #4 2018-04-27 23:58:46 +02:00
Koenkk
0ee1d27099 Support QBCZ11LM. #4 2018-04-27 14:10:13 +02:00
Koen Kanters
97bca73ba2 Travis now updates wiki automatically! :) 2018-04-26 20:02:14 +02:00
Koen Kanters
0a9f2d497a Update travis and check if it works. 2018-04-26 19:51:55 +02:00
Koen Kanters
c3ca0249c4 Improve color temp/xy and brightness level feedback. 2018-04-25 22:01:53 +02:00
Koen Kanters
bc1e3d68f9 lightingColorCtrl parser support currentX/Y 2018-04-25 21:50:41 +02:00
Koen Kanters
875ca536e0 Fix homeassistant discover crash when device undefined. 2018-04-25 21:34:26 +02:00
Koen Kanters
a13080f399 Refactor & remove home assistant pair switch discovery. 2018-04-25 20:54:41 +02:00
Koen Kanters
d20012e4d8 Update docgen. 2018-04-25 19:41:20 +02:00
Koen Kanters
87fb513758 Simplify YAML configuration. 2018-04-25 19:29:03 +02:00
Koen Kanters
3322d6cb20 Allow settings permit_join via home assistant switch. 2018-04-24 19:30:56 +02:00
Koen Kanters
e0feacea0b Improve MQTT switch support. 2018-04-24 19:03:09 +02:00
Koen Kanters
8673fa27e2 Improve naming of configuration 2018-04-24 18:04:36 +02:00
Koen Kanters
7a6cc080d4 Support ZNCZ02LM. #4 2018-04-23 22:36:30 +02:00
Koen Kanters
1543373b7f Improve support current supported devices. 2018-04-23 21:44:06 +02:00
Koen Kanters
59f16f76f1 Refactor devices.js 2018-04-23 18:29:35 +02:00
Koen Kanters
500bce2418 Perform home assistant MQTT discovery on startup. 2018-04-23 18:17:47 +02:00
Koen Kanters
b29a5a9c1b Support WXKG03LM. #4 2018-04-22 21:36:04 +02:00
Koen Kanters
b80d16c4b3 Support SJCGQ11LM. #4 2018-04-22 21:23:35 +02:00
Koen Kanters
8109bf68e7 Add home assistant MQTT discovery for missing devices. #9 2018-04-21 23:05:53 +02:00
Koen Kanters
d71fadd73f Homeassistant discovery for WXKG11LM. #9 2018-04-21 18:14:34 +02:00
Koen Kanters
5fa8ce9913 Support LED1535R6 2018-04-21 17:51:38 +02:00
Koen Kanters
4d3d15f5b9 Support WXKG02LM. #4 2018-04-21 13:01:57 +02:00
Koen Kanters
5b52defe9e Add more logging 2018-04-21 12:45:22 +02:00
Koen Kanters
fc9a0be1e9 Support WSDCGQ11LM. #4 2018-04-21 12:20:47 +02:00
Koen Kanters
65ad81a7b6 Support discovering multiple homeassistant sensors of same type. #9 2018-04-21 12:15:00 +02:00
Koen Kanters
79d405afe9 Support RTCGQ11LM. #4 2018-04-21 09:14:18 +02:00
Koen Kanters
bc3fca9d68 Homeassistant discovery: allow multiple homeassistant sensor/devics per device. #9 2018-04-21 09:13:14 +02:00
Koen Kanters
14f14e909d Hue go rgb -> xy 2018-04-21 00:16:50 +02:00
Koen Kanters
823a9ea248 Support light devices MQTT discovery. #9 2018-04-20 23:58:03 +02:00
Koen Kanters
aebce9099b Support settings colors. #7 2018-04-20 23:40:17 +02:00
Koen Kanters
e6e558eae7 Improve homeassistant discovery. #8 2018-04-20 23:39:20 +02:00
Koen Kanters
b9552f8ab3 Support homeassistant discovery for MCCGQ11LM. #9 2018-04-20 19:54:12 +02:00
Koen Kanters
7cd8e74a7e Implement homeasisstant MQTT discovery. #9 2018-04-20 19:53:40 +02:00
Koen Kanters
f9860f5b9d Dont handle messages without cid. 2018-04-19 23:15:09 +02:00
Koen Kanters
21575673b3 Support MCCGQ11LM. #4 2018-04-19 23:00:07 +02:00
Koen Kanters
6499b78108 Move WXKG11LM 2018-04-19 22:46:59 +02:00
Koen Kanters
c49b3f4ae3 Support WXKG11LM. #4 2018-04-19 22:45:53 +02:00
Koen Kanters
eb063efeb4 Update Hue Go documentation. #7 2018-04-18 22:17:03 +02:00
Koen Kanters
0771e2c5a0 Support Hue Go. #7 2018-04-18 22:11:00 +02:00
Koen Kanters
69736a883e Use device retain setting. 2018-04-18 22:07:18 +02:00
Koen Kanters
31c6d794a9 Select endpoint dynamically needed for Hue support. #7 2018-04-18 21:57:39 +02:00
Koen Kanters
90cc4ad0e1 Improve robustness. 2018-04-18 21:55:00 +02:00
Koen Kanters
3b068daa12 Log vendor on startup. 2018-04-18 21:01:42 +02:00
Koen Kanters
3b317535d3 Fixes & improvements. #8 2018-04-18 20:53:22 +02:00
Koen Kanters
dec470fb51 Add eslint & fixes. #8 2018-04-18 19:10:33 +02:00
Koen Kanters
d06522d488 Refactor and rename. #8 2018-04-18 18:26:13 +02:00