Permalink
Browse files

Lightberry XL added to device list

  • Loading branch information...
1 parent d0ed192 commit 7d9da96782c0a99780a79ea5ba1cb2ff685b1859 tociek committed Jan 3, 2017
Showing with 12 additions and 8 deletions.
  1. +5 −3 addon.py
  2. +2 −2 addon.xml
  3. +1 −0 changelog.txt
  4. +3 −2 resources/lib/HyperPyCon.py
  5. +1 −1 resources/settings.xml
View
@@ -72,9 +72,9 @@
try:
if HyperPyCon.HyperPyCon.amIonWetek() :
- device_versions = [ HyperPyCon.HyperPyCon.adalightapa102 , HyperPyCon.HyperPyCon.adalight ]
+ device_versions = [ HyperPyCon.HyperPyCon.adalightapa102 , HyperPyCon.HyperPyCon.adalight , HyperPyCon.HyperPyCon.lightberryXL ]
else:
- device_versions = [ HyperPyCon.HyperPyCon.adalightapa102 , HyperPyCon.HyperPyCon.adalight, HyperPyCon.HyperPyCon.ws2801, HyperPyCon.HyperPyCon.apa102]
+ device_versions = [ HyperPyCon.HyperPyCon.adalightapa102 , HyperPyCon.HyperPyCon.adalight, HyperPyCon.HyperPyCon.ws2801, HyperPyCon.HyperPyCon.apa102, HyperPyCon.HyperPyCon.lightberryXL]
selected_device = xbmcgui.Dialog().select("Select your led device:",device_versions)
if selected_device == -1:
sys.exit();
@@ -85,6 +85,8 @@
if selected_device == 0 or selected_device == 3:
suffix = "apa102"
+ elif selected_device ==4:
+ suffix = "xl"
else:
suffix = "ws2801"
@@ -116,7 +118,7 @@
hyperion_configuration.set_blackborderdetection((addon.getSetting("bbdEnabled") == "true"), float(addon.getSetting("bbdThreshold")))
hyperion_configuration.set_grabber_video_standard(addon.getSetting("videoStandard"))
hyperion_configuration.set_grabber_signal_off(addon.getSetting("colorWhenSourceIsOff"))
- if gpio_version:
+ if gpio_version or device_versions[selected_device] == HyperPyCon.HyperPyCon.lightberryXL:
#turn off unused leds if this is GPIO version of Lightberry
hyperion_configuration.disable_extra_leds(150-hyperion_configuration.total_number_of_leds)
View
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.program.hyperion.configurator" name="Hyperion Config Creator" version="1.7.0" provider-name="tociek">
+<addon id="plugin.program.hyperion.configurator" name="Hyperion Config Creator" version="1.8.0" provider-name="tociek">
<requires>
<import addon="xbmc.python" version="2.14.0"/>
</requires>
@@ -8,7 +8,7 @@
</extension>
<extension point="xbmc.addon.metadata">
<platform>linux</platform>
- <summary lang="en">Hyperion configuration wizard</summary>
+ <summary lang="en">Hyperion configuration wizard for Lightberry</summary>
<description lang="en">Easy to use wizard for vanilla users to create their hyperion config file easily. See addon settings for more options...</description>
<license>GNU General Public License, v2</license>
<language></language>
View
@@ -13,3 +13,4 @@
1.6.0 Turn off leds (up to 150th) if GPIO lightberry is in use
1.7.0 Small bugfixes and fixed depth of scan area (now it is static 8% and 10%)
1.7.1 V4l2 crop default values adjusted for HDMI 4.0 kit
+1.8.0 Lighberry XL added to led device type
@@ -14,6 +14,7 @@ class HyperPyCon:
apa102 = "Lightberry HD for Raspberry Pi (apa102)"
adalight = "Lightberry HD USB (ws2801)"
adalightapa102 = "Lightberry HD USB (apa102)"
+ lightberryXL = "Lightberry XL"
qty_of_disabled_leds=0
def __init__(self, nol_horizontal, nol_vertical,horizontal_depth, vertical_depth):
@@ -77,7 +78,7 @@ def install_hyperion():
return subprocess.call(["sh", "/storage/install_hyperion.sh"])
def set_device_type(self,device_type):
- if device_type == HyperPyCon.adalight:
+ if device_type == HyperPyCon.adalight or device_type == HyperPyCon.lightberryXL:
self.device.type = "adalight"
self.device.output = "/dev/ttyACM0"
elif device_type == HyperPyCon.apa102:
@@ -106,7 +107,7 @@ def set_blackborderdetection(self,enabled,bbdthreshold):
def create_config(self):
self.color.add_transformation(self.transform)
if self.qty_of_disabled_leds != 0:
- self.color.add_transformation(self.ledsoff_transform)
+ self.color.add_transformation(self.ledsoff_transform)
self.color.set_smoothing(self.smoothing)
if HyperPyCon.amIonWetek():
hyperion_config_dict = OrderedDict(
@@ -3,7 +3,7 @@
<category label="32010">
<setting label="Device" type="lsep"/>
<setting label="Rate" type="number" id="rate" default="500000"/>
- <setting label="Color order" type="select" values="Default|RGB|GRB|RBG|BGR|GBR" id="colorOrder" default="Default"/>
+ <setting label="Color order" type="select" values="Default|RGB|GRB|RBG|BGR|GBR|BRG" id="colorOrder" default="Default"/>
<setting label="Smoothing" type="lsep"/>
<setting label="Type" type="select" id="smoothingType" values="linear|none" default="linear"/>

0 comments on commit 7d9da96

Please sign in to comment.