forked from pvx/litsimaja
Add zone switching (#5)
Pixel calculation error Add zone switching Co-authored-by: siinus <pearu@siinus.com> Reviewed-on: pvx/litsimaja#5
This commit is contained in:
@@ -2,15 +2,18 @@ from rpi_ws281x import PixelStrip
|
|||||||
# from lib.strip.WindowStrip import WindowStrip
|
# from lib.strip.WindowStrip import WindowStrip
|
||||||
# from lib.strip.TkinterStrip import TkinterStrip
|
# from lib.strip.TkinterStrip import TkinterStrip
|
||||||
from lib.LoopSwitch import LoopSwitch
|
from lib.LoopSwitch import LoopSwitch
|
||||||
|
from lib.Regions import Regions
|
||||||
|
|
||||||
|
|
||||||
class Litsimaja(object):
|
class Litsimaja(object):
|
||||||
_loops: []
|
_loops: []
|
||||||
|
_regions: Regions
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self._strip = PixelStrip(290, 18, 800000, 10, False, 255, 0, 4104)
|
self._strip = PixelStrip(290, 18, 800000, 10, False, 255, 0, 4104)
|
||||||
self._loops = []
|
self._loops = []
|
||||||
self._strip.begin()
|
self._strip.begin()
|
||||||
|
self._regions: Regions = Regions(self.count_pixels(), [46, 96, 191, 241])
|
||||||
|
|
||||||
def count_pixels(self) -> int:
|
def count_pixels(self) -> int:
|
||||||
return self._strip.numPixels()
|
return self._strip.numPixels()
|
||||||
@@ -19,7 +22,10 @@ class Litsimaja(object):
|
|||||||
return self._strip
|
return self._strip
|
||||||
|
|
||||||
def set_pixel_color(self, n: int, color: int) -> None:
|
def set_pixel_color(self, n: int, color: int) -> None:
|
||||||
self._strip.setPixelColor(n, color)
|
if self._regions.is_pixel_enabled(n):
|
||||||
|
self._strip.setPixelColor(n, color)
|
||||||
|
else:
|
||||||
|
self._strip.setPixelColor(n, 0)
|
||||||
|
|
||||||
def show(self) -> None:
|
def show(self) -> None:
|
||||||
self._strip.show()
|
self._strip.show()
|
||||||
@@ -32,3 +38,9 @@ class Litsimaja(object):
|
|||||||
for loop in self._loops:
|
for loop in self._loops:
|
||||||
loop.stop()
|
loop.stop()
|
||||||
self._loops.clear()
|
self._loops.clear()
|
||||||
|
|
||||||
|
def switch_region(self, region_id: int):
|
||||||
|
self._regions.switch_region(region_id)
|
||||||
|
|
||||||
|
def get_region_ids(self):
|
||||||
|
return self._regions.list_region_ids()
|
||||||
|
|||||||
35
pyleds/lib/Regions.py
Normal file
35
pyleds/lib/Regions.py
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
class Regions(object):
|
||||||
|
_pixelsEnabled: [] = []
|
||||||
|
_regions: [] = []
|
||||||
|
|
||||||
|
def __init__(self, strip_length: int, splitters: []):
|
||||||
|
self._length: int = strip_length
|
||||||
|
start_pixel = 0
|
||||||
|
for i in splitters:
|
||||||
|
if i > self._length:
|
||||||
|
raise ValueError('splitter out of bounds, you idiot')
|
||||||
|
self._regions.append([start_pixel, i + 1, True])
|
||||||
|
start_pixel = i + 1
|
||||||
|
|
||||||
|
self._regions.append([start_pixel, self._length, True])
|
||||||
|
for i in range(self._length):
|
||||||
|
self._pixelsEnabled.append(True)
|
||||||
|
|
||||||
|
def region_switch(self, region_id: int, enabled: bool):
|
||||||
|
pixel_region = self._regions[region_id]
|
||||||
|
for i in range(pixel_region[0], pixel_region[1]):
|
||||||
|
self._pixelsEnabled[i] = enabled
|
||||||
|
self._regions[region_id][2] = enabled
|
||||||
|
|
||||||
|
def is_pixel_enabled(self, pixel_id: int):
|
||||||
|
return self._pixelsEnabled[pixel_id]
|
||||||
|
|
||||||
|
def switch_region(self, region_id: int):
|
||||||
|
status: bool = self._regions[region_id][2]
|
||||||
|
self.region_switch(region_id, not status)
|
||||||
|
|
||||||
|
def list_region_ids(self):
|
||||||
|
result = []
|
||||||
|
for i in range(len(self._regions)):
|
||||||
|
result.append(i)
|
||||||
|
return result
|
||||||
@@ -24,7 +24,11 @@ app = Flask(__name__, static_url_path='', static_folder='templates')
|
|||||||
|
|
||||||
@app.route('/', methods=['GET'])
|
@app.route('/', methods=['GET'])
|
||||||
def respondroot():
|
def respondroot():
|
||||||
return render_template('index.html', programs=Pl.list_all(True))
|
return render_template(
|
||||||
|
'index.html',
|
||||||
|
programs=Pl.list_all(True),
|
||||||
|
regions=lm.get_region_ids(),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@app.route('/run')
|
@app.route('/run')
|
||||||
@@ -47,4 +51,10 @@ def run_program(program):
|
|||||||
return Response(status=200)
|
return Response(status=200)
|
||||||
|
|
||||||
|
|
||||||
|
@app.route('/region/<region>', methods=['GET'])
|
||||||
|
def switch_region(region):
|
||||||
|
lm.switch_region(int(region))
|
||||||
|
return Response(status=200)
|
||||||
|
|
||||||
|
|
||||||
app.run('0.0.0.0', 8080)
|
app.run('0.0.0.0', 8080)
|
||||||
|
|||||||
@@ -70,6 +70,10 @@
|
|||||||
function doCancel() {
|
function doCancel() {
|
||||||
send_get('/crash');
|
send_get('/crash');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function switchRegion(region_id) {
|
||||||
|
send_get('/region/' + region_id);
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
@@ -83,6 +87,12 @@
|
|||||||
|
|
||||||
<label><input type="checkbox" id="looping" /><b> loop</b></label>
|
<label><input type="checkbox" id="looping" /><b> loop</b></label>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<p>Zone switch</p>
|
||||||
|
{% for region in regions %}
|
||||||
|
<button onclick="switchRegion({{ region }})">zone {{ region }}</button>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
<div class="row" id='loading' style="visibility: hidden"><b>LOADING!</b></div>
|
<div class="row" id='loading' style="visibility: hidden"><b>LOADING!</b></div>
|
||||||
<div class="section-rgb">
|
<div class="section-rgb">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|||||||
Reference in New Issue
Block a user