Commit Graph

329 Commits

Author SHA1 Message Date
bsamuels
47074ff60f Update Fibaro and Fhem for small changes. 2018-01-23 14:34:49 -06:00
bsamuels
047a7de612 deleted json 2018-01-22 16:27:26 -06:00
bsamuels
7fc7f00308 Updated FHEM call issues for success of 302
Streamlined Fibaro Json Decoding
2018-01-22 16:26:31 -06:00
bsamuels
14e940134c Fixed openhab build screen and openhab invalid responses.
Completed Broadlink impl

Testing
2018-01-19 14:46:45 -06:00
bsamuels
1897633e75 Forget new file 2018-01-18 16:54:44 -06:00
bsamuels
5a052d9374 Updated FHEM for command
Started Broadlink implementation
2018-01-18 16:54:21 -06:00
bsamuels
4b048c2a7f Updated with fixes for FHEM 2018-01-16 16:18:53 -06:00
bsamuels
18c47ee5e4 update for changes 2018-01-16 16:13:24 -06:00
bsamuels
27dd8475e9 Huemulator state fixes
draft active logger control
2018-01-16 13:20:49 -06:00
bsamuels
37b381085c Fixed RC test issues for:
FHEM device decode
on for first dim
default OpoenHab Port
Fibaro request debugging enhancement
2018-01-12 15:44:10 -06:00
bsamuels
b2a30f5771 Remove test call for FHEM devices 2018-01-05 16:19:18 -06:00
bsamuels
b88b3fa245 Fininshed Testing color RGB to int for LIFX 2018-01-05 15:29:41 -06:00
bsamuels
52aac32474 Update color setting for LIFX 2018-01-05 15:15:22 -06:00
bsamuels
037b151729 Updates for RC2 fixing FHEM issues, Fiabaro Issues, adding functionality
for color tests, and sending multiple requests based on the Hue API
body.
2018-01-05 14:48:20 -06:00
bsamuels
f27d905869 Updated FHEM integration for testing 2018-01-02 16:20:51 -06:00
bsamuels
4c694cb285 Updated description xml to remove null service list. Most likely culprit
of /null calls to spark.

Started adding FHEM integration
2017-12-29 15:57:37 -06:00
Admin
fe613f7688 Basic OpenHAB functionality added. Need to add String selection
functionality.
2017-12-15 16:34:58 -06:00
Admin
4b247557d4 Start adding OpenHAB to the bridge. 2017-12-14 14:54:50 -06:00
Admin
4ecbad6558 Fixed enable rooms for Alexa. Removed huemulator redirect for Spark.
Added Link management as links are now stored with IP.
2017-12-12 15:21:45 -06:00
Admin
4c86e42776 Added hex color codes, added swith to utilize groups/rooms. updated exec
to use new path parsing. Revert back to Spark 2.3 due to issues.
2017-12-11 16:40:59 -06:00
BWS Systems
00dbea6dac Merge pull request #841 from rburgst/master
add support for timestamp http URL variable
2017-12-11 12:27:48 -06:00
Rainer Burgstaller
58fb085180 renamed variable timestamp to time.millis 2017-12-11 18:26:26 +01:00
Rainer Burgstaller
800f5ec2aa add support for timestamp http URL variable
- certain devices require a current date/time in their HTTP request
  (Warema shades)
2017-12-11 08:30:33 +01:00
Björn Rennfanz
bdf5770ba0 Some corrections after rebasing code of HomeWizard SmartPlug plug-in 2017-12-09 22:05:00 +01:00
Björn Rennfanz
d337546da7 Add java part of plug-in for HomeWizard SmartPlug support 2017-12-09 21:35:17 +01:00
Admin
a489061bac Changed version to 5.0.0, Updated README, updated traceupnp messages in
log.
2017-11-22 12:44:38 -06:00
Admin
05b9f195d7 Fixed issue with http client pool and with test user for web interface. 2017-11-17 12:38:14 -06:00
Admin
5eca809c4a Updated Readme, Updated to the latest spark web REST Framework. Added
handling for spark initialization errors.
2017-11-16 16:23:33 -06:00
Admin
df85c8a349 Added new HTTP pool manager and http handling. 2017-11-15 14:27:44 -06:00
Admin
d8d5e8f39a Added hub mac setting, removed global hal token setting, removed upnp
strict setting (only from command line)

