Added addon settings for more setup options

Author: tociek

addon.py

@@ -20,7 +20,7 @@
 
 try:
 
-	device_versions = [ HyperPyCon.HyperPyCon.ws2801 , HyperPyCon.HyperPyCon.adalight ]
+	device_versions = [ HyperPyCon.HyperPyCon.ws2801 , HyperPyCon.HyperPyCon.adalight, HyperPyCon.HyperPyCon.apa102]
 	selected_device = xbmcgui.Dialog().select("Select your led device:",device_versions)
 	if selected_device == 0:	
 		if "spidev" not in subprocess.check_output(['ls','/dev']):
@@ -34,7 +34,13 @@
 
 	hyperion_configuration = HyperPyCon.HyperPyCon(int(nol_horizontal), int(nol_vertical))
 	hyperion_configuration.set_device_type(device_versions[selected_device])
-
+	hyperion_configuration.set_device_rate(int(addon.getSetting("rate")))
+	hyperion_configuration.set_color_values(float(addon.getSetting("redThreshold")), float(addon.getSetting("redGamma")),float(addon.getSetting("redBlacklevel")),float(addon.getSetting("redWhitelevel")),"RED")
+	hyperion_configuration.set_color_values(float(addon.getSetting("greenThreshold")), float(addon.getSetting("greenGamma")),float(addon.getSetting("greenBlacklevel")),float(addon.getSetting("greenWhitelevel")),"GREEN")
+	hyperion_configuration.set_color_values(float(addon.getSetting("blueThreshold")), float(addon.getSetting("blueGamma")),float(addon.getSetting("blueBlacklevel")),float(addon.getSetting("blueWhitelevel")),"BLUE")
+	hyperion_configuration.set_smoothing(addon.getSetting("smoothingType"),int(addon.getSetting("smoothingTime")),int(addon.getSetting("smoothingFreq")))
+	hyperion_configuration.set_blackborderdetection((addon.getSetting("bbdEnabled") == "true"), float(addon.getSetting("bbdThreshold")))
+	
 	options = ["Right/bottom corner and goes up","Left/bottom corner and goes up","Center/bottom and goes right","Center/bottom and goes left"]
 	selected_index = xbmcgui.Dialog().select("Select where the led chain starts:",options)
 
@@ -70,7 +76,7 @@
 	hyperion_configuration.save_config_file(hyperion_configuration.create_config(grabber),"/storage/.config/","hyperion.config.new")
 	hyperion_configuration.restart_hyperion("hyperion.config.new")
 	if not xbmcgui.Dialog().yesno(addonname, "Have you seen the rainbow swirl?"):
