From f5bbbc00afbb9c218bf7ad69b6f4931299642207 Mon Sep 17 00:00:00 2001
From: Mathieu Moran <mathieumoran1@gmail.com>
Date: Sat, 18 Nov 2023 14:02:49 -0500
Subject: [PATCH] websocket doesn't work

---
 __pycache__/app.cpython-310.pyc         | Bin 1288 -> 0 bytes
 __pycache__/app_account.cpython-310.pyc | Bin 885 -> 0 bytes
 __pycache__/app_car.cpython-310.pyc     | Bin 419 -> 0 bytes
 __pycache__/app_events.cpython-310.pyc  | Bin 1179 -> 0 bytes
 __pycache__/app_obd.cpython-310.pyc     | Bin 3675 -> 0 bytes
 app.py                                  |  30 +++++++------
 app_events.py                           |  34 ++++++++------
 app_obd.py                              |  20 +++++----
 requirements.txt                        |  57 ++++++++++++++++++++++++
 9 files changed, 106 insertions(+), 35 deletions(-)
 delete mode 100644 __pycache__/app.cpython-310.pyc
 delete mode 100644 __pycache__/app_account.cpython-310.pyc
 delete mode 100644 __pycache__/app_car.cpython-310.pyc
 delete mode 100644 __pycache__/app_events.cpython-310.pyc
 delete mode 100644 __pycache__/app_obd.cpython-310.pyc
 create mode 100644 requirements.txt

