From 33dc4f369a92691b9998065096ef231ffd318ac5 Mon Sep 17 00:00:00 2001
From: Faruk Hammoud <farukhammoud@gmail.com>
Date: Sun, 5 Apr 2020 22:02:53 +0200
Subject: [PATCH] test commpss
---
controllerApp/controllerApp.pde | 12 ++++++++----
.../__pycache__/mobile.cpython-37.pyc | Bin 1514 -> 1524 bytes
controllerPackage/controller/mobile.py | 1 +
controllerPackage/test.py | 4 ++--
controllerSite/controllerSite.py | 15 +++++++++------
5 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/controllerApp/controllerApp.pde b/controllerApp/controllerApp.pde
index 91c57d2..d033b1d 100644
--- a/controllerApp/controllerApp.pde
+++ b/controllerApp/controllerApp.pde
@@ -50,14 +50,18 @@ void onFlick( float x, float y, float px, float py, float v)
void onPinch(float x, float y, float d)
{
- Size = constrain(Size+d, 1, 2000);
- net.sendPinch(x, y, d);
+ if (d != 0){
+ Size = constrain(Size+d, 1, 2000);
+ net.sendPinch(x, y, d);
+ }
}
void onRotate(float x, float y, float ang)
{
- Angle += ang;
- net.sendRotation(x, y, ang);
+ if (ang != 0){
+ Angle += ang;
+ net.sendRotation(x, y, ang);
+ }
}
//these still work if we forward MotionEvents below
diff --git a/controllerPackage/controller/__pycache__/mobile.cpython-37.pyc b/controllerPackage/controller/__pycache__/mobile.cpython-37.pyc
index 4acd6c8c635238d78613519f6f3724a877be60a2..34e2be9c24f843ecfdad2392e5acabeda68dd515 100644
GIT binary patch
delta 101
zcmaFG{e_#?iI<m)fq{YHyGd7E)<oVHjL8$fbusEpZe*0=6)0g$VQyw*WGG>*VVt~x
zF`I`2q?D15k&B6gak41W7DnF5a;y@QA2DrW6r4Pj`4FS%<Or6djFOY(SSK>FP2Rw2
F1pqdY8JYk9
delta 87
zcmeyu{fe8{iI<m)fq{X6U9BrFa3b#uM(2s&x)@a^H!@1Ga+ENpFi&2=n9aooQo_i`
r$i*~So@oms&*Upirx*n$&u2cwC^9*T<tU@XWDVAdjI5J)v04EDy~7qb
diff --git a/controllerPackage/controller/mobile.py b/controllerPackage/controller/mobile.py
index 82ce8d8..ff39ff4 100644
--- a/controllerPackage/controller/mobile.py
+++ b/controllerPackage/controller/mobile.py
@@ -9,6 +9,7 @@ class Mobile:
print('Its not my problem')
else:
print('ill handle it!')
+ print(data)
def on_left_swipe(self):
if self.help:
print('[LEFT SWIPE DETECTED] You can overwrite on_left_swipe to handle it.')
diff --git a/controllerPackage/test.py b/controllerPackage/test.py
index e1ca7f4..c7045e2 100644
--- a/controllerPackage/test.py
+++ b/controllerPackage/test.py
@@ -4,5 +4,5 @@ from time import sleep
c = Controller('a1b2c3')
c.connect()
print('luckly..')
-sleep(3)
-c.disconnect()
+
+
diff --git a/controllerSite/controllerSite.py b/controllerSite/controllerSite.py
index 425319b..f727201 100644
--- a/controllerSite/controllerSite.py
+++ b/controllerSite/controllerSite.py
@@ -30,11 +30,14 @@ def allowed_file(filename):
def multicast(code):
if request.method == 'POST':
content = request.json
- print(content)
- print(code,content['id'])
- with app.app_context():
- socketio.emit('multicast', request.get_json(), broadcast = True,namespace='/'+code)
- return jsonify({"code":code,"id":content['id']})
+ if not 'id' in content:
+ print('[PROBLEM]',content)
+ return jsonify({})
+ else:
+ print(code,content['id'])
+ with app.app_context():
+ socketio.emit('multicast', request.get_json(), broadcast = True,namespace='/'+code)
+ return jsonify({"code":code,"id":content['id']})
return '''
<!doctype html>
<title>Use a HTTP POST Request</title>
@@ -45,7 +48,7 @@ def confirmReception():
@socketio.on('code')
def handle_code(json, methods=['GET', 'POST']):
print('code received: ' + str(json))
- socketio.emit('message', json, callback=confirmReception,namespace='/a1b2c3')
+ socketio.emit('message', json,namespace='/a1b2c3')
if __name__ == '__main__':
socketio.run(app,debug = True,host = "0.0.0.0",port = 80)
--
GitLab