-		xbmcgui.Dialog().ok(addonname, "Something went wrong... Please try running hyperion from command line to see the error...")
+		xbmcgui.Dialog().ok(addonname, "Something went wrong... Please try running hyperion from command line to see the error... (on openelec: /storage/hyperion/bin/hyperiond.sh /storage/.config/hyperion.config.new)")
 		sys.exit()
 	else:
 		xbmcgui.Dialog().ok(addonname, "For the next 10 seconds you will see test image and leds should adjust to that image. Check if the leds are showing the right colors in the right places."+
@@ -92,9 +98,9 @@
 	elif xbmcgui.Dialog().yesno(addonname, "Hyperion is now running with the newly created config. Would you like to restart hyperion with previous config?"):
 		hyperion_configuration.restart_hyperion("hyperion.config.json")
 
-	xbmcgui.Dialog().ok(addonname, "That\'s all Folks! :) . Enjoy!")
+	xbmcgui.Dialog().ok(addonname, "That\'s all Folks! :) . Enjoy!", "If you'd like to fine tune advanced parameters, please modify addon settings before running it")
 
 except Exception, e:
-        xbmcgui.Dialog().ok(addonname, repr(e))
+        xbmcgui.Dialog().ok(addonname, repr(e),"Please report an error at github issue list")
 
 

addon.xml

@@ -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.0.0" provider-name="tociek">
+<addon id="plugin.program.hyperion.configurator" name="Hyperion Config Creator" version="1.1.0" provider-name="tociek">
     <requires>
 		<import addon="xbmc.python" version="2.14.0"/>
 	</requires>

changelog.txt

@@ -1,3 +1,3 @@
 1.0.0 Initial Release
-
-1.0.1 Bug fixes + control image added + bottom/center configuration added
+1.0.1 Bug fixes + control image added + bottom/center configuration added
+1.1.0 Addon settings added to provide more setup options; APA102 added

resources/lib/HyperPyCon.py

@@ -12,6 +12,7 @@
 class HyperPyCon:
 	ws2801 = "Lightberry for Raspberry Pi"
 	adalight = "Lightberry USB"
+	apa102 = "Lightberry HD APA"
 	def __init__(self, nol_horizontal, nol_vertical):
 		self.total_number_of_leds = ((nol_horizontal + nol_vertical) * 2)
 		self.led_chain = LedChain(self.total_number_of_leds)
@@ -39,6 +40,20 @@ def set_device_type(self,device_type):
 		if device_type == HyperPyCon.adalight:
 			self.device.type = "adalight"
 			self.device.output = "/dev/ttyACM0"
+		elif device_type == HyperPyCon.apa102:
+			self.device.type = "apa102"
+			
+	def set_device_rate(self, rate):
+		self.device.rate = rate
+		
+	def set_color_values(self,threshold, gamma, blacklevel,whitelevel, color_name):
+		self.transform.set_color_transformation(HyperionConfigSections.SingleColor(threshold,gamma,blacklevel,whitelevel), color_name)
+		
+	def set_smoothing(self, type, time_ms, update_frequency):
+		self.smoothing = HyperionConfigSections.Smoothing(type,time_ms,update_frequency)
+		
+	def set_blackborderdetection(self,enabled,bbdthreshold):
+		self.blackborderdetector = dict(enable = enabled, threshold = bbdthreshold)
 
 	def create_config(self, add_grabber):
 		self.color.add_transformation(self.transform)

resources/lib/HyperionConfigSections.py

@@ -12,7 +12,7 @@ class Device:
 	name = "MyPi"
 	type = "ws2801"
 	output = "/dev/spidev0.0"
-	rate = 250000
+	rate = 500000
 	color_order = "rgb"
 
 	def __init__(self):
@@ -61,7 +61,7 @@ class Transform:
 	hsv = None
 
 	def __init__(self,tranformation_id, leds_indexes_range, hsv, red, green, blue):
-		"""red,green,blue must be isntances of SingleColorParms"""
+		"""red,green,blue must be instances of SingleColorParms"""
 		self.tranformation_id = tranformation_id
 		self.leds_indexes_range = leds_indexes_range
 		self.red = red
@@ -71,6 +71,15 @@ def __init__(self,tranformation_id, leds_indexes_range, hsv, red, green, blue):
 
 	def to_dict(self):
 		return OrderedDict(id = self.tranformation_id, leds = self.leds_indexes_range, hsv = self.hsv.to_dict(), red = self.red.to_dict(), green = self.green.to_dict(), blue = self.blue.to_dict())
+		
+	def set_color_transformation(self, single_color_settings, color_name):
+		if color_name == "GREEN":
+			self.green = single_color_settings
+		elif color_name == "RED":
+			self.red = single_color_settings
+		else:	
+			self.blue = single_color_settings
+			
 
 class Smoothing:
 	type = 'linear'

resources/settings.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings>
+    <category label="32010">
+	<setting label="Device" type="lsep"/>
+	<setting label="Rate" type="number" id="rate" default="500000"/>
+	
+	<setting label="Smoothing" type="lsep"/>
+	<setting label="Type" type="select" id="smoothingType" values="linear|none" default="linear"/>
+	<setting label="Time [ms]" type="number" id="smoothingTime" default="100"/>
+	<setting label="Update frequency [Hz]" type="number" id="smoothingFreq" default="20"/>
+	
+	<setting label="Black border detection" type="lsep"/>
+	<setting label="Enable" type="bool" id="bbdEnabled" default="true"/>
+	<setting label="Threshold" type="slider" enable="eq(-1,true)" id="bbdThreshold" default="0.10" range="0,0.05,1" />
+
+    </category>
+
+    <category label="Color">
+	<setting label="Red" type="lsep"/>
+        <setting label="Threshold" type="slider" range="0,0.02,1" id="redThreshold" default=0.05/>
+        <setting label="Gamma" type="slider" range="0,0.2,4"   id="redGamma" default=2.0/>
+        <setting label="Blacklevel" type="slider" id="redBlacklevel" default="0" range="0,0.02,1" />
+        <setting label="Whitelevel" type="slider" id="redWhitelevel" default="1.0" range="0,0.02,1" />
+
+        <setting label="Green" type="lsep"/>
+        <setting label="Threshold" type="slider" range="0,0.02,1" id="greenThreshold" default=0.05/>
+        <setting label="Gamma" type="slider" range="0,0.2,4"   id="greenGamma" default=2.0/>
+        <setting label="Blacklevel" type="slider" id="greenBlacklevel" default="0" range="0,0.02,1" />
+        <setting label="Whitelevel" type="slider" id="greenWhitelevel" default="0.84" range="0,0.02,1" />
+
+	<setting label="Blue" type="lsep"/>
+        <setting label="Threshold" type="slider" range="0,0.02,1" id="blueThreshold" default=0.05/>
+        <setting label="Gamma" type="slider" range="0,0.2,4"   id="blueGamma" default=2.0/>
+        <setting label="Blacklevel" type="slider" id="blueBlacklevel" default="0" range="0,0.02,1" />
+        <setting label="Whitelevel" type="slider" id="blueWhitelevel" default="0.84" range="0,0.02,1" />
+    </category>
+</settings>