From e9f204d6bd3287dacf6bcf830ba07a5ca15cc22b Mon Sep 17 00:00:00 2001 From: Mathieu Moran Date: Tue, 28 Nov 2023 23:04:06 -0500 Subject: [PATCH] loopy loop, doesn't work, too many loops --- __pycache__/app_account.cpython-310.pyc | Bin 0 -> 885 bytes __pycache__/app_account.cpython-311.pyc | Bin 0 -> 1260 bytes __pycache__/app_car.cpython-310.pyc | Bin 0 -> 419 bytes __pycache__/app_car.cpython-311.pyc | Bin 0 -> 533 bytes __pycache__/app_events.cpython-310.pyc | Bin 0 -> 1434 bytes __pycache__/app_events.cpython-311.pyc | Bin 0 -> 2698 bytes __pycache__/app_obd.cpython-310.pyc | Bin 0 -> 3762 bytes __pycache__/app_obd.cpython-311.pyc | Bin 0 -> 8242 bytes app.py | 3 +-- app_events.py | 4 ++- app_obd.py | 32 +++++++++++------------- 11 files changed, 19 insertions(+), 20 deletions(-) create mode 100644 __pycache__/app_account.cpython-310.pyc create mode 100644 __pycache__/app_account.cpython-311.pyc create mode 100644 __pycache__/app_car.cpython-310.pyc create mode 100644 __pycache__/app_car.cpython-311.pyc create mode 100644 __pycache__/app_events.cpython-310.pyc create mode 100644 __pycache__/app_events.cpython-311.pyc create mode 100644 __pycache__/app_obd.cpython-310.pyc create mode 100644 __pycache__/app_obd.cpython-311.pyc diff --git a/__pycache__/app_account.cpython-310.pyc b/__pycache__/app_account.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..305bffa5dd227d04cbf9a4ec6251170e50051a49 GIT binary patch literal 885 zcmZWn&2AGh5Vm){yH2txp{h9X0y&U*OB_J}C3@nooB#d1$Ez5S@*b=IK80aI(Da`H(fF)mupf&&uEdz`sS&(}= z2ZprRGKi+Am17=9yS>#)c)5;0c!OQ6EQ|{Qpj_6e>hhkL1IYFJIIA0*mD$@)nJ%;1 z)U;8&6pVu#^6ISc)~?>D^=x1@4+JsG2L9YkHPD(k15@x zyX+X4k0aEHtrEiZg#e;;g?=i;^}49G5i^2+%^?CdW)Coji2zWCFOm~ZQ|9-^2QI;; z`2L$0Is~w>;M1& literal 0 HcmV?d00001 diff --git a/__pycache__/app_account.cpython-311.pyc b/__pycache__/app_account.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..bcd42bb6f0ef2a2c0aab1bd318a0f1e83b6f53a2 GIT binary patch literal 1260 zcmZuw&1(}u6rcS{Hr-8=+SH2GHsHln>_I$85uqs5fX#p+zKz z9&+ea3Z84Fi2q9pIfR9x;K^Ggo_g}V+3sp>XEVR|G4tNM_nXP*Y<7acaKEn6Zvr7d z(1?e8ri?#=vQHf12n}KgT#AOsrDRAT#fI3F4Ot)}p;BFm6C8r_B{qnWawH?|$c9P< zBjYGEWAd|c1H_4SE#CTHoGy}8;-q$olRgw7Bg|+RSx2allKK0q(Y8_aw!$+ zR&=V_vYIrMIp$+uyKVC3LN(E}c+Iw0C;n_|;W6c-mR7Zd=Ut?|SP_)qKHtiz`Y>w#5xWIp_>TMofRQ8!!jR1LM+G_m&6R{IOOX zXvMBN%*}T7;dH4_^25ogt~M;pb+rMR8s={Hw)fs2=N1OJg|0r5Qvwim5q_cX_azIQ F!9SH39(e!& literal 0 HcmV?d00001 diff --git a/__pycache__/app_car.cpython-310.pyc b/__pycache__/app_car.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..6575be24d120c1b08727a94877cf4aca5b7db4f3 GIT binary patch literal 419 zcmY*UJ8Hu~5S?AgK?u1qxrB>&+Z4eVoZwV$LK-#0TDt*(e%W0W4(Z~{VoyHls?oJY98yGb&{te%h_Ah_&Kq|{+R@E~W<29RF+5vMAQR(+J~QUY THSZluhUD)2$a>VVs|EZ4fs0eG literal 0 HcmV?d00001 diff --git a/__pycache__/app_car.cpython-311.pyc b/__pycache__/app_car.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d009e079d3e729ac97ec432cdba93db20fc16cb2 GIT binary patch literal 533 zcmZusze~eF6n>YaSWD}qgH8pf40aL(kuEBA>LM;7a9ndI1d_JiB}2ubLx&FT{SOpz z_D>NctN%cxPMv%&X>_RXxc9#I>$~rsTdfA5y}e(mF2+wvDs$Fg*+#Gc3wj`729iBl z0IzsU^FUhH;Mze|pvczAau>k@6nIR6XGt~#&o1XP`&{Ut8l-umwDGQ&Bs>78dSMdq z5!QEER*OecMFfacpjh}=`Ec}a6kj8457{3=LSLwi?2pyWE(LnlQ zJm!JWo$(~Aa~=-Eg!B6*is@7t2{A2nQ~221pF59@Ii4ly=(`SW4MnUt&l;Sgm^32X zHh-~TiU;vbI4Z$bb7 literal 0 HcmV?d00001 diff --git a/__pycache__/app_events.cpython-310.pyc b/__pycache__/app_events.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..50afc3e391b869a5d5565bfaee984c5aa5e4814f GIT binary patch literal 1434 zcmZ8g&2Jk;6yKSh{qTD2wum56aj+0VSctgg22=c8novO&P7(;Z3|CIl;f#AHG>Js8 z>~eoac)-J_&VnQ{@9^lUlk|9($H4pCedG*#SMahkBqn@RXJA~h&!KXV9gw}a=G8pgOA1IybR_*TYN*}JB?mYi(aFOfNffDju$RRUcBlAj| zP}vmn+AvY(+W2jw^HTio$S$~B^6aBgS?N(W`Wl?oNawmtNB8TjEg=jwdXVeS+vCw? zDs%N-eauH`(@exUp6xc5rnd=TZR%jYA&`)UBqkA&Jy2dM4FSXR(!2$Vb~MqHlh>gm zoc==Q(9@YSfxTp_ZDH8q6*^)gbSh7TJ{o!wp<=p4T{n|;S|+H~L|-<-_&gP5T^SGR zCAD?4{d(Mf$@b9mD)ttzIbhYC+}Dcc6o%j+}!;G zqH(*2-NPe^ExWo0MD~Fg_s;wL8TrsevdK5amoUwaA$O;5e*5nC07Ss>x+{Q8J1T>B z?hXe{iX%0QO?Q1bDFC1*NVA{XTnfVwod7DdPN2_wa`4KPggm zHrbA&q+m83Z9xgMy~c8YvjsC|x+tVsR=1UwZ@{lMKf?~7Eb=z$x6q%~l^w8k*!a@5 k*zJHL$W3?;3e^_kV+6H&6-eyFWI%ivQut^@LO=HY10G;oBme*a literal 0 HcmV?d00001 diff --git a/__pycache__/app_events.cpython-311.pyc b/__pycache__/app_events.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..56f775a93a2bce3399046d40b868a9c4f193d743 GIT binary patch literal 2698 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 literal 0 HcmV?d00001 diff --git a/__pycache__/app_obd.cpython-311.pyc b/__pycache__/app_obd.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..48d43ab54dc3d29f91c276b8009e241a468aee7b GIT binary patch literal 8242 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 literal 0 HcmV?d00001 diff --git a/app.py b/app.py index c7dbfaf..872803c 100644 --- a/app.py +++ b/app.py @@ -3,8 +3,8 @@ from flask import Flask, render_template, make_response, json from app_events import socketio port_number = 8000 - app = Flask(__name__) + @app.route('/') def index(): print("hello") @@ -24,7 +24,6 @@ def data(): if __name__ == '__main__': socketio.init_app(app) - p_obd_connection = threading.Thread(target=app_obd.obd_connection) p_obd_connection.start() diff --git a/app_events.py b/app_events.py index d1d731b..b4d5bb4 100644 --- a/app_events.py +++ b/app_events.py @@ -10,7 +10,8 @@ os_type = ["Linux","Windows"] def connect_event(): print('Client connected') print('Getting OBD status...') - uptime() + socketio.emit("connect", "connected with server") + # uptime() def uptime(): thread = Thread(target=loop_uptime(os_type[1])) @@ -37,6 +38,7 @@ def loop_uptime(os): while loop == True: time.sleep(1) socketio.emit("rpi_uptime", "1") + print("[+] sent uptime windows (1) packet") diff --git a/app_obd.py b/app_obd.py index e18b8c2..d5e0fcf 100644 --- a/app_obd.py +++ b/app_obd.py @@ -44,19 +44,20 @@ def obd_connection(): else: print("OBD connection failed.") print(obd_status[0]) - obd_events(2) + obd_events(0) @socketio.on('obd') def obd_events(status): if status == 1: - thread_speed = Thread(target=obd_state(1)) - thread_speed.daemon = True - thread_speed.start() + thread_state = Thread(target=obd_state(1)) + thread_state.daemon = True + thread_state.start() - elif status == 2: - thread_speed = Thread(target=obd_state(2)) - thread_speed.daemon = True - thread_speed.start() + # change status to 2 when done testing + elif status == 0: + thread_state = Thread(target=obd_state(2)) + thread_state.daemon = True + thread_state.start() # debug speed for testing thread_speed = Thread(target=obd_speed) @@ -75,15 +76,12 @@ def obd_events(status): def obd_state(status): - obd_state_lock.acquire() loop = True - try: - while loop == True: - print(obd_status[status]) - socketio.emit('obd_status', obd_status[status]) - time.sleep(2) - finally: - obd_state_lock.release() + while loop == True: + print(obd_status[status]) + socketio.emit('obd_status', obd_status[status]) + print("[+] websocket packet sent...") + time.sleep(2) def obd_speed(): obd_speed_lock.acquire() @@ -98,7 +96,7 @@ def obd_speed(): speed = speed + 1 time.sleep(1) if response.is_null(): - print("No data received. #"+ str(get_speedtime())) + print("TEST SPEED for DEBUG #"+ str(get_speedtime())) socketio.emit('obd_speed', get_speedtime()) else: print("Original value:", response.value)