frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Rpi ws281x submodule update (#441)

Browse Source 
* Updated rpi_ws281x submodule version
added dma channel option

* update translations
This commit is contained in:
penfold42 2017-05-24 02:14:27 +10:00 committed by redPanther
parent 93d520706e
commit 564d4578d3
8 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -4,4 +4,4 @@
[submodule "dependencies/external/rpi_ws281x"] [submodule "dependencies/external/rpi_ws281x"]
path = dependencies/external/rpi_ws281x path = dependencies/external/rpi_ws281x
url = https://github.com/hyperion-project/rpi_ws281x.git url = https://github.com/hyperion-project/rpi_ws281x.git
branch = sk6812 branch = master

1
assets/webconfig/i18n/de.json
View File

@ -385,6 +385,7 @@
"edt_dev_spec_useRgbwProtocol_title" : "Nutze RGBW Protokoll", "edt_dev_spec_useRgbwProtocol_title" : "Nutze RGBW Protokoll",
"edt_dev_spec_maximumLedCount_title" : "Maximale Anzahl LEDs", "edt_dev_spec_maximumLedCount_title" : "Maximale Anzahl LEDs",
"edt_dev_spec_gpioNumber_title" : "GPIO Nummer", "edt_dev_spec_gpioNumber_title" : "GPIO Nummer",
"edt_dev_spec_dmaNumber_title" : "DMA Kanal",
"edt_dev_spec_gpioMap_title" : "GPIO Zuweisung", "edt_dev_spec_gpioMap_title" : "GPIO Zuweisung",
"edt_dev_spec_PBFiFo_title" : "Pi-Blaster FiFo", "edt_dev_spec_PBFiFo_title" : "Pi-Blaster FiFo",
"edt_dev_spec_gpioBcm_title" : "GPIO Pin", "edt_dev_spec_gpioBcm_title" : "GPIO Pin",

1
assets/webconfig/i18n/en.json
View File

@ -387,6 +387,7 @@
"edt_dev_spec_useRgbwProtocol_title" : "Use RGBW protocol", "edt_dev_spec_useRgbwProtocol_title" : "Use RGBW protocol",
"edt_dev_spec_maximumLedCount_title" : "Maximum LED count", "edt_dev_spec_maximumLedCount_title" : "Maximum LED count",
"edt_dev_spec_gpioNumber_title" : "GPIO number", "edt_dev_spec_gpioNumber_title" : "GPIO number",
"edt_dev_spec_dmaNumber_title" : "DMA channel",
"edt_dev_spec_gpioMap_title" : "GPIO mapping", "edt_dev_spec_gpioMap_title" : "GPIO mapping",
"edt_dev_spec_PBFiFo_title" : "Pi-Blaster FiFo", "edt_dev_spec_PBFiFo_title" : "Pi-Blaster FiFo",
"edt_dev_spec_gpioBcm_title" : "GPIO Pin", "edt_dev_spec_gpioBcm_title" : "GPIO Pin",

1
assets/webconfig/i18n/es.json
View File

@ -342,6 +342,7 @@
"edt_dev_spec_useRgbwProtocol_title": "Utilizar el protocolo RGBW", "edt_dev_spec_useRgbwProtocol_title": "Utilizar el protocolo RGBW",
"edt_dev_spec_maximumLedCount_title": "Número máximo de LEDs", "edt_dev_spec_maximumLedCount_title": "Número máximo de LEDs",
"edt_dev_spec_gpioNumber_title": "Número GPIO", "edt_dev_spec_gpioNumber_title": "Número GPIO",
"edt_dev_spec_dmaNumber_title" : "Canal DMA",
"edt_dev_spec_gpioMap_title": "Mapeo GPIO", "edt_dev_spec_gpioMap_title": "Mapeo GPIO",
"edt_dev_spec_PBFiFo_title": "Pi-Blaster FiFo", "edt_dev_spec_PBFiFo_title": "Pi-Blaster FiFo",
"edt_dev_spec_gpioBcm_title": "Pin GPIO", "edt_dev_spec_gpioBcm_title": "Pin GPIO",

1
dependencies/CMakeLists.txt vendored
View File

@ -5,6 +5,7 @@ if(ENABLE_WS281XPWM)
add_library(ws281x add_library(ws281x
external/rpi_ws281x/mailbox.c external/rpi_ws281x/ws2811.c external/rpi_ws281x/mailbox.c external/rpi_ws281x/ws2811.c
external/rpi_ws281x/pwm.c external/rpi_ws281x/dma.c external/rpi_ws281x/pwm.c external/rpi_ws281x/dma.c
external/rpi_ws281x/pcm.c
external/rpi_ws281x/rpihw.c) external/rpi_ws281x/rpihw.c)
endif() endif()

2
dependencies/external/rpi_ws281x vendored

@ -1 +1 @@
Subproject commit 4f5d727222ef4e48608d43c51b3b932c0840813d Subproject commit f580777219062568d2e43e998ecb0950deff9e99

2
libsrc/leddevice/LedDeviceWS281x.cpp
View File

@ -36,7 +36,7 @@ bool LedDeviceWS281x::init(const QJsonObject &deviceConfig)
} }
_led_string.freq = deviceConfig["freq"].toInt(800000ul); _led_string.freq = deviceConfig["freq"].toInt(800000ul);
_led_string.dmanum = deviceConfig["dmanum"].toInt(5); _led_string.dmanum = deviceConfig["dma"].toInt(5);
_led_string.channel[_channel].gpionum = deviceConfig["gpio"].toInt(18); _led_string.channel[_channel].gpionum = deviceConfig["gpio"].toInt(18);
_led_string.channel[_channel].count = deviceConfig["leds"].toInt(256); _led_string.channel[_channel].count = deviceConfig["leds"].toInt(256);
_led_string.channel[_channel].invert = deviceConfig["invert"].toInt(0); _led_string.channel[_channel].invert = deviceConfig["invert"].toInt(0);

