Commit Graph

1435 Commits

Author SHA1 Message Date
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 c5beedf241 done 2016-08-30 23:39:07 +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
b1rdhous3 4f5892bb72 Merge pull request #4 from hyperion-project/master
merge
2016-08-30 23:21:03 +02:00
brindosch 146d7b67f7 stu 2016-08-30 23:19:04 +02:00
brindosch 73258809d1 le 2016-08-30 23:15:59 +02:00
brindosch a7da6cb3d9 . 2016-08-30 23:10:10 +02:00
brindosch 58d433e309 Merge remote-tracking branch 'refs/remotes/hyperion-project/master' into travisci 2016-08-30 22:35:14 +02:00
redpanther a85a5c0f2c implement use of multiple v4l devices.
Not all v4l devices are compat with that or must be attaches to different usb controllers
2016-08-30 22:28:13 +02:00
redPanther 02ee557300 move lightberry firmware to firmware folder (#208)
remove old stuff
2016-08-30 11:48:23 +02:00
redPanther e0430f088d fix #197
fix #197, prio 0 is set to black for infinity, when foreground effect is invalid
2016-08-29 19:26:42 +02:00
Rick van Hattem 61db9f43b8 Qcommandlineparser (#199)
* Replaced getoptplusplus with QCommandLineParser. Fixes #39

* enabling C++11 if possible

* enabling C++11 if possible

* fixed gcc compilation issues

* fixed linux builds and improved os x build

* trying to fix dispmanx

* trying to fix dispmanx

* simplified travis build script

* fixed argumentparser default values

* rewrote validator system and made sure default arguments are processed correctly

* rewrote validator system and made sure default arguments are processed correctly

* fixed bool vs. regular options

* oops... removing debug code

* reverted screenshot api change
2016-08-28 15:10:43 +02:00
penfold42 c13f2e20ec Added source and cid to e1.31 driver. (#207)
source defaults to "hyperion on <hostname>"
cid defautls to randomly generated on each startup

        "device" :
        {
                "name"       : "DMX_e131",
                "type"       : "e131",
                "universe"   : 1,
                "cid" : "{204b83c-efb5-4b23-b2d0-35939d561061}",
                "source-name": "This is my custom e1.31 source",
                "host"       : "239.255.0.1",
                "port"       : 5568,
                "colorOrder" : "rgb"
        },
2016-08-28 10:45:18 +02:00
penfold42 cc8185691a Renamed the lowlevel providers from LedXXXDevice to ProviderXXX (#206)
%s/LedUdpDevice/ProviderUdp/g
git mv LedUdpDevice.cpp ProviderUdp.cpp
git mv LedUdpDevice.h ProviderUdp.h

vi `grep -l LedHID *`
%s/LedHIDDevice/ProviderHID/g
git mv LedHIDDevice.cpp ProviderHID.cpp
git mv LedHIDDevice.h ProviderHID.h

vi `grep -l LedRs *`
%s/LedRs232Device/ProviderRs232/g
git mv LedRs232Device.cpp ProviderRs232.cpp
git mv LedRs232Device.h ProviderRs232.h

vi `grep -l LedSpi *`
%s/LedSpiDevice/ProviderSpi/g
git mv LedSpiDevice.cpp ProviderSpi.cpp
git mv LedSpiDevice.h ProviderSpi.h
2016-08-28 07:12:47 +02:00
penfold42 9cc3a2de2e LedUdpDevice now tries to parse the "host" as an IP address before trying to DNS resolve it (#205) 2016-08-27 14:05:09 +02:00
brindosch a6bf58c21e fix jsonrpc (2/2)
no ci NO CI
2016-08-25 13:54:30 +02:00
brindosch 13cc053d99 fix jsonrpc (1/2)
NO CI no ci [no ci]
2016-08-25 13:52:31 +02:00
brindosch bb94a21c83 Web: Add simple components control (#203) 2016-08-24 20:09:27 +02:00
penfold42 cea4db8e60 Fix throw error in udp, fix default SPI device (#198)
* Fix throw error so it correctly fails on invalid output hostnames

* Fixed broken default /dev/spidev0.0 string

* UDP devices now use "host" and "port" rather than "output"
2016-08-24 06:05:00 +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
redPanther d679affeb4 Leddevice rework2 (#193)
* commit debug code to save it due to merge

* migrate first devices to new device registry and configure on runtime

* fadecandy and rs232 resets device if config is set

* try to hunt crash on osx

* test commit if this works with osx

* refactor spi devices

* cleanup

* refactor leddevices file, tinkerforge and ws2812b

* refactor raw usb devices

* refactor udp devices

* - add tpm2net driver
- remove old udp driver from build (files left in place for reference for new udp driver)
- json serverinfo shows available leddevices

* finish rework part 2 of leddevices

* add schemas for leddevices.
currently only compiled in, but not usedx
2016-08-23 20:07:12 +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
Paulchen-Panther 62a24348f9 Fix "if" statement in XShmGetImage check and other things (#192)
* Fix "if" statement

Nach dem testen des Codes, leider übersehen und nicht rückgängig gemacht.
Entschuldigung.

* Move XRenderSetPictureFilter from "grab" to "setupResources" part

* Resize destination image to target screen dimension once

* Fix coding style and add check for image resize
2016-08-23 07:04:57 +02:00
Paulchen-Panther 6acf68c87e Update X11 Grabber (scaling improvements) (#191)
* Add transform Matrix for scaling

* Add Image scaling by XRender

* Coding Style correction
2016-08-22 11:59:07 +02:00
penfold42 c8318ff0c7 support > 170 leds with E1.31 (#189)
* Add support for > 170 leds. These are send as multiple packets
Change default latchtime to be smaller

* code cleanup

* more code tidying
added *.swp to gitignore
2016-08-20 22:39:21 +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
brindosch ceeed07e6c Update package creation (#186)
* Update packages.cmake

* Update packages.cmake

* Update postinst

* Update packages.cmake

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update CMakeLists.txt

* update cc
2016-08-20 16:37:45 +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
penfold42 85e3f154d6 DMX512/sACN/E1.31 support (#184)
* Started on support for sACN/E1.31/DMX512
Just a clone of udpraw for now

* It's ALIVE!!
This adds somewhat working DMX512/sACN/E1.31 support.
I've tested it against an ESPixelStick but have no other "real" hardware
TODO:
configure universe#
configure universe and led offset
configure source names (all hard coded now...)

* oops.... forgot that dmx element 0 isnt rgb data but needs to be zero

* added universe support in the config
assorted code cleanups
2016-08-19 17:14:52 +02:00
redPanther 55cc06615b hot fix for json checker
now shema extension with 'default' 'title' and 'description' is valid for the checker
2016-08-19 08:50:48 +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
Paulchen-Panther b9ad2977de Update and fix JSON writer (#183)
* Fixing the check of createKey in handleConfigSetCommand

* Update schema-config.json

* add overwrite option to configset command

* add overwrite option to setConfig function

* add overwrite option to setConfig function
2016-08-18 21:11:21 +02:00
redPanther e46d392ed1 - in json reply the command is written again, to better identify it. (#182)
- also added a transaction number (tan). This is a user defined number to track exactly every reply
2016-08-17 11:46:36 +02:00
redPanther f6f7f55e92 fix warning 2016-08-16 18:14:36 +02:00
redPanther 26a70170fb webserver fix (#181)
fix default index.html in subfolders
fix \r\n appended to data
2016-08-16 17:12:47 +02:00
brindosch c00edfb658 update webui (#180) 2016-08-16 00:20:31 +02:00
redPanther 8e8c21fa3b add command for getting schema via json api (#179)
* - update coding style
- add command for getting schema via json api
- json api: merge config commands into one single "config" command with subcommands

* make setconfig work
2016-08-15 22:32:01 +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
Paulchen-Panther 68fd395670 JSON RPC Writer (configSet) (#175)
* Remove "endOfJson" Value

Deprecated value from Hypercon

* Remove "endOfJson" Value

Deprecated value from Hypercon

* Add writeJson function to JsonFactory

* ability to ignore required value in schema file

* Remove "endOfJson" Value

* Add handleConfigSetCommand function

* Add handleConfigSetCommand function

* Update JsonSchemas.qrc

* Update schema.json

* Update JsonSchemaChecker.cpp

* Add configSet command to Hyperion-remote

* Add setConfigFile function

* Add setConfigFile function

* Add schema-configset.json
2016-08-14 20:17:12 +02:00
redPanther 97181fa83c leddevice refactoring. code style and extension of baseclass to avoid dups (#174) 2016-08-14 10:46:44 +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
penfold42 5a902add81 Added "invert" and "spimode" options to ws2801, ws2812spi and sk6812spi devices (#172)
* Added "invert" and "spimode" options to ws2801, ws2812spi and sk6812spi devices

* fixed test/TestSpi.cpp

* some coding style wish
2016-08-13 19:54:08 +02:00
redPanther 9c27db390d Kodi initial fix (#171)
* fix #158

* fix initial state of playbackstate
2016-08-13 10:05:11 +02:00
redPanther 7ee2e7cf8d rework kodi grabbing mode for all grabbers (#169)
* pull out setgrabbing mode from every grabber into parent class

* implement optional kodi check for v4l

* fix typo

* fix dispmanx build
2016-08-12 23:07:32 +02:00