diff --git a/server.py b/server.py index ae4e2ed..bacc900 100644 --- a/server.py +++ b/server.py @@ -8,8 +8,8 @@ from tenacity import wait_exponential, retry, stop_after_attempt app = Flask(__name__) -@retry(wait=wait_exponential(multiplier=2, min=2, max=30), stop=stop_after_attempt(5)) @app.route("/on") +@retry(wait=wait_exponential(multiplier=2, min=2, max=30), stop=stop_after_attempt(5)) def on(): result = subprocess.run( [f"gatttool -i hci0 -b b2:3b:03:00:14:d6 --char-write-req -a 0x0009 -n cc2333"], @@ -23,8 +23,8 @@ def on(): return "On" -@retry(wait=wait_exponential(multiplier=2, min=2, max=30), stop=stop_after_attempt(5)) @app.route("/off") +@retry(wait=wait_exponential(multiplier=2, min=2, max=30), stop=stop_after_attempt(5)) def off(): result = subprocess.run( [f"gatttool -i hci0 -b b2:3b:03:00:14:d6 --char-write-req -a 0x0009 -n cc2433"], @@ -38,8 +38,8 @@ def off(): return "Off" -@retry(wait=wait_exponential(multiplier=2, min=2, max=30), stop=stop_after_attempt(5)) @app.route("/colour") +@retry(wait=wait_exponential(multiplier=2, min=2, max=30), stop=stop_after_attempt(5)) def hello(): # a = request.query_string r = int(request.args.get("r")) @@ -50,15 +50,17 @@ def hello(): str = "56" + hex + "00f0aa" try: - result = subprocess.run( - [f"gatttool -i hci0 -b b2:3b:03:00:14:d6 --char-write-req -a 0x0009 -n {str}"], - stdout=subprocess.PIPE, - shell=True, - ).stdout.decode("utf-8") - print(result) - if "Characteristic value was written successfully" not in result: - raise Exception - else: - return request.query_string + result = subprocess.run( + [ + f"gatttool -i hci0 -b b2:3b:03:00:14:d6 --char-write-req -a 0x0009 -n {str}" + ], + stdout=subprocess.PIPE, + shell=True, + ).stdout.decode("utf-8") + print(result) + if "Characteristic value was written successfully" not in result: + raise Exception + else: + return request.query_string except: - raise Exception \ No newline at end of file + raise Exception