Merge pull request 'Update 210319' (#6) from feature/tempo into master

Reviewed-on: #6

pyleds/lib/Litsimaja.py

@@ -3,17 +3,17 @@ from rpi_ws281x import PixelStrip
 # from lib.strip.TkinterStrip import TkinterStrip
 from lib.LoopSwitch import LoopSwitch
 from lib.Regions import Regions
+from lib.Tempo import Tempo
 
 
 class Litsimaja(object):
-    _loops: []
-    _regions: Regions
-
     def __init__(self):
         self._strip = PixelStrip(290, 18, 800000, 10, False, 255, 0, 4104)
         self._loops = []
         self._strip.begin()
         self._regions: Regions = Regions(self.count_pixels(), [46, 96, 191, 241])
+        self._tempo: Tempo = Tempo(60)
+        self._selected_program = None
 
     def count_pixels(self) -> int:
         return self._strip.numPixels()
@@ -38,9 +38,30 @@ class Litsimaja(object):
         for loop in self._loops:
             loop.stop()
         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()
+
+    def build_status_array(self):
+        data = {'success': True}
+        features = {
+            'program': self._selected_program,
+            'tempo': {
+                'bpm': self.get_tempo().get_bpm()
+            },
+        }
+        regions = []
+        for region_id in self._regions.list_region_ids():
+            regions.append(self._regions.is_region_enabled(region_id))
+        features['region'] = regions
+        data['features'] = features
+        return data
+
+    def get_tempo(self):
+        return self._tempo
+    
+    def set_selected_program(self, program_name: str):
+        self._selected_program = program_name

pyleds/lib/ProgramLoading.py

@@ -15,6 +15,7 @@ def run(namespace: str, class_name: str, lm: Litsimaja, logger, args: [] = None)
     program = loaded_class(lm)
     logger.info('Loaded "' + module.name() + '" from ' + namespace + '.' + class_name + ' with args: ' + repr(args))
     lm.add_loop(program.get_loop())
+    lm.set_selected_program(namespace + '.' + class_name)
     program.run(args)
 
 

pyleds/lib/Regions.py

@@ -21,9 +21,12 @@ class Regions(object):
             self._pixelsEnabled[i] = enabled
         self._regions[region_id][2] = enabled
 
-    def is_pixel_enabled(self, pixel_id: int):
+    def is_pixel_enabled(self, pixel_id: int) -> bool:
         return self._pixelsEnabled[pixel_id]
     
+    def is_region_enabled(self, region_id: int) -> bool:
+        return self._regions[region_id][2]
+    
     def switch_region(self, region_id: int):
         status: bool = self._regions[region_id][2]
         self.region_switch(region_id, not status)

pyleds/lib/Tempo.py

@@ -0,0 +1,45 @@
+import time
+from typing import Optional
+
+
+class Tempo(object):
+    _last_beat: float
+    _override_beat: Optional[float] = None
+    
+    def __init__(self, bpm: float = 60):
+        self._bpm: float = bpm
+        self.update_last_beat()
+    
+    def set_bpm(self, bpm: float) -> None:
+        self._bpm = bpm
+    
+    def get_bpm(self) -> float:
+        return self._bpm
+    
+    def update_last_beat(self) -> None:
+        self._last_beat = time.time()
+    
+    def get_beat_time(self) -> float:
+        return 1000 / (self._bpm / 60)
+    
+    def get_beat_delay(self) -> Optional[float]:
+        tick = self._override_beat
+        if tick is None:
+            return None
+        self._override_beat = None
+        return tick - self._last_beat
+    
+    def sync_beat(self):
+        self._override_beat = time.time()
+        
+    def wait(self, beat_divider: int = 1):
+        now = time.time()
+        next_beat = self._last_beat + (self.get_beat_time() / beat_divider / 1000)
+        wait_time = next_beat - now
+        beat_delay = self.get_beat_delay()
+        if beat_delay is not None:
+            wait_time += beat_delay
+        if wait_time > 0:
+            time.sleep(wait_time)
+        self.update_last_beat()
+        return True

pyleds/program/peter/DiskoPidu.py

@@ -30,7 +30,8 @@ class DiskoPidu(Program):
             loop = args['loop']
 
         while self.get_loop().status():
-            self.disco(10, 500)
+            self._lm.get_tempo().wait()
+            self.disco(10, 0)
 
             if not loop:
                 break

pyleds/program/siinus/HzTick.py

@@ -9,6 +9,7 @@ def name():
 # Tick seconds like analog clock
 class HzTick(Program):
     def run(self, args: [] = None) -> None:
+        tempo = self._lm.get_tempo()
 
         while self.get_loop().status():
             second = time.localtime().tm_sec
@@ -17,8 +18,5 @@ class HzTick(Program):
             for i in range(self._lm.count_pixels()):
                 self._lm.set_pixel_color(i, (color_arr[0] << 16) | (color_arr[1] << 8) | color_arr[2])
             self._lm.set_pixel_color(second_pixel, 255)
-
             self._lm.show()
-
-            # Needs accurate time calculation to tick exactly when real second is passed
-            time.sleep(1)
+            tempo.wait()

pyleds/run.py

@@ -4,7 +4,8 @@ import sys
 
 import lib.ProgramLoading as Pl
 from lib.Litsimaja import Litsimaja
-from flask import Flask, request, Response, render_template
+from flask import Flask, request, Response, render_template, json
+from flask_accept import accept
 
 # logging
 logger = logging.getLogger('litsimaja')
@@ -20,27 +21,35 @@ logger.addHandler(stdout_handler)
 # start litsimaja
 lm = Litsimaja()
 app = Flask(__name__, static_url_path='', static_folder='templates')
+Pl.run('siinus', 'Wipes', lm, logger, {'color': [0, 0, 0]})
+Pl.run('peter', 'DiskoPidu', lm, logger, {})
+
+
+def lm_standard_xhr_response() -> Response:
+    return Response(response=json.dumps(lm.build_status_array()), status=200, mimetype='application/json')
 
 
 @app.route('/', methods=['GET'])
-def respondroot():
+@accept('text/html')
+def respond_root():
     return render_template(
         'index.html',
         programs=Pl.list_all(True),
         regions=lm.get_region_ids(),
+        status=lm.build_status_array()
     )
 
 
-@app.route('/run')
-def run():
-    Pl.run('siinus', 'MyProgram', lm, logger, {'color': [50, 50, 50]})
-    return Response(status=200)
+@app.route('/status', methods=['GET'])
+@accept('application/json')
+def respond_status():
+    return lm_standard_xhr_response()
 
 
 @app.route('/crash', methods=['GET'])
 def crash():
     lm.clear_loops()
-    return Response(status=200)
+    return lm_standard_xhr_response()
 
 
 @app.route('/program/<program>', methods=['POST'])
@@ -48,13 +57,26 @@ def run_program(program):
     args = request.get_json(force=True)
     prg = program.split('.')
     Pl.run(prg[0], prg[1], lm, logger, args)
-    return Response(status=200)
+    return lm_standard_xhr_response()
 
 
 @app.route('/region/<region>', methods=['GET'])
 def switch_region(region):
     lm.switch_region(int(region))
-    return Response(status=200)
+    return lm_standard_xhr_response()
+
+
+@app.route('/tempo/set/<float:bpm>', methods=['GET'])
+def set_tempo(bpm: float):
+    tempo = lm.get_tempo()
+    tempo.set_bpm(bpm)
+    return lm_standard_xhr_response()
+
+
+@app.route('/tempo/sync', methods=['GET'])
+def sync_beat():
+    lm.get_tempo().sync_beat()
+    return lm_standard_xhr_response()
 
 
 app.run('0.0.0.0', 8080)

pyleds/templates/custom.css

@@ -1,13 +1,3 @@
-.section-rgb {
-    height: 20rem;
-    text-align: center;
-}
-
-select {
-    width: 100%;
-    height: calc(100% - 1.5rem);
-}
-
 .colorpicker {
     display: inline-block;
     height: 38px;
@@ -27,4 +17,33 @@ select {
 
 .spacer-row {
     height: 2rem;
-}
+}
+
+button.region {
+    padding: 0 15;
+}
+
+button.region_off {
+    background-color: gray !important
+}
+
+div.program_select {
+    height: 300px;
+    overflow: auto;
+    border: 1px solid gray;
+    text-align: left;
+}
+
+div.program_select ul {
+    list-style: none;
+    border-bottom: 1px solid silver;
+    margin-bottom: 0;
+}
+
+div.program_select ul li {
+    margin: auto;
+}
+
+div.program_select ul li label {
+    margin: 3px auto;
+}

pyleds/templates/index.html

@@ -7,11 +7,16 @@
     <link rel="stylesheet" href="custom.css">
 
     <script type="text/javascript">
-        const hexToRgb = hex =>
-            hex.replace(/^#?([a-f\d])([a-f\d])([a-f\d])$/i
-                ,(m, r, g, b) => '#' + r + r + g + g + b + b)
-                .substring(1).match(/.{2}/g)
-                .map(x => parseInt(x, 16));
+        'use strict';
+        function hexToRgb(value) {
+            var aRgbHex = value.substring(1).match(/.{1,2}/g);
+            var aRgb = [
+                parseInt(aRgbHex[0], 16),
+                parseInt(aRgbHex[1], 16),
+                parseInt(aRgbHex[2], 16)
+            ];
+            return aRgb;
+        }
 
         function show_loading(visible) {
             document.getElementById('loading').style.visibility = visible ? 'visible' : 'hidden';
@@ -21,9 +26,11 @@
             show_loading(true);
             var http = new XMLHttpRequest();
             http.open('GET', url, true);
+            http.setRequestHeader('accept', 'application/json');
             http.onreadystatechange = function() {
                 if (http.readyState == 4 && http.status == 200) {
                     show_loading(false);
+                    updateStatus(http.responseText);
                 }
             };
             http.send();
@@ -34,6 +41,7 @@
             var http = new XMLHttpRequest();
             http.open('POST', url, true);
             http.setRequestHeader('Content-Type', 'application/json');
+            http.setRequestHeader('accept', 'application/json');
             http.onreadystatechange = function() {
                 if (http.readyState == 4 && http.status == 200) {
                     show_loading(false);
@@ -43,9 +51,33 @@
             http.send(json);
         }
 
+        function updateStatus(json) {
+            let status = JSON.parse(json);
+            document.getElementById('tempo').value = status.features.tempo.bpm;
+            let regions = status.features.region;
+           for (let i = 0, len = regions.length; i < len; i++) {
+                if (regions[i]) {
+                    document.getElementById('region_' + i).classList.remove('region_off');
+                } else {
+                    document.getElementById('region_' + i).classList.add('region_off');
+                }
+            }
+            let programs = document.getElementsByName('program_select');
+            for (var i = 0, len = programs.length; i < len; i++) {
+                if (programs[i].value === status.features.program) {
+                    programs[i].checked = true;
+                }
+            }
+        }
+
         function getProgramSelection() {
-            let select = document.getElementById('program');
-            return select.value;
+            let radios = document.getElementsByName('program_select');
+            for (var i = 0, length = radios.length; i < length; i++) {
+                if (radios[i].checked) {
+                    return radios[i].value;
+                }
+            }
+            return null;
         }
 
         function isLoop() {
@@ -81,38 +113,53 @@
     <div class="spacer-row"></div>
     <div class="container">
         <div class="row">
+            <button onclick="send_get('/status')">get</button>
             <button onclick="doInit()">intro</button>
             <button onclick="doCancel()">halt</button>
             <button onclick="doBlind()">leds off</button>
 
-            <label><input type="checkbox" id="looping" /><b> loop</b></label>
+            <label><input type="checkbox" id="looping" checked/><b> loop</b></label>
+        </div>
+        <div class="row">
+            <input id="tempo" type="number" step="0.1" onchange="send_get('/tempo/set/' + parseFloat(this.value).toFixed(2))" value="{{ status.features.tempo.bpm }}">
+            <button onclick="send_get('/tempo/sync')">sync</button>
         </div>
         <div class="row">
-            <p>Zone switch</p>
             {% for region in regions %}
-                <button onclick="switchRegion({{ region }})">zone {{ region }}</button>
+                {% set region_off = '' %}
+                {% if not status.features.region[region] %}
+                    {% set region_off = ' region_off' %}
+                {% endif %}
+                <button id="region_{{ region }}" class="region{{ region_off }}" onclick="switchRegion({{ region }})">zone {{ region }}</button>
             {% endfor %}
         </div>
         <div class="row" id='loading' style="visibility: hidden"><b>LOADING!</b></div>
-        <div class="section-rgb">
-            <div class="row">
-                <div class="one-third column">
-                    <select id="program" size="10">
-                        {% for group in programs %}
-                            <optgroup label="{{ group.group }}">
-                                {% for program in group.programs %}
-                                    <option value="{{ program.prg }}">{{ program.name }}</option>
-                                {% endfor %}
-                            </optgroup>
+        <div class="row">
+            <div class="program_select one-half column">
+                {% for group in programs %}
+                    <ul>
+                        <li>{{ group.group }}</li>
+                        {% for program in group.programs %}
+                            {% set pr_checked = '' %}
+                            {% if status.features.program == program.prg %}
+                                {% set pr_checked = ' checked' %}
+                            {% endif %}
+                            <li>
+                                <label>
+                                    <input type="radio" name="program_select" value="{{ program.prg }}"{{ pr_checked }}>
+                                    {{ program.name }}
+                                </label>
+                            </li>
                         {% endfor %}
-                    </select>
-                </div>
+                    </ul>
+                {% endfor %}
             </div>
         </div>
         <div class="row">
             <div class ="one-third column">
-                <input class="colorpicker" type="color" value="#ff0000" oninput="isChanged(this.value)">
+                <input id="colorpicker" class="colorpicker" type="color" value="#ff0000" oninput="isChanged(this.value)">
             </div>
+            <button onclick="isChanged(document.getElementById('colorpicker').value)">Set</button>
         </div>
     </div>
 </body>