From 4c72262f8a5816e43e06b70ac7765018bbfe0196 Mon Sep 17 00:00:00 2001 From: Brian Tischler Date: Fri, 4 Feb 2022 13:38:30 -0700 Subject: [PATCH] Few fixes for KSXT --- .../AgIO/Source/Forms/FormGPSData.Designer.cs | 35 +++-- SourceCode/AgIO/Source/Forms/FormGPSData.cs | 4 +- SourceCode/AgIO/Source/Forms/NMEA.Designer.cs | 4 +- Support/Misc/Sims/UDP_Sim/UDP_Sim.exe | Bin 35840 -> 35840 bytes .../Sims/UDP_Sim/UDP_Sim/FormSim.Designer.cs | 4 - Support/Misc/Sims/UDP_Sim/UDP_Sim/FormSim.cs | 141 +++++++++--------- 6 files changed, 101 insertions(+), 87 deletions(-) diff --git a/SourceCode/AgIO/Source/Forms/FormGPSData.Designer.cs b/SourceCode/AgIO/Source/Forms/FormGPSData.Designer.cs index d10de39be..228a06255 100644 --- a/SourceCode/AgIO/Source/Forms/FormGPSData.Designer.cs +++ b/SourceCode/AgIO/Source/Forms/FormGPSData.Designer.cs @@ -372,73 +372,85 @@ private void InitializeComponent() // // tboxVTG // + this.tboxVTG.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tboxVTG.BackColor = System.Drawing.SystemColors.Window; this.tboxVTG.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tboxVTG.Location = new System.Drawing.Point(35, 139); this.tboxVTG.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tboxVTG.Name = "tboxVTG"; this.tboxVTG.ReadOnly = true; - this.tboxVTG.Size = new System.Drawing.Size(401, 21); + this.tboxVTG.Size = new System.Drawing.Size(398, 21); this.tboxVTG.TabIndex = 497; this.tboxVTG.Text = "$GPVTG,0,T,034.4,M,1,N,1.852,K"; // // tboxGGA // + this.tboxGGA.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tboxGGA.BackColor = System.Drawing.SystemColors.Window; this.tboxGGA.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tboxGGA.Location = new System.Drawing.Point(35, 108); this.tboxGGA.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tboxGGA.Name = "tboxGGA"; this.tboxGGA.ReadOnly = true; - this.tboxGGA.Size = new System.Drawing.Size(496, 21); + this.tboxGGA.Size = new System.Drawing.Size(493, 21); this.tboxGGA.TabIndex = 498; this.tboxGGA.Text = "$GPGGA,055129.00,5326.1729618,N,111,09.6028200,W,4,12,0.9,300,M,46.9,M,,,"; // // tboxHDT // + this.tboxHDT.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tboxHDT.BackColor = System.Drawing.SystemColors.Window; this.tboxHDT.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tboxHDT.Location = new System.Drawing.Point(35, 232); this.tboxHDT.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tboxHDT.Name = "tboxHDT"; this.tboxHDT.ReadOnly = true; - this.tboxHDT.Size = new System.Drawing.Size(401, 21); + this.tboxHDT.Size = new System.Drawing.Size(398, 21); this.tboxHDT.TabIndex = 499; this.tboxHDT.Text = "$GNHDT,123.456,T * 00"; // // tboxAVR // + this.tboxAVR.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tboxAVR.BackColor = System.Drawing.SystemColors.Window; this.tboxAVR.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tboxAVR.Location = new System.Drawing.Point(35, 263); this.tboxAVR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tboxAVR.Name = "tboxAVR"; this.tboxAVR.ReadOnly = true; - this.tboxAVR.Size = new System.Drawing.Size(496, 21); + this.tboxAVR.Size = new System.Drawing.Size(493, 21); this.tboxAVR.TabIndex = 500; this.tboxAVR.Text = "$PTNL,AVR,145331.50,+35.9990,Yaw,-7.8209,Tilt,-0.4305,Roll,444.232,3,1.2,17 * 03"; // // tboxPAOGI // + this.tboxPAOGI.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tboxPAOGI.BackColor = System.Drawing.SystemColors.Window; this.tboxPAOGI.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tboxPAOGI.Location = new System.Drawing.Point(35, 201); this.tboxPAOGI.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tboxPAOGI.Name = "tboxPAOGI"; this.tboxPAOGI.ReadOnly = true; - this.tboxPAOGI.Size = new System.Drawing.Size(496, 21); + this.tboxPAOGI.Size = new System.Drawing.Size(493, 21); this.tboxPAOGI.TabIndex = 504; this.tboxPAOGI.Text = "$PAOGI,055129.00,5326.1729618,N,111,09.6028200,W,4,12,0.9,300,M,46.9,M,,,"; // // tboxHPD // + this.tboxHPD.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tboxHPD.BackColor = System.Drawing.SystemColors.Window; this.tboxHPD.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tboxHPD.Location = new System.Drawing.Point(35, 294); this.tboxHPD.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tboxHPD.Name = "tboxHPD"; this.tboxHPD.ReadOnly = true; - this.tboxHPD.Size = new System.Drawing.Size(496, 21); + this.tboxHPD.Size = new System.Drawing.Size(493, 21); this.tboxHPD.TabIndex = 510; this.tboxHPD.Text = "$PTNL,AVR,145331.50,+35.9990,Yaw,-7.8209,Tilt,-0.4305,Roll,444.232,3,1.2,17 * 03"; // @@ -494,13 +506,15 @@ private void InitializeComponent() // // tboxPANDA // + this.tboxPANDA.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tboxPANDA.BackColor = System.Drawing.SystemColors.Window; this.tboxPANDA.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tboxPANDA.Location = new System.Drawing.Point(36, 170); this.tboxPANDA.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tboxPANDA.Name = "tboxPANDA"; this.tboxPANDA.ReadOnly = true; - this.tboxPANDA.Size = new System.Drawing.Size(496, 21); + this.tboxPANDA.Size = new System.Drawing.Size(493, 21); this.tboxPANDA.TabIndex = 518; this.tboxPANDA.Text = "$PANDA,145331.50,+35.9990,Yaw,-7.8209,Tilt,-0.4305,Roll,444.232,3,1.2,17 * 03"; // @@ -622,15 +636,16 @@ private void InitializeComponent() // // tboxKSXT // + this.tboxKSXT.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tboxKSXT.BackColor = System.Drawing.SystemColors.Window; this.tboxKSXT.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tboxKSXT.Location = new System.Drawing.Point(35, 327); this.tboxKSXT.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tboxKSXT.Name = "tboxKSXT"; this.tboxKSXT.ReadOnly = true; - this.tboxKSXT.Size = new System.Drawing.Size(496, 21); + this.tboxKSXT.Size = new System.Drawing.Size(493, 21); this.tboxKSXT.TabIndex = 528; - this.tboxKSXT.Text = "$HSXT, "; // // label13 // @@ -648,7 +663,7 @@ private void InitializeComponent() // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.WhiteSmoke; - this.ClientSize = new System.Drawing.Size(544, 357); + this.ClientSize = new System.Drawing.Size(541, 357); this.Controls.Add(this.tboxKSXT); this.Controls.Add(this.label13); this.Controls.Add(this.lblIMURoll); diff --git a/SourceCode/AgIO/Source/Forms/FormGPSData.cs b/SourceCode/AgIO/Source/Forms/FormGPSData.cs index 657495418..22694156a 100644 --- a/SourceCode/AgIO/Source/Forms/FormGPSData.cs +++ b/SourceCode/AgIO/Source/Forms/FormGPSData.cs @@ -47,7 +47,8 @@ private void timer1_Tick(object sender, EventArgs e) tboxHDT.Text = mf.hdtSentence; //tboxRMC.Text = mf.rmcSentence; tboxHPD.Text = mf.hpdSentence; - tboxPANDA.Text = mf.pandaSentence; + tboxPANDA.Text = mf.pandaSentence; + tboxKSXT.Text = mf.ksxtSentence; } private void FormGPSData_Load(object sender, EventArgs e) @@ -59,6 +60,7 @@ private void FormGPSData_Load(object sender, EventArgs e) tboxPAOGI.Text = ""; tboxHPD.Text = ""; tboxPANDA.Text = ""; + tboxKSXT.Text = ""; } private void FormGPSData_FormClosing(object sender, FormClosingEventArgs e) diff --git a/SourceCode/AgIO/Source/Forms/NMEA.Designer.cs b/SourceCode/AgIO/Source/Forms/NMEA.Designer.cs index 3ba8b8c44..a82dea7eb 100644 --- a/SourceCode/AgIO/Source/Forms/NMEA.Designer.cs +++ b/SourceCode/AgIO/Source/Forms/NMEA.Designer.cs @@ -312,11 +312,11 @@ private void ParseKSXT() float.TryParse(words[5], NumberStyles.Float, CultureInfo.InvariantCulture, out headingTrueDual); headingTrueDualData = headingTrueDual; + float.TryParse(words[6], NumberStyles.Float, CultureInfo.InvariantCulture, out rollK); + float.TryParse(words[8], NumberStyles.Float, CultureInfo.InvariantCulture, out speed); speedData = speed; - float.TryParse(words[9], NumberStyles.Float, CultureInfo.InvariantCulture, out rollK); - byte.TryParse(words[10], NumberStyles.Float, CultureInfo.InvariantCulture, out fixQuality); if (fixQuality == 0) fixQualityData = 0; else if (fixQuality == 1) fixQualityData = 1; diff --git a/Support/Misc/Sims/UDP_Sim/UDP_Sim.exe b/Support/Misc/Sims/UDP_Sim/UDP_Sim.exe index 8d3c020439636d89a08d629ab08a4b52235ad93e..8180504873eb976e8655bfb0cf0f144430ce04c6 100644 GIT binary patch delta 3105 zcmb7Gdr(x@8UN0?ckeFyzPm0`K-d*`*SrGm})NNiEZ+iAiJooy%q2=^vfx z&g}1=-|u^!bI*6ry@}&Aahx96FTS!;LR|AfNT+fv`z8Q(?VKSDTS{RbYWeFgR;k}8gpz7HkUB`NBvq*|S#HYe5E z6m{*!q+FLGwi4s;G}kb9@cX$}AjJzOD00E*4{}pcifL)m zglUbjlB6kCh#Z1I?EKcJgPadGz8B6?5hn2}0LXZUF+k)Ajp_G9qqMNlN#nS1(O;}( zGeUu^Nu{d9{;f-o@PMAY6XX2%V%;W_gY>xodi|NG`$OC>3jxzF#$0_k?wzZ|nx$+K zVm(qp_`i}E9pEp+s6M=xy?)$PElKbi=E3QR>9KOQ-smDl?3R>A?vGupMDNb|-`Uu9 zeWn`dVkh;+D%E*tAtt5qCO*aGe2RlyQ0I`chTt1OX?z1(VnytxK2yTZ!Zosc`dmzy zW2nkZnd-aRRNV$WK+1G;q=VSfDT0d)8bc(XT`*Q54x0kZX0qWZ*VL}^M#P_+mLrcqtp0okF!tZVl);y!lD1Wli3kRCJC_fj(Ao%@2j8_4-Aibrl?Ik`*^Z? z=RyzP*`YjjV_WZUEEoLR#*H{VxN#HCoJ@5djTq3=wrMDb$Iy5SUid~kU&jtRKd%SN zX1F56$68#=5Ra*NL&fZLuC%LoR>gNz^v~}|=O>fXESsx;&!0IOU(eI}*tz-FF=Q~~ z3F1@!kr5L}o$^?Agph!8dcihoQrrJUg6$tt9PUA`KjZl$URW&eD)F+SMX#_sUITm2 z<6<+5ytJ>I6?yZO7H`Flf`v0!rBI0P_X(BOSQ9h2FihfB-l+P54I#S1S!a0bw;dY$y$?z6} z|G)v>oLI?;7iy9U*CKX~PvXebTU)vd@)evd+f1dQD$>2<7Ki-oq6u z=T==H^LSlj0Z75m0_~d;p;tIq$9}Tf$#$<HXh8Jbs@`zLXGW0 z=7Cm?m0{{UIHEBV=6ZI+`Qa!Yk38}=k)Qw};JMOG4fr&66a#CZ zMq{lQR|{J-_87+1LjNqwxNMbRDGVwLHm;?^WAKFK%eZ#|y#%kpVKD)h$QH*4JWnF} z{V)YzNIL`}k|#42Prx+UpC-X2)F)tuthG#{f6RIj$0y8_Fiu{zzksn18b{ReRrKsh zBXCz$&XBj|2}mPvTCSt@+r|kvBa#=46YTv>^T`O)wdIin3$)eaxVx>B+-1LQ>(n?JMblV&03~AO+vhd~- zGRd}Xu5wNjzj=&KlaTosT~GKum{z{Cc^@HXlyJM3Sp4|ax*19lx4;8R$0OP4a#|tw zS{W1qtSH3JssQC{yCx+&yEf1N@Zqxhb2qbAw@0?FWNU_YHVb+}B{v~*Vn%QS#lKYq zVzKJnAScEpAconC4lkmfQVV(*boe=zxH}tmR|nK;#c2tMR>l70G!Z{=BtB3+9c~d^ zUEg?WobNit|1SJ*#P9BntYdH9>c3s^_y#k>EB1B1RnVNcbqv3#VR(_PxFNj(=k2 nxu5+kj@)CObUY~ONP$v3a*K?WnicEl#{ykcrpO2GAlLr~KKqd{ delta 3092 zcmb7GdvH`&9sZqrckjO6*=#18$8MMGBhTHuvm}HTLMoFdDYSV&P>X;`yChV=yqScU z0Sc@KDWMH9VI-7jE#6GETH0FMVryqKTD4JWn~r@@X6$6NQ=${b-?@9U#{YC@_Pgi% ze$RVeyF=%>q4V6CF~y^I#x6uprjXp|(+`pbN{CNcGX+pe8%MHfGx3o&dXx;h4bvcf z?nmT62`_g7yj=jmBU=X`oE6>NB)`KJRKQiq1uVez<^d=oXx1j)RcM858`oQgia!ID zh!+8}EVAT_OEIBa18`t90ew-GLj3g4DrXu?*6G>b`e@3HuBR$nbXL-BM^Aq;>V7{> zP-hjyTrP~W&-0ZnS}XViXzi|KewnO}69F>+fDPtiJBg7j+NiaYbu_54(+RbatmS`H zyFC9x#(0Kw%+sK83alhH)TK#qv+#Zd1=rhv*xkrpt&a)*?3mYO4GVi+Q72m>4BKpHckYK z4@_)dex`^Yx+y?^Xk?XMGO|kPCRS;$iB+04u}aLtVvbiTG_y)=W>)E2W>)D% zGpm$fVU>z4@k$YslRjZ7Lvh}cZ2iybaJ{jGp(~bLG-g{1LjU*l(=*m&l22!?y-sPC zGi|ub-M9igNH<1oPtkjA_r#73ZWcT?&4}Hbq+`Q`)nhYabK|;PwxuOYeN^MJb+)$j zr?D8Ww+SDSb@W}^TX>*n6FRYMl08iFXp{Xu#B&lZNSKnyly(WHCHzoAzhh4#ZXT^o zZ_$_iiER|F7f&xcX_p-DU`SumVUj2QBPqg@3i08TFd_NkWa>UnC*3&D6TET!qSe*M z^waM5@IfP<>m-fltosGkXL#vtcOvPcg&97vEu)YSo<_X|0?<*Yf(y_orqM*La zAGu;%Qo66WyMlll`d~jc78#bdYHu$6L6(D>vn~;i&Sm*A^k&wxh^MkAsW;O?H{>{w z?Z|nPctv-vLP;v9w;&C%s-PV^|6ai^l8T3zWF)4WE*?D1GM|ZMW=ARc@e1lHYDM?H zqB_K16|vAyi}oUJD_+8!n@eshut2c&aXvM=@pCJjXTWuBy zncINto>#yD{$vI1sKm+*CqU1!kk*B?2&Ln!rx11s6$<>s=G<_0?eDj zdM(VEJ~7eUhG~ZtE*Xz$1qeY{Z-g$xxY-D1)raE84a5APpz!eoj^I5Ga1=h{eLN2@ z$;__v@k;nyW*%fJ2;xo6JpYbN0~0bkf?0I%JDIg1Gk_X@8<}S+G862US+h2mw}9Fo zvsIcgjScRTX-Maz%MS#qeY_JE@yN39R`f`P6udYY+m9?AvSoG%nH!pAmXC!za7Jc2 z%(Z{}?BD}<;#lM-M1VXP!k-v`S0PVjNA?qm9fhA-1PDU=erAip&-DFV5c(u`PF-hd z;)8HjVx#Ignxp<8CfydBw?%uZok8C;dwd5kNAmu0qu&4l3t znf(i!3B#QZ*e$*NMNGOLlJV~rn~N)$bUg%Rb{qrCVVlg(VqiJ!lUXyyRlsqXJ&bV` zFd1V>b4CF+z!h=n!CG$c8hl051B;~AFaXy`#5jWE3;F>VC$E}Mz|&-lHY$z31J|Ha zL*SOAMB%XEySU;3l>l$RDa8!N?y^SFKdhRCdCd7NgowxToP^h5nT%-!m?9rodO$9+d7BDtd-fO&2l+g*Um3OgdFvvLdEobeF3Mmo&Z+#;!04N%q2JTgE_c9z(diC-V( zmPtr|j%y@r4wl8EJC70al&EUYAcjKxi@Oub5qCk2ShhPQ(PGNRy_OHzxT}f~p;G+X zp{s&9FnQRsJ=)EGw?1@EAf|XXi0Dpf)6EdMxzmBEXU)> z$g2n!vn`{_DS#M^N*6|q3qaJdhY}y+U;A$n#fo)kMVudO;_Zi4%3fi6fWz;0{EpzC z^buM%>@kO%>TjF(Hf%lde&EJ8YlqWm=dhDr8TMMqGz*A*oNVlh;;)T?eleUSx