Commit Graph

295 Commits

Author SHA1 Message Date
redPanther
858125510e hyperiond: add ability to export default config and effects (#244)
* - embed default config
- add possibility to export effects and embeded default config to filesystem

* do some code style
2016-09-17 00:40:29 +02:00
redPanther
eeb9b0f7da implement hyperion restart via webui (#242)
* first try

* implement hyperion restart. core function is good, but needs a beeter structuring- something for next refactoring session ;-)

* several fixes (including osx)
merge with upstream
some refactoring

* add some eye candy to webui
2016-09-15 20:42:58 +02:00
brindosch
a04f34eab7 update schemas | mod jsoneditor (#243)
* update

* sync

[skip ci]

* always required

[skip ci]
2016-09-15 19:06:21 +02:00
redPanther
1cc2f72fa2 embedded webui + config modification detection (#240)
* implement embedded webui

* add detection for changed config, later on used for restart hyperion
2016-09-14 13:51:28 +02:00
redPanther
adfe2a4b23 effects included in hyperiond binary as qtResource (#237)
* implement effects included in hyperiond  binary

* cleanup

* remove install of effects dir. People who wants to develop effects has to copy them from github
effect params for initial effects can be changed in config permanently and other effect params can be changed
via json (currently only temporarily)

* fix schema of fadecandy
webui fix display of specific led options

* add leddevice write support

* cleanup

* webui: tune hue code

* when use json effect definition from putsiede hyperiond but want to use py script from inside hyperiond use ad a :
e.g. fade.py needs a fade.py near the json file, but :fade.py is taken from resource inside hyperiond

* add ability to di

* add abiloty to diable effcts via hyperion config

* use effect name instead of script in active effects and prio register

* finally solve open file handle during effect is playing. Now script is read before, then file closed and then t is run by python

* fix some webui things
- led config tabs
- inital loading screen

optimize qrc file generation
fix compile warning in hyperion.cpp

* cleanup

* more cleanup
2016-09-13 11:51:16 +02:00
b1rdhous3
d097995a74 Small Hue improvements (#235)
* Small Hue Bridge improvements

* Small Lang fixing
2016-09-11 22:20:57 +02:00
redPanther
82611afa25 webui: some editor style tweaks (#234)
* initial support for leddevice options

* fix schema and editor init

* fix led editor labels and schema

* add some led schemas

* led config: insert current values. not yet perfect, but it works

* tune editor style
2016-09-10 23:30:05 +02:00
redPanther
8aff421850 fix setting of current value in led controller 2016-09-10 19:23:13 +02:00
redPanther
2d88cdc2d3 webui: initial support for leddevice options (#232)
* initial support for leddevice options

* fix schema and editor init

* fix led editor labels and schema

* add some led schemas

* led config: insert current values. not yet perfect, but it works
2016-09-10 19:08:08 +02:00
redPanther
678624c959 webui: merge remote control pages into one single page. (#231)
* make enable/disable of bborder work

* fix typo

* smoothing can be disabled via config again

* fix smoothing

* merge remotecontrol into single page

* tiny cleanup in general conf

* tune icons

* fix loading display

* tune some layout stuff

* merge huebridge into leddevice
2016-09-09 18:59:58 +02:00
b1rdhous3
4649786f68 Initial Write Config Support (#230)
* Initial JSON Write

* Initial Write Config Support

* .
2016-09-09 10:15:35 +02:00
redPanther
36124c9afb make blackboder component enable/disable at runtime (#228)
* make enable/disable of bborder work

* fix typo

* smoothing can be disabled via config again

* fix smoothing
2016-09-08 16:32:42 +02:00
b1rdhous3
f23178c770 Deleted flags (#229) 2016-09-08 08:51:03 +02:00
redPanther
2beccb0912 Webui: extend led hardware config + connection lost page (#226)
* split content and js
tune leds config

* implement connection lost page

* split js/html in huebridge

* add js action for connection lost

* extend led config
make connection loss nicer

* tune led code
add menu entry for grabber

* more tuning of webui

* switch back to botstrap textarea
add v4l to components

* add icon

* extend schema for jsoneditor

* implement ledcolors streaming with 4fps

* implement component state
2016-09-07 20:10:37 +02:00
redPanther
a6d12611a8 webui: enhance led config (#224)
* split content and js
tune leds config

* implement connection lost page

* split js/html in huebridge

* add js action for connection lost
2016-09-06 10:14:54 +02:00
b1rdhous3
ffafe7e306 Simplified Hue Connection (#225) 2016-09-06 09:53:28 +02:00
redPanther
bbffa078fd Webui: view led configuration + lights (#223)
* make hyperion websocket api event based

* implement new websocket handling for generalconf

* migrate all webui stuff to new event based websocket api
some cleanup ... now all html templates are in content
refactoring of web stuff

* add hyperionport to global
start impl. removing advanced key

* separate dashboard
serverinfo is updated every 3 seconds automatily
add input selection
cleanup and remove not needed stuff

* prepare infrastructure for server sided file execution

* webui minor fixes

* fix compile

* implement led layout view with live colors

* live led vies

* fix general conf
unrigister ledcolors request, when not on leds.html

* fix compiler warning

* prepare realtime ledview and enhance ui
2016-09-05 17:26:29 +02:00
b1rdhous3
b99e75d7e4 Fixing Safari Support (#222)
* Switch to non-minified JSON Editor Lib

* Fixing Safari Support
2016-09-04 16:27:48 +02:00
b1rdhous3
7ac31efd4f Switch to non-minified JSON Editor Lib (#220) 2016-09-03 19:51:30 +02:00
redPanther
4a27f3d43e refactoring of webui and event based websocket layer (#219)
* make hyperion websocket api event based

* implement new websocket handling for generalconf

* migrate all webui stuff to new event based websocket api
some cleanup ... now all html templates are in content
refactoring of web stuff

* add hyperionport to global
start impl. removing advanced key

* separate dashboard
serverinfo is updated every 3 seconds automatily
add input selection
cleanup and remove not needed stuff

* prepare infrastructure for server sided file execution

* webui minor fixes

* fix compile
2016-09-03 15:54:33 +02:00
brindosch
c17c3bd273 Add more schemas + webui integration (#218)
* update schema
... need some fixing regarding schema, will come in next commit
2016-09-02 19:29:04 +02:00
b1rdhous3
752b32c906 Merge index.html and QJsonSchemaChecker changes 2016-08-31 17:19:41 +02:00
b1rdhous3
b6cec24596 Update 2016-08-31 00:46:39 +02:00
b1rdhous3
a6df8aef0d Disabled Form Translatation since this isn't working with new JSON Editor
looking for an other way
2016-08-31 00:28:07 +02:00
b1rdhous3
019e3f5d0c New JSON Editor 2016-08-31 00:22:17 +02:00
b1rdhous3
dae32f72bf Merge remote-tracking branch 'refs/remotes/hyperion-project/master' into editor
# Conflicts:
#	assets/webconfig/index.html
2016-08-30 23:50:26 +02:00
b1rdhous3
7009aa50ed New JSON Editor 2016-08-30 23:49:21 +02:00
brindosch
0603fadd21 Web: Centralize websocket, add json port changer and led schemas (#209)
* add comp test

* update web

* .

* typo

[skip ci]
2016-08-30 23:25:27 +02:00
brindosch
bb94a21c83 Web: Add simple components control (#203) 2016-08-24 20:09:27 +02:00
brindosch
2cc107842a Web: Dashboard version comparison (#196)
* update version

* update version

* update

* add update echeck
2016-08-23 20:17:50 +02:00
b1rdhous3
c207828069 WebUI: Several File adjustments (#195)
* Example JSON Form Example with General setting

I have created a new Category "General" with several Settings for
Hyperion.
For now the Submit Button only console.log's the values.

Known Bug: For some reason it seems to do not load the bootstrap
correctly or maybe the Lib isn't compatible with the newest version of
bootstrap.

* Reorganize files
2016-08-23 19:42:16 +02:00
brindosch
27eb314b1c Update hyperion.css 2016-08-20 19:06:19 +02:00
brindosch
44c5cd48cd Update de.json 2016-08-20 17:49:40 +02:00
b1rdhous3
7e4b799899 Minor Bugfix in German translation (#190)
* Example JSON Form Example with General setting

I have created a new Category "General" with several Settings for
Hyperion.
For now the Submit Button only console.log's the values.

Known Bug: For some reason it seems to do not load the bootstrap
correctly or maybe the Lib isn't compatible with the newest version of
bootstrap.

* Translationsupport for JSON Forms

* Hotfix

* Added Bootstrap Switches for all checkboxes

All checkboxes will be converted to Switches

* Minor Bugfix in German translation
2016-08-20 17:25:39 +02:00
brindosch
7435bb78a2 Web: Add update.html (#187)
* Update packages.cmake

* version.json

* Update version.json

* update webui

* add better icon spacing solution, remove changes from font awesome to keep it update secure

* fix conflict no ci

* resolve conflict no ci

* no ci
2016-08-20 16:52:06 +02:00
b1rdhous3
63a410cb04 Translationsupport for JSON Forms & Bootstrap Switches (#188)
* Example JSON Form Example with General setting

I have created a new Category "General" with several Settings for
Hyperion.
For now the Submit Button only console.log's the values.

Known Bug: For some reason it seems to do not load the bootstrap
correctly or maybe the Lib isn't compatible with the newest version of
bootstrap.

* Translationsupport for JSON Forms

* Hotfix

* Added Bootstrap Switches for all checkboxes

All checkboxes will be converted to Switches
2016-08-20 16:36:01 +02:00
b1rdhous3
d8f6f86948 Example JSON Form Example with General setting (#185)
I have created a new Category "General" with several Settings for
Hyperion.
For now the Submit Button only console.log's the values.

Known Bug: For some reason it seems to do not load the bootstrap
correctly or maybe the Lib isn't compatible with the newest version of
bootstrap.
2016-08-18 21:14:50 +02:00
brindosch
c00edfb658 update webui (#180) 2016-08-16 00:20:31 +02:00
b1rdhous3
75fd7ed8ba Initial Hue Bridge support & Small changes (#177)
* Initial WebUI with sample functions

* Changed folder structure

* Light Reset Button and Translation fixing in Links

* Indentation fixed

* Reorganized menu and new function for setting effects

* Styling fix

* WebUI Initial Philips Hue support

* Encoding, refactoring etc

* Filename changes

* Typo fix

* Translation cleanup & adding

* Added Favicon

* Edited title
2016-08-15 13:51:41 +02:00
brindosch
ab832c88f3 update webui (#176) 2016-08-14 21:19:12 +02:00
brindosch
bc0c9c469f Web: Add Hyperion logo and bigger colorpicker (#173) 2016-08-13 22:01:07 +02:00
b1rdhous3
1ff8528597 Initial WebUI design and structure with JSON sample function (#170)
* Initial WebUI with sample functions

* Changed folder structure

* Light Reset Button and Translation fixing in Links

* Indentation fixed

* Reorganized menu and new function for setting effects

* Styling fix
2016-08-13 20:05:01 +02:00
Rick van Hattem
0ef0530861 display the currently selected color in color (#163) 2016-08-10 06:52:42 +02:00
redPanther
817dabae8c sourceOff feature + small json refactoring (#151)
* add --sourceOff to hyperion-remote - this will select "off" source and set all leds to black
refactor new json stuff
make schema checker not so strict, do not require values that have defaults (not finished yet)
initialEffect config: effect is always an array, regardless if it is a color or an effect name

* make off source visible in active priority list

* transform initialeffect to qjson (except part of effect-args, this needs effectengine transformed to qjson)

* remove unneeded comment

* add web ui for source selection.
call http://hyperion_host:8099/select/index.html
current example needed json server on port 19444
2016-08-06 08:28:42 +02:00
redPanther
7dfb9f1967 integrated webserver ... (#697)
* initial commit of webconfig

* update example config with webconfig and fix format of file
update debian postinst script for install example config
2016-06-12 22:27:24 +02:00