Added simple effect system
This commit is contained in:
@@ -26,10 +26,11 @@ import asyncio
|
|||||||
|
|
||||||
import spectra
|
import spectra
|
||||||
|
|
||||||
from zeroconf import Zeroconf, ServiceInfo
|
from zeroconf import Zeroconf
|
||||||
|
|
||||||
from ledd import controller, VERSION
|
from ledd import controller, VERSION
|
||||||
from ledd.decorators import ledd_protocol
|
from ledd.decorators import ledd_protocol
|
||||||
|
from ledd.effectstack import EffectStack
|
||||||
from ledd.stripe import Stripe
|
from ledd.stripe import Stripe
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
@@ -43,6 +44,7 @@ class Daemon:
|
|||||||
loop = None
|
loop = None
|
||||||
""" :type : asyncio.BaseEventLoop """
|
""" :type : asyncio.BaseEventLoop """
|
||||||
protocol = {}
|
protocol = {}
|
||||||
|
effects = []
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
Daemon.instance = self
|
Daemon.instance = self
|
||||||
@@ -57,8 +59,8 @@ class Daemon:
|
|||||||
log.info("No config file found!")
|
log.info("No config file found!")
|
||||||
|
|
||||||
# create zeroconf service info
|
# create zeroconf service info
|
||||||
self.zinfo = ServiceInfo("_ledd._tcp", "LedD Daemon",
|
# self.zinfo = ServiceInfo("_ledd._tcp", "LedD Daemon",
|
||||||
port=self.config.get(self.daemonSection, 'port', fallback=1425))
|
# port=self.config.get(self.daemonSection, 'port', fallback=1425))
|
||||||
|
|
||||||
# SQL init
|
# SQL init
|
||||||
self.sqldb = sqlite3.connect(self.config.get(self.databaseSection, 'name', fallback='ledd.sqlite'))
|
self.sqldb = sqlite3.connect(self.config.get(self.databaseSection, 'name', fallback='ledd.sqlite'))
|
||||||
@@ -75,7 +77,7 @@ class Daemon:
|
|||||||
logging.getLogger("asyncio").setLevel(logging.DEBUG)
|
logging.getLogger("asyncio").setLevel(logging.DEBUG)
|
||||||
|
|
||||||
# announce server to network
|
# announce server to network
|
||||||
self.register_zeroconf()
|
#self.register_zeroconf()
|
||||||
|
|
||||||
# main loop
|
# main loop
|
||||||
self.loop = asyncio.get_event_loop()
|
self.loop = asyncio.get_event_loop()
|
||||||
@@ -134,7 +136,33 @@ class Daemon:
|
|||||||
def deregister_zeroconf(self):
|
def deregister_zeroconf(self):
|
||||||
zeroconf = Zeroconf()
|
zeroconf = Zeroconf()
|
||||||
zeroconf.unregister_service(self.zinfo)
|
zeroconf.unregister_service(self.zinfo)
|
||||||
log.info("Unregistered ledd daemon with zeroconf")
|
|
||||||
|
@ledd_protocol(protocol)
|
||||||
|
def start_effect(self, req_json):
|
||||||
|
"""
|
||||||
|
|
||||||
|
:param req_json: dict of request json
|
||||||
|
"""
|
||||||
|
effect = EffectStack()
|
||||||
|
self.effects.append(effect)
|
||||||
|
effect.stripes.append(self.controllers[1].stripes[0])
|
||||||
|
effect.start()
|
||||||
|
|
||||||
|
# asyncio.ensure_future(asyncio.get_event_loop().run_in_executor(self.executor, effect.execute))
|
||||||
|
|
||||||
|
log.debug("recieved action: %s", req_json['action'])
|
||||||
|
|
||||||
|
@ledd_protocol(protocol)
|
||||||
|
def start_effect(self, req_json):
|
||||||
|
"""
|
||||||
|
|
||||||
|
:param req_json: dict of request json
|
||||||
|
"""
|
||||||
|
effect = BaseEffect(Stripe(),self.loop)
|
||||||
|
self.effects.append(effect)
|
||||||
|
asyncio.ensure_future(asyncio.get_event_loop().run_in_executor(self.executor, effect.execute))
|
||||||
|
|
||||||
|
log.debug("recieved action: %s", req_json['action'])
|
||||||
|
|
||||||
@ledd_protocol(protocol)
|
@ledd_protocol(protocol)
|
||||||
def set_color(self, req_json):
|
def set_color(self, req_json):
|
||||||
|
@@ -13,3 +13,11 @@
|
|||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
class BaseEffect(object):
|
||||||
|
"""
|
||||||
|
This class only defines default meta-data for effects.
|
||||||
|
"""
|
||||||
|
name = "BaseEffect"
|
||||||
|
version = "0.1"
|
||||||
|
author = "LeDD-Freaks"
|
||||||
|
18
ledd/effects/fadeeffect.py
Normal file
18
ledd/effects/fadeeffect.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
from ledd.effects.generatoreffect import GeneratorEffect
|
||||||
|
import spectra
|
||||||
|
|
||||||
|
|
||||||
|
class FadeEffect(GeneratorEffect):
|
||||||
|
author = "LeDD-Freaks"
|
||||||
|
version = "0.1"
|
||||||
|
|
||||||
|
name = "Fade Effect"
|
||||||
|
description = "Fades through the HSV color wheel"
|
||||||
|
|
||||||
|
def execute(self):
|
||||||
|
scale = spectra.scale([spectra.hsv(0.0, 1.0, 1.0), spectra.hsv(360, 1.0, 1.0)]).domain([0, 20000])
|
||||||
|
|
||||||
|
i = 0
|
||||||
|
while True:
|
||||||
|
yield scale(i)
|
||||||
|
i = (i + 1) % 20000
|
30
ledd/effects/generatoreffect.py
Normal file
30
ledd/effects/generatoreffect.py
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
|
||||||
|
from ledd.effects.baseeffect import BaseEffect
|
||||||
|
from spectra import Color
|
||||||
|
|
||||||
|
|
||||||
|
class GeneratorEffect(BaseEffect):
|
||||||
|
"""
|
||||||
|
This is a base class for simple effects.
|
||||||
|
It should yield a new color on each execution.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
"""
|
||||||
|
Do not override, use setup instead.
|
||||||
|
"""
|
||||||
|
self.generator = self.execute()
|
||||||
|
|
||||||
|
def setup(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def execute_internal(self):
|
||||||
|
c = next(self.generator)
|
||||||
|
assert isinstance(c, Color)
|
||||||
|
return c
|
||||||
|
|
||||||
|
def execute(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def tear_down(self):
|
||||||
|
pass
|
23
ledd/effectstack.py
Normal file
23
ledd/effectstack.py
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
import asyncio
|
||||||
|
|
||||||
|
from ledd.effects.fadeeffect import FadeEffect
|
||||||
|
|
||||||
|
|
||||||
|
class EffectStack(object):
|
||||||
|
def __init__(self):
|
||||||
|
self.stripes = []
|
||||||
|
self.effect = FadeEffect()
|
||||||
|
# TODO
|
||||||
|
self.modifiers = []
|
||||||
|
|
||||||
|
def start(self):
|
||||||
|
asyncio.get_event_loop().call_soon(self.execute)
|
||||||
|
|
||||||
|
def execute(self):
|
||||||
|
color = self.effect.execute_internal()
|
||||||
|
|
||||||
|
for stripe in self.stripes:
|
||||||
|
stripe.set_color(color)
|
||||||
|
|
||||||
|
# schedule next execution
|
||||||
|
asyncio.get_event_loop().call_later(0.1, self.execute)
|
Reference in New Issue
Block a user