14
libsrc/leddevice/schemas/schema-ws281x.json
View File

@ -14,17 +14,23 @@
"default": 18, "default": 18,
"propertyOrder" : 2 "propertyOrder" : 2
}, },
"dma": {
"type": "integer",
"title":"edt_dev_spec_dmaNumber_title",
"default": 5,
"propertyOrder" : 3
},
"invert": { "invert": {
"type": "boolean", "type": "boolean",
"title":"edt_dev_spec_invert_title", "title":"edt_dev_spec_invert_title",
"default": false, "default": false,
"propertyOrder" : 3 "propertyOrder" : 4
}, },
"rgbw": { "rgbw": {
"type": "boolean", "type": "boolean",
"title":"edt_dev_spec_useRgbwProtocol_title", "title":"edt_dev_spec_useRgbwProtocol_title",
"default": false, "default": false,
"propertyOrder" : 3 "propertyOrder" : 5
}, },
"whiteAlgorithm": { "whiteAlgorithm": {
"type": "string", "type": "string",
@ -34,7 +40,7 @@
"options" : { "options" : {
"enum_titles" : ["edt_dev_enum_subtract_minimum", "edt_dev_enum_sub_min_warm_adjust", "edt_dev_enum_white_off"] "enum_titles" : ["edt_dev_enum_subtract_minimum", "edt_dev_enum_sub_min_warm_adjust", "edt_dev_enum_white_off"]
}, },
"propertyOrder" : 4 "propertyOrder" : 6
}, },
"latchTime": { "latchTime": {
"type": "integer", "type": "integer",
@ -44,7 +50,7 @@
"minimum": 1, "minimum": 1,
"maximum": 1000, "maximum": 1000,
"access" : "expert", "access" : "expert",
"propertyOrder" : 5 "propertyOrder" : 7
} }
}, },
"additionalProperties": true "additionalProperties": true