From 87ef3a7b3995ddeec1b267319030416a27da004b Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Tue, 20 Oct 2015 17:06:27 +0200 Subject: [PATCH] Fixed comport interaction with ergometer --- .../.vs/ErgometerApplication/v14/.suo | Bin 124928 -> 124928 bytes .../ErgometerApplication/ClientApplicatie.cs | 35 ++++++++++-------- .../ErgometerApplication/MainClient.cs | 30 +++++++++++++-- .../bin/Debug/ErgometerLibrary.dll | Bin 22016 -> 22016 bytes 4 files changed, 45 insertions(+), 20 deletions(-) diff --git a/ErgometerApplication/.vs/ErgometerApplication/v14/.suo b/ErgometerApplication/.vs/ErgometerApplication/v14/.suo index 8dfd3961161890af408e1348cae6ff4b8afcddb0..f588abe2edc1cf90e2094960655b8b2d010d498b 100644 GIT binary patch delta 1974 zcmd6oe{54#6vyxFx^AOgr7c}`E2Xw|YpRUbGUzr$I@+*-8)E^%VHY~v&cSF``vYT1 zq*;heCuZ$c8qL7C2+;&J^hHPvA=PPuFZhmj=2tr~|`Ga@! z>AClu?>p_e=iRWW{;x+)urrIkZ+b7^bg`=`<>5$9R{O=)J_b5m(G ze=CjeNiRe~x@WWKt!kF69zaK*0)v1@cfk&U-KBLHb{Is!(&&b(B5CW;(v8CSCa1kInCi%3xU#gobd4I9n}|WsFAJ z#NO1InMWW~w(Swm{VhiW`cXWg)~HDN`AiF{7c5UFbH!8cP^T>)J`9 zjODF*l_hy`?8*q-LhD|8iqW-Zc0OIduZsjpob;0b;I@s#$YwH35+q9eh_onH8zPzjh100F~+d@VeK1rsNn%dv1G&{UMHKzcvM zN?<4cY}*;CT~p{az4B=Iz>m*gys+@y7iah(yMBuJ{L&3;?@%xt4#o$)fnk3l6b#2> z(|lhnZd4W`oA4P$wT(z0Bhz0`|GM>*&%93ga=Yfxx2LmtE!Aoq&i(^!mkS%tom-Y@ z9bNBv|Ba8cTy7uJhiBgpy`M- zTWh6yQSbe}Dx-8;-`zS=W9CB0n zsh=OGDmodK<~m(8W6e*-C7JrOmHcHee+I>wdIimeKcNcl;je`Gh@8J0`2QcStoLrL`gI?7BciAzqpu_w)XU;w6-uu5Zw|hRm zdp>@!fW)Cfmo-ihg#DBCF40kUyQlxPZGlcBBV1yB(N7nRpQ4LMVNOe`cNJEQp%r+J z3o*}S!f%bmJkRPZo|`+7uz(zp3QB+n$RHhz120Gddq5%B4IF?^%HZ#UBCr=^frB6e zIKd9E3+w~SsNW9H`^w;R1wj$~u>?=*)+^)?(pp+&`$l=2GU$MUQd1Zgl?D>mwR2J2 zY{;2nxrP;1E9FF$TJdHo-5l$Tk9pqtFQpR3OM$604>4DI81NobDUUZQppYh8+@+VfjlA%^Dk>;=j&$cKJNe~`^$6#ghJR{w$iiWB#S%bYQ zQ#;3`n%Jbw>Gl|rPMPREqvK&_%T9Evv)SIP@rDo0$(hq-Ul+TCq534YP@EPz(n_E8 z+?jNR4x!z*ZVK6nmGS_$V8F+GJq4^iaFSIf7P3gnJB4a7z*TVLizYna)f~3mQ5CIg z?`-&cU;4Fj+H$Aj$9(nNTz*Gs;F$0Elj+c8Gu;TiIYlMf2{}|0rcq8x(e;Z)o@IWJG7eca^at(LWrv$zFBPDBn75Bc3_1^D)+aEepJdwmpn7h)$1{$2Rn|V1xnm=u%A~bgf?Z?M1iA`<@uI7aw02Re;SZa-@RCV`vN7c^kNeNY u^|l#OqF03fZsr= 10) + if (response != "err") { - count = 0; - panelGraphView.updateAllCharts(MainClient.Metingen); - } + Meting m = MainClient.SaveMeting(response); - count++; + heartBeat.updateValue(m.HeartBeat); + RPM.updateValue(m.RPM); + speed.updateValue(m.Speed); + distance.updateValue(m.Distance); + power.updateValue(m.Power); + energy.updateValue(m.Energy); + actualpower.updateValue(m.ActualPower); + + if (count >= 10) + { + count = 0; + panelGraphView.updateAllCharts(MainClient.Metingen); + } + + count++; + } } } @@ -69,7 +72,7 @@ namespace ErgometerApplication if (password.Length > 0) { string error = ""; - bool connect = MainClient.Connect(SerialPort.GetPortNames()[0], username, password, out error); + bool connect = MainClient.Connect("COM3", username, password, out error); if (connect) { diff --git a/ErgometerApplication/ErgometerApplication/MainClient.cs b/ErgometerApplication/ErgometerApplication/MainClient.cs index 2d8b6ec..90e5f92 100644 --- a/ErgometerApplication/ErgometerApplication/MainClient.cs +++ b/ErgometerApplication/ErgometerApplication/MainClient.cs @@ -153,7 +153,17 @@ namespace ErgometerApplication public static Meting SaveMeting(string meting) { - Meting m = Meting.Parse(meting); + Meting m = null; + + try + { + m = Meting.Parse(meting); + } + catch(Exception e) + { + return new Meting(0, 0, 0, 0, 0, 0, 0, 0, 0); + } + Metingen.Add(m); if (Doctor.Connected) { @@ -215,25 +225,37 @@ namespace ErgometerApplication case NetCommand.ValueType.DISTANCE: ComPort.Write("RS"); ComPort.Read(); - Thread.Sleep(500); + Thread.Sleep(200); + ComPort.Write("CM"); + ComPort.Read(); + Thread.Sleep(700); ComPort.Write("PD " + command.SetValue.ToString()); ComPort.Read(); break; case NetCommand.ValueType.ENERGY: ComPort.Write("RS"); ComPort.Read(); - Thread.Sleep(500); + Thread.Sleep(200); + ComPort.Write("CM"); + ComPort.Read(); + Thread.Sleep(700); ComPort.Write("PE " + command.SetValue.ToString()); ComPort.Read(); break; case NetCommand.ValueType.POWER: + ComPort.Write("CM"); + ComPort.Read(); + Thread.Sleep(200); ComPort.Write("PW " + command.SetValue.ToString()); ComPort.Read(); break; case NetCommand.ValueType.TIME: ComPort.Write("RS"); ComPort.Read(); - Thread.Sleep(500); + Thread.Sleep(200); + ComPort.Write("CM"); + ComPort.Read(); + Thread.Sleep(700); string temp = (command.SetValue / 60) + ""; if(temp.Length < 2) { diff --git a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.dll b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.dll index d69de895d6e1ff36538c43778a6e8577863a908b..69afd8aafc890ab60f07c660ea24ed416e183931 100644 GIT binary patch delta 6305 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 S{>>|QOll3!|4M8dnf8C!3_)rD delta 6115 zcmbuDdvsORoyWg>pLuC(_p#7?@xJ>}XnBx26fYK)0zO~m{chEug(BB|Vo;rU+x=wFI&rT%C$%yWK4vyem(aj=H&Y2A9TWx*ra%5_h;cSw+q))rzjkY&w2#sJbSJFi(YpV|1s{ zl`&$pxMtBhH7!|GL!R8KYGZeDT05$VcA|S|*7?&~=2AX3kBgeu(P9qcz zRx2GSdnHUo6vQ3OPRsWgPvx&{jlXjOwiAi3Se$1!XZFku|JQ#d~O1F{Y z!{Xp>iX;9VG?jC{9dxg54@?Y(&}26SLfAw!amJ(Cp0O0cam@0BOtkXAzu}$*RJN7l zRm@-0SoiqwK-;M8Zv~PG|X|#qw5#JD$8Ss&}gaQKlU^Q zB8UY&b_5qZinBRh$Na9}<2DV+aOQ-nA^0~H|K(H43!8K*E*S|GV)aN+sWjZq>bj*= zI_(6i@-nv@idC!*+1CPFFcfPc>GFMtKDu`!AM08DgjI=F+q`fnIZn%VPEOM58CKIs z72u!699e)%M1eoZxx|IWe4;c|{H|O`jLOBtiE@CcEoG19f+RnawOdmR3QlmOgAzt#YhZnTkN-cf_bCc?!Xr=RobwXy~+uFKny-VsLtuCePl9|}9)%6sC zOgx@Yw8#R3(bccc$Sm~stB++aLWO)K5h+5QQg;tYAtE|Nut!8;@F&~?>s`s?Y`DoQ@oPU?B!-HB)qr0RI|EN`QXqQ}o zf6{7Vh#uAs_Go#W8ZN~1TD?aN7vd$YW>Ibtey-IL$}Pe%t<=VzEl{iAL^=b`I84nzY30yoxhu{prja=={96kIvOZ zHC^cxT&38;dZG<=Ig*2^AtfyG1y*sKSdVYUiLAf{zPHpR5OhD;P><~}(L^@U2WJ!= zQc=#F%&cbCFc&hHGglKcuz}+y<`(9oL=#UFbLhV2%~xauhvNVWL*s~X|0H6uZzlHP zkN#SUKlU$!ElvhjA=?ot)Md7)3&c<$_FLa3K4EPo=d{&EMPogW5UYbPpj;T{Pbj|K zK1lr7Izl`d=)z>7PC&)4qncwum2Z=?JoFplI${kumngny|0hjRy=AESOrkT|pAbVt z56`^^f;P||?59U%4_ZPa$UhP&CEBKPz6dIwqgVDGd_a%k9$fRPcqO;0r>$6ZT_aA@ zpcTXy?Iw{e{=u^WA5#Ahh$f*bn?xG*(1*A~))t|feMT4m1@R?M;wrOEEU_}sCe{XC z5|4^vaagp|`5hH)Vxsj+;uTLSo+d|7%^ItRoLc)Wae$onDBcu2Cwg>!p6_?$%;Hw1 z%+ydSwd%8-9&tjXi_a`>_$PM_s;FDK4(vrpN-$o^&a zudx3W`w+P@iml`nXg-XKo-+9HW220|to)3ai<87cd_XM5MdEl=P|Z|KAOSoA>& zA=KFjq2dCL3plRkxSHeD9IxiMjpH_s_i?}K{d;p2K{6|;dEXLc~V6$7%D1^gu3@{+;MFi|OP6*EPhSS&Ws$8x9GLtmc+ZJu7* zDNOpM|F7UpPYdmXqr8eQ`5qwd^=~DP3^~N(?1X#|Q+(L_2=PdtNHZ!#IDQ~;IP9LDQ=T2kk}@U5kdgZ% z%e_%V;=iz?QbgiiZf;H4{9mimNW8~Oo@FK4ok$!`CJv_qQLhLE!toEo@qhOw%Kt5q z>a$>k;}@)C!wa2zY5OU~=A04q&p)+$gC3wj(MI~42P~?eS^pQS_vDB50-DKBqyn`@tS8y4;849&mhmFZJE!;AkU+Q+8+FFO<% AtpET3