From 36e6f95944899cfa04f1046b981d9d2521521906 Mon Sep 17 00:00:00 2001 From: waltem01 Date: Thu, 23 Nov 2023 10:07:17 +0100 Subject: [PATCH] better naming and methods --- API/main.py | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/API/main.py b/API/main.py index 4ce6167..0b4814c 100644 --- a/API/main.py +++ b/API/main.py @@ -2,48 +2,42 @@ from deps.samplebase import SampleBase from rgbmatrix import graphics -from flask import Flask, jsonify +from flask import Flask, request, jsonify from waitress import serve import time, threading -app = Flask(__name__) -display_text = "" -count = 0 - -@app.route('/api/test', methods=['GET']) -def get_data(): - global display_text, count - count = count + 1 - display_text = f"Test #{count}" - - data = {"success": True, "count": count, "text": display_text} - return jsonify(data) +api = Flask(__name__) -class Text(SampleBase): + +class Matrix(SampleBase): def __init__(self, *args, **kwargs): - super(Text, self).__init__(*args, **kwargs) + super(Matrix, self).__init__(*args, **kwargs) def run(self): self.font = graphics.Font() self.font.LoadFont("deps/fonts/9x18B.bdf") self.color = graphics.Color(255, 255, 255) + self.canvas = self.matrix.CreateFrameCanvas() + self.canvas.Clear() while True: - self.update() time.sleep(.05) def update(self): - self.canvas.Clear() - graphics.DrawText(self.canvas, self.font, 0, 18, self.color, display_text) self.canvas = self.matrix.SwapOnVSync(self.canvas) + self.canvas.Clear() + + def text(self, x, y, t): + graphics.DrawText(self.canvas, self.font, x*9, (y+1)*18, self.color, t) +matrix = None if __name__ == "__main__": - text = Text() - threading.Thread(target=lambda: serve(app, host="0.0.0.0", port=8080)).start() + matrix = Matrix() + threading.Thread(target=lambda: serve(api, host="0.0.0.0", port=8080)).start() - if not text.process(): - text.print_help() + if not matrix.process(): + matrix.print_help()