diff --git a/__pycache__/app.cpython-310.pyc b/__pycache__/app.cpython-310.pyc
deleted file mode 100644
index 26d4e5f6ce74335e2a43e436ec6109f9b0c61768..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1288
zcmZ`&J&)Wr5EUg#tKHS^o$tf3oe!wA0N?3~qzjA$Hj-2aCr%nQ0#6*@X-|{{l1g%m
zGhAGXG*|f#?3VsZER!m~Ab^`>$aS1e5doYTJ`Tt?Z${m0Hu3NaUVRI%1JC>2ZnnP&
zH(%gVzoFqCCyggaL4;rUA}9hu3rZ~RH(?Pv9~F`FqhjQIT*S_gi!u738H-6VAs!Hz
z-jE`J$!Z44njjLc=4%gqvfANvO?b$oUp&m&b;t;jn2#ND#~~9$raW=T9!&Y{(w80V
zFAn&e@7$8&5Dpi2`7V6G@9;goe~V1vaCL9(755=oJm3d#fAJwdy!EjH|G8V)-9NBS
zFQX>>s$uHV>_})i$Wnvo8>Yd`1iOS%g6g|gfuRf4wWk>|vFfTz&~^8g<dwZ+`}1-0
z1ee-Hqfx~htXC86-;n2C7Mz;!0-B~<PHKGY=i>`4n#?z0FY8uIY>W5CleSOJy!|v6
zt<J0b2L)2)y4Hf_PrGUm&}x-`UF&a#v;2z5S{-#~JZF7>++Uf{-95G}D4N)hiA*q9
z(wyt+|0&0qv!RSs{nKTP*&Bw$QTvzJCYoZt2{37nfwGmyzMP?3?jV&qM@psY0r-Dq
zvWb?Llj#!-w6`EHJ?-mYMX$XzO7@a)a!tzc+KPrucCoUit{95m=C%)6WJZXU_=E}F
z8`54WLo_DjgXon>s;<>2RH?6eK#?hDnwj{YhHh133z2(h_HijIL*&m%L@05niOW*3
zx-HA)(RV|e>I+ES%%oei(w}O5k+QTJl<q{@cTykYuuM6qO4hw)zKo8JEMEVL?<_xl
zhGE(c;tXW^ki!c$G&-$S`q|0JNtOkMTHa>#?!-_Woc?<|EF8{;b3^S_*+(XPVaHcm
zRX1IFFNCyx+2~X;X{J^%R#n~5YP`G_U?vuVAMG?r`~TZYTPC0^O@K!xuG?CdHk#XJ
zqM$8QwiFY}ZqVSy%C-ERP)wfpOyb`%|5Bd2F@0vY(nJoHCSjbHnB~q)fKzWK?#P15
zP-g=<wDN&1=>4y-HF5FhqT@pYj|pa|M`-SO4@p8|e?sDor5M>2QR0*6FB-&X<KV!j
GfBp@Nu}KU7

diff --git a/__pycache__/app_account.cpython-310.pyc b/__pycache__/app_account.cpython-310.pyc
deleted file mode 100644
index 305bffa5dd227d04cbf9a4ec6251170e50051a49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 885
zcmZWn&2AGh5Vm){yH2txp{h9X0y&U<feJNhr4k7RiGTzvBx}2NgUkM;UI(cWH~Jvu
z*aI)*3kOcT0w-o1QX=7%zZrYH-+VK6I~?{24E=qkeo#Vw;$nY<usDI)y#tU$(u(BN
z+aM3T4f7CePz5#186_&bi@uROmSLVqmUBh(o{Usa^i^;-fJk~yWGs_gB9pH{K9qDp
z#{3tsllhps_{~S73hCnOb*rz`=BTrU)#V3WFJTr-HCZ)F7rmdpo-IoJX@3N;IDy$c
z1yEinh@>*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)<t&Kmg`zIw#&}7eX+jCZVIEjXYGZ|3Sj<AIa%E}E`)Bh6=I0uV}O{(v`;sq=~m}t
zci_Li;U)W$Q*bP?Q1Df_3>U;8&6pVu#^6ISc)~?>D^=x1@4+JsG2L9YkHPD(k15@x
zyX+X4k0aEHtrEiZg#e;;g?=i;^}49G5i^2+%^?CdW)Coji2zWCFOm~ZQ|9-^2QI;;
z`2L<klY7=bCJis9j{)@=J84jv<BPWZr0ndK<DK_(YZ7GdAq)_(498wV^xs`qu=2_F
gM0t(AdVahu=s7;5?g)UB5ltx%7{xE9oE`>$0Is~w>;M1&

diff --git a/__pycache__/app_car.cpython-310.pyc b/__pycache__/app_car.cpython-310.pyc
deleted file mode 100644
index 6575be24d120c1b08727a94877cf4aca5b7db4f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 419
zcmY*UJ8Hu~5S?AgK?u1qxrB>&+Z4eVoZwV$LK-#0TDt*(e%W0W4(Z~{<N!HJ8nwAa
zs?5k3l!5o=``EYbe4YZu*Y|^6Q~u#*8WA-cf?p8rz<?1a!iUVk$R}7v1<n73q;5m-
z*F+X_VIY@A7<qy`G7)LwA=+wJ2-;tQYZh(^o*fx@2PCF*v0sW|R=37hRK(s^FQ4FI
zI{Lj;brV#fp1pNmg)-Dy-M2+w+a`FmE5l=dP)F@bf72d}(p`szcB}3<B#32G21I_<
zGo|7!BU`J>VoyHls?oJY98yGb&{te%h_Ah_&Kq|{+R@E~W<29RF+5vMAQR(+J~QUY
THSZluhUD)2$a>VVs|EZ4fs0eG

diff --git a/__pycache__/app_events.cpython-310.pyc b/__pycache__/app_events.cpython-310.pyc
deleted file mode 100644
index f648fd72c8a8df3d37390caa049863945b9e4af6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1179
zcmZ8gOK%e~5VpO~Y|;qv=%GR=*FBI$9HBy}DYO-(IW!1qg%oYqrd_&^V0(*NC8zev
zjT=HrBrcrz9sC7fIrR@9)DvSTRa-21UOQ`lGxNDxS_%-XFF&`~FAJgH+PS_UhMvO~
zIS7g<&QXD5jI~X2QdqHNY%8~88)8=O#E#K!>>5pC!tg1IJw~Sf48;xRO#^DrFm<SV
zhE8$Zq#pIpP~4&o8h~D+)-DR0=WrtmvGRAT^pMG|KG^QyfU|_|C@-zblBF`$N!J$v
zrw3cCfRF(A6u^QeMgtHH7ml}fPHy$`jFqypIEvAedmBv3tlaPP*Va2iCbAaYZZ{;#
z8S$)?%B@E-E7%XjJviNni>Fah$|#NA2*yPuGg&0jdX?4%94(@aOm5bD(Q(2v@vz#X
zQ8F40*^&O%9UZHs#ohCeuW`E|eB$E(^9GnV3d9i56EOwe2SXx>DgKNnP~aF1VNb2u
zRf)P|GU5A74nmvjKUFiYs?l&>hjMAcimFr&)XJsFHvPRSk84a^V`{@T-~#O87B;aP
z;0$m`GT^?0A<-0TFejT70FGf6hlIbBWNJzB0SGX`(iy{iCPcbp0uv(d$iy<9weai-
z<W4<m&0vaSo7!J(>Wr<0CR%@UCXV!{4eE}a8G$Twk7&Nt_Xn5FxanPf`Gi7mXK=m>
zV9#}LmG$T`y}(aYz(?7lNnukp=j|HiKt$yw>Bl<bOxc<WFhLz1LW_;t?rrybuZC;=
z{$Q~6`h~I#ZD@8>R215rGd5DbFoe!3WwRoa%Hu3&iD03tY&{+2?^V_OI8QKO2o=gJ
zva*&;DCeN6xiH=Te@acL;0|o@0ECYTwy_VB@<|)Ffle!62Y*`u`Li5wog21Q`+c5>
z!{H?$u3wL8NJ9d62Xo4JnzO)N)zn6krd3@^z6_~cb5PmaP!GSWO;VMHwR3#>l4~H%
ho6&qy{wlPi&e=2Fba5L*3$<_uyTE&&1lV_4&OfDc8*=~v

diff --git a/__pycache__/app_obd.cpython-310.pyc b/__pycache__/app_obd.cpython-310.pyc
deleted file mode 100644
index cac1e9cea41021bc46a865946a7e707f520ae40b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3675
zcmai1-)~#D6()JFq^m2*KNZK0+eTZKZ9-SO!#1q*x*~1tB|ulTTbu>cfC@Jv<H(Wj
zRd}hm7Gz+6^SJ#F(%uRT`)l^Z*FEKVC<bi9y6^DHvgJCM3?A~3hrHx>KAuA-l}gC)
z`^(9%)$%f9e<$VQk4EpHr0bk9$t3TxW>)hice-c_)S~P4yr#!#%<KBSTr=m|epmGJ
z%{<z?S&%FWP>T1M%*p&qCiADF86GfM_%m;olo*#MtXY}X3)6aWS}zUDYFU+Ju)$6_
zXNrwOSg$-{@rKXT>apakS><e4QOmNZuBqxNKNXxkV!xwrSASoPb6I`FkC+T)=_PBf
z$+E1VzOHiPb-6I%a#1e5#QMz*xhz*Oazn1lD(X#nO|GGSLtdBbsNa+u@&@X+B!9r_
zo39A7MxEP0Mn;)VPf<Hf+RvaQXy^BzY8A;g*<JhzD0fiODuiN$De&Y{U~Nx&SlhSW
zryuRM0srhrZJKx&C0&CsY{Xj3a7b<hBwT{2yixaTJ~fdUq}J2@p3S9wr6l&_r>gtp
zOQy-c|9Wq`7n|+&_QO=^blY@HFWTNs+Jl~oO}c%rW9|<gZy!gxlfIKYmfKOk-$K3B
zKej=u)rmW%)hf|e@(_8R=OG`KvFEL`!3GWi%Q)((R?CL1Rxgo*F15?8*7HHs%|>(?
z^WBav2wGU@AZVwl4-v33cRg6OyxU3JNgS)TQPLLgo;8P+X|t2WTU%S!J2FpR5oE)a
z596BBI?=VH-5zMI<j$N^JQ&ee9JX6%7&hh;cESkPu{QxZP8`N#U-AiuCNLsSxyc;}
zU@jWN;P(BU+n?;*eo)VA`lj{b<j8ud(Kcri838u5pAbuQfN?m<C)#Lor46XRg&CJX
zu$2R4TF!rD@g{6jnjMHTU*Le`29&v@KxcFuca-~RWJl3eBaA0`c8`pZ*gR(j$Dx{t
zgFesok)1!a^JVUAyq<5oA`T8W;pN&Ce;{2`;M(JECw;2q)^P38;FGA+MZcz*dKIFc
zv*Gz<TkfQ-sS01_`nnSv8-i%9DT7^Gy&zIvz=n9Ci6wS{Y|j_`4*Jpshydug;*|-f
zZ;`DB+qpYMK+V7!Lm44#JQDy5_llsA;!p6r^hUfTMx2<CfdxAsc6Xeef3+RP{Hx}p
zKj-=Z_()(~alWow50GCq&)x2PLvLcA6kJTCL5_Wgs>2t|BNE%<8GOp-Wu$sZj1T~8
zGaaF5U<+h~=ur1G-C$cbE>>k+v*A>O!3EUawXDH<8zucVL?9M$^?|gj10H&LpiUC}
zbW)T39O!gAh{KMdpQDj6l(NMMAKn@PctCs002V2XKVlnff|zb{<Gl1HU~6WPmLAc}
z!kJ6vwX=~U#L~vTzKPFd^b0b^5W7^Xi&$+7QTzFzqm?EmSYP!z#@Sn+t{kB2D%H0I
zt-2~oRb6Cw`Q0SxU&e;m_c4kK>;d<=02)gOjp2XGzWC3YugRi~GW*d-XK4Hl${89)
z9D0X7LJ-b9ViTev!p`vF2$=%-d~OQk0QeN8H^nEE{&g0GrZg@~Kf`HUnJ~R$7G%yW
znx#{OvFk36y19AkA!OqXSQJM5aG7!^+5xr4E3$}CM?LhV{COYE$##)e9qOxdKA34Z
ziEG0L;nWAO=(vu-!_`JoLja6wTD4W@1%gEFmi``whl`);&Os-Ry0sTkcc6BLmETfb
z>%_HZ{ii$DgREDlek3wGKk6UQ(nLxdw3A*hie+kZ4?f%5+tqJSZ|?a(>0{?*{SMhW
zQV{l<LcS(a+XCWIJm_}yThw)p1cg|eb6c^(B>G+GUwYPS_oNN9O8ZHS6#7Flbzx~1
zo7`z0qCfpEL_il~Mu|X#&{sf?vRL6&9)4A>h<~hA+?>}F<gZxh{}AM(DM3Cq1t~y?
zf(gb&DW-(L^GUyJO42iBQ<%}AGG36rDL67LVKfJ4FFMz|5z@v>GC$$paQ*U}>t`DF
z=-P070j{TzHC(^K;lKIpliH5{J`MY5@8}<)Szoc`X>_{eS^X0XTMw4brTV8(b%Dgp
zgZe#E&%Nge=iL1>8rUI09@IZ4amit{kwcU$wq0;o=B_2mxdP7mXSpQ4S}VDYzus9R
ztn_+k4c|sWDZm{!>0X<Fo)frh#c?Q+5}Yem(aR4@7y6;mh`V)oH)qLcUc(pN2%z^G
z!{u*)o<)9X+Vx5XGn!YzT)4Nl-`d^3djaZmY%jq|h$54`k4pan!WP|gt7X10modJB
z;S-dU?p1avC`$S$3p^BbA;iDea+>Vs^2Xc)m^?L2)*!dR6PVH?dOXC&74(R#$0bd_
z;htQ-bX37MDavFQmX@JMJJHP?_tmA%+TdBI+ogB!A7PjhTj&zIi~P0Tqscd2$Z`C$
z#Vl)f;)Co77}BG8`gU=EQF?ai!|f+yE<JOn`Q}$hNBYO4e?a0x5^s}mbap|kxc5a{
z_3`gTY`Hp*PucrMB(Y1kF3V)6qysuA-EJ=&Zx*F&@P76(|9}8a>4L1|u}y!z@ZpyQ
k5#-5F^e6D{L}nK^c<=}Db>IbspaeWNgD|)jtd<x52MJvOMgRZ+

diff --git a/app.py b/app.py
index 929fd0a..c7dbfaf 100644
--- a/app.py
+++ b/app.py
@@ -1,11 +1,10 @@
+import app_obd, app_car, app_account, time, app_events, threading
 from flask import Flask, render_template, make_response, json
-import app_obd, app_car, app_account, time, app_events
 from app_events import socketio
 
-app = Flask(__name__)
-socketio.init_app(app)
-app_obd.obd_connection()
+port_number = 8000
 
+app = Flask(__name__)
 @app.route('/')
 def index():
     print("hello")
@@ -16,20 +15,23 @@ def dtc():
     return render_template('dtc.html')
 
 # not sure if im gonna use this
-@app.route('/api/obd_speed/')
+@app.route('/api/obd_speed')
 def data():
     data = app_obd.speed
     response = make_response(json.dumps(data))
     response.content_type = 'application/json'
     return response
 
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(
-        description="Run the Flask application with a custom port."
-    )
-    parser.add_argument(
-        "--port", type=int, default=5000, help="Port number (default is 5000)"
-    )
-    args = parser.parse_args()
+if __name__ == '__main__':  
+    socketio.init_app(app)
 
-    app.run(debug=True, port=args.port)
\ No newline at end of file
+    p_obd_connection = threading.Thread(target=app_obd.obd_connection)
+    p_obd_connection.start()
+
+    print("allo?")
+    
+    ##
+    ## only debug, remove in prod
+    ##
+    app.run(host='localhost', port=port_number)
+    ##
diff --git a/app_events.py b/app_events.py
index ac98017..d1d731b 100644
--- a/app_events.py
+++ b/app_events.py
@@ -4,6 +4,7 @@ import app_obd, app_account, time, threading
 
 socketio = SocketIO()
 uptime_lock = threading.Lock()
+os_type = ["Linux","Windows"]
 
 @socketio.on('connect')
 def connect_event():
@@ -12,25 +13,32 @@ def connect_event():
     uptime()
 
 def uptime():
-    thread = Thread(target=loop_uptime)
+    thread = Thread(target=loop_uptime(os_type[1]))
     thread.daemon = True
     thread.start()
 
-def loop_uptime():
+def loop_uptime(os):
+    loop = True
     uptime_lock.acquire()
-    try:
-        loop = True
+    if os == "Linux":
+        try:
+            while loop == True:
+                boottime = time.clock_gettime(time.CLOCK_BOOTTIME)
+                # Convert to hours, minutes, and seconds
+                seconds = int(boottime)
+                minutes, seconds = divmod(seconds, 60)
+                hours, minutes = divmod(minutes, 60)
+                time.sleep(1)
+                uptime = f"{hours:02d}:{minutes:02d}:{seconds:02d}"   
+                socketio.emit("rpi_uptime", uptime)
+        finally:
+            uptime_lock.release()
+    elif os == "Windows":
         while loop == True:
-            boottime = time.clock_gettime(time.CLOCK_BOOTTIME)
-            # Convert to hours, minutes, and seconds
-            seconds = int(boottime)
-            minutes, seconds = divmod(seconds, 60)
-            hours, minutes = divmod(minutes, 60)
             time.sleep(1)
-            uptime = f"{hours:02d}:{minutes:02d}:{seconds:02d}"   
-            socketio.emit("rpi_uptime", uptime)
-    finally:
-        uptime_lock.release()
+            socketio.emit("rpi_uptime", "1")
+            
+        
 
     
 
diff --git a/app_obd.py b/app_obd.py
index 23370de..e18b8c2 100644
--- a/app_obd.py
+++ b/app_obd.py
@@ -6,7 +6,8 @@ from threading import Thread
 status = None
 speed = 0
 rpm = 0
-
+coonnection = None
+    
 class OBD:
     def __init__(self):
         self.status = status
@@ -19,13 +20,6 @@ obd_rpm_lock = threading.Lock()
 obd_dtc_lock = threading.Lock()
 obd_state_lock = threading.Lock()
 
-try:
-    print(obd_status[2])
-    connection = obd.OBD()  # put linux /dev/rfi... something in () for the rpi bluetooth adpater
-
-except Exception as e:
-    print("An error occurred:", str(e))
-
 def get_speedtime():
     global speed
     date = datetime.now()
@@ -34,6 +28,14 @@ def get_speedtime():
     return [str(time_now), speed]
 
 def obd_connection():
+    global connection
+    try:
+        print(obd_status[2])
+        connection = obd.OBD()  # put linux /dev/rfi... something in () for the rpi bluetooth adpater
+
+    except Exception as e:
+        print("An error occurred:", str(e))
+
     if connection.is_connected():
         print(obd_status[1])
         print("OBD connection established.")
@@ -77,6 +79,7 @@ def obd_state(status):
     loop = True
     try:
         while loop == True:
+            print(obd_status[status])
             socketio.emit('obd_status', obd_status[status])
             time.sleep(2)
     finally:
@@ -89,6 +92,7 @@ def obd_speed():
     loop = True
     try:
         while loop == True:
+            print(obd_status[3])
             socketio.emit('obd_status', obd_status[3])
             global speed
             speed = speed + 1
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..f183cb9
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,57 @@
+Babel==2.8.0
+bidict==0.22.1
+blinker==1.4
+click==8.0.3
+colorama==0.4.4
+command-not-found==0.3
+cryptography==3.4.8
+dbus-python==1.2.18
+distro==1.7.0
+distro-info===1.1build1
+Flask==2.0.1
+Flask-SocketIO==5.3.6
+h11==0.14.0
+httplib2==0.20.2
+importlib-metadata==4.6.4
+itsdangerous==2.1.0
+jeepney==0.7.1
+Jinja2==3.0.3
+keyring==23.5.0
+launchpadlib==1.10.16
+lazr.restfulclient==0.14.4
+lazr.uri==1.0.6
+lxml==4.9.3
+MarkupSafe==2.0.1
+more-itertools==8.10.0
+netifaces==0.11.0
+oauthlib==3.2.0
+obd==0.7.2
+Pint==0.20.1
+pycairo==1.20.1
+PyGObject==3.42.1
+pyinotify==0.9.6
+PyJWT==2.3.0
+pyOpenSSL==21.0.0
+pyparsing==2.4.7
+pyserial==3.5
+python-apt==2.4.0+ubuntu1
+python-engineio==4.8.0
+python-socketio==5.10.0
+pytils==0.4.1
+pytz==2022.1
+PyYAML==5.4.1
+SecretStorage==3.3.1
+simple-websocket==1.0.0
+simplejson==3.17.6
+six==1.16.0
+systemd-python==234
+tools==0.1.9
+tqdm==4.66.1
+ubuntu-advantage-tools==8001
+ufw==0.36.1
+unattended-upgrades==0.1
+wadllib==1.3.6
+Werkzeug==2.0.2
+wget==3.2
+wsproto==1.2.0
+zipp==1.0.0