Working on http pool
2017-11-14 16:37:45 -06:00
Admin
690bdaa748 Finalized Fibaro merge correcting inconsistencies. 2017-11-14 13:36:07 -06:00
Admin
feee22dbac Merge branch 'refs/heads/pr/785' into FeaturesfFor5.0
# Conflicts:
#	src/main/resources/public/scripts/app.js
2017-11-14 13:13:22 -06:00
Admin
548da932ad Updated hue hub version to be 999999999 to help alleviate version
issues. Updated upnp multicast to use one socket. Updated http Handler
code to check for null on conn.
2017-10-20 11:04:05 -05:00
Admin
b147f6606e Update MQTT reconnect, and import statements and color convert test
case.
2017-10-19 15:56:15 -05:00
Dmitriy Ponomarev
31fe05fe2b fix autorization in requests and many changes. All working, except device statuses. Dont know how to do that. 2017-09-25 03:04:01 +03:00
diamond5170
924f3059fb Merge branch 'master' into master 2017-09-24 21:45:56 +03:00
Admin
5231eac4b0 Updating http connection management.... Broken 2017-08-30 17:04:17 -05:00
Admin
28144312ff Update echo url. Create Release Candidate 1 for 5.0.0 2017-08-29 16:24:02 -05:00
Admin
60e8855aa7 Updated scroll-table.css to have dynamic max-height, cleaned up
warnings, removed order by name.
2017-08-03 15:26:12 -05:00
Florian Förderreuther
ce79fb4b82 Light type detection and filter for device list
"Extended color light" isn't used anymore for all devices without thinking about it. It will now automatically differentiate between Color and Dimmable light by the following logic: 
1. If it's  Philips Hue passthru look at the state: if it contains the attribute "colormode" it's a Extended color light, otherwise it's a Dimmable light.
2. If it's no passthru it's a dimmable light if the colorUrl has no content. 

I didn't use On/Off light because i disovered that a) the hue app treats these exactly the same as dimmable light, you can still "change the brightness" and b) the amazon echo doesn't find these lights without the skill

I also enhanced the filter options in the web ui.
You have a textbox "Show devices visible to". You can fill in an ip-address and there will only be devices displayed that a) have the ip address in the requesterFilter or b) don't filter by requester.
If you tick the checkbox "Must contain filter" option b isn't used. This means also if you check the box with no ip address in the textbox only devices without request filter will be shown.
Also there is a filter by device type.
All these 3 filter options will be remembered as long as the browser tab is closed.
2017-08-02 07:34:06 +02:00
Florian Förderreuther
95c342b548 Amazon Echo support for groups
So the groups are now somewhat usable with an Amazon Echo. This is a bit of a workaround:
The group gets presented to the Echo as another fake light. For that to work you must manually enable this feature for every room by adding "exposeAsLight":"192.168.0.30" to the room in group.db (restart ha-bridge afterwards). Use the ip-address of your echo. No need to do that for other devices, because these can handle rooms directly. The fake light for the group will only be shown/usable to the specified ip-addresses.
2017-07-30 16:30:33 +02:00
Florian Förderreuther
cb9312f6c3 Filter lights in group and fixed handling of urls with trailing slash 2017-07-30 10:10:04 +02:00
Florian Förderreuther
8831fec6be Minor fixes and better color support
Fixed some minor bugs related to groups.
I implemented basic color capabilities. Extended ColorDecode.java to handle xy and ct values. Implemented the call to replaceColorData in various homes (command, http, tcp, udp).
Additional to color.r, color.g, color.b which return the color value in 0-255 there is also a value replacement "color.milight". 
The usage for that is as follows: udp://ip:port/0x${color.milight:x} where x is a number between 0 and 4 (0 all groups, 1-4 specific group). The group is neccessary in case the color turns out to be white. The correct group on must of course be sent before that udp packet.
Note that milight can only use 255 colors and white is handled completely separate for the rgbw strips, so setting temperature via ct with milight does something but not really the desired result.
2017-07-29 18:42:13 +02:00
Florian Förderreuther
0227a05970 Corrected group action success response 2017-07-28 14:47:58 +02:00
Florian Förderreuther
20ad6891e8 Implemented support for rooms
I implemented full api support for rooms. That means:
- Create/Modify/Delete rooms/lightgroups
- Get information about group list / individual group
- Group actions: Change lighting for the whole group (except setting scenes, because scenes are not implemented in ha-bridge right now)
For now the rooms/groups can only be configured through the api and apps, it's not visible/changeable through the web gui.
2017-07-27 23:20:02 +02:00
Unknown
3a5262ff33 Added ColorUrl and alternative item edit mode
Additional to on/off/dim items i added color items. The colorUrl gets executed if a PUT is received with xy/ct/hue/sat in the body. Also changed the emulated bulb type to "Extended color light".
Added "Change Editmode" button in the editdevice screen. Switch between manual JSON edit and the tabular variant. Local unsaved changes in one mode carry over to the other. Through this edit variant it's possible to change the order of items and do copy/paste.
2017-07-23 10:15:00 +02:00
Admin
430eff958c Updateing color translation 2017-06-28 16:02:45 -05:00
Admin
86371c03b2 Updating Color calculation 2017-06-27 16:12:47 -05:00
Admin
3d4724ac57 Fixed an introduced issue with the edit screen. Finished the press time
implementation.
2017-06-21 16:22:03 -05:00
Admin
63ac729967 Adding long press 2017-06-20 16:35:03 -05:00