Skip to content

Commit f5f3fb3

Browse files
AzmodanROAzmodanRO
committed
Version 3
-moved log to MyDocuments\freETarget\log -moved session export directory to MyDocuments\freETarget\sessionExport -default pdf save directory moved to MyDocuments\freETarget\pdf -added splitter on the main window between the target and the console, so that the console can be resized -refactored the communication module to allow different communications protocols. USB and TCP for now -added communication protocol TCP over WiFi to setting window -splitted setting window into 2: "local settings" for settings of the PC software, and "target settings" for target parameters -target settings are saved in the target storage, and are applied directly to the target from the window -shorter connect procedure since target settings are no longer sent to the target -settings saved to database so that a version update will not wipe the settings anymore. !! old database will be wiped, so export the sessions that need saving before the upgrade !! -fixed a bug with saving a loaded session -fixed a bug where the tooltip for "session saved" was displayed after the saving was completed
1 parent 8084287 commit f5f3fb3

25 files changed

+3609
-1967
lines changed

‎Software/C#/freETarget Setup/freETarget Setup.vdproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2563,25 +2563,25 @@
25632563
{
25642564
"Name" = "8:Microsoft Visual Studio"
25652565
"ProductName" = "8:freETarget"
2566-
"ProductCode" = "8:{02E0E8FE-CB73-4032-8AE3-4766920A31ED}"
2567-
"PackageCode" = "8:{7C34B0B3-8CD4-459B-92BF-0A2B497B92A3}"
2566+
"ProductCode" = "8:{C661EC26-A86D-4819-990C-90C6E000E0BD}"
2567+
"PackageCode" = "8:{A4D86FE0-67F3-4AAC-8A26-579EEA736244}"
25682568
"UpgradeCode" = "8:{E11572A0-0587-4903-AE84-9016332FEE88}"
25692569
"AspNetVersion" = "8:4.0.30319.0"
25702570
"RestartWWWService" = "11:FALSE"
25712571
"RemovePreviousVersions" = "11:TRUE"
25722572
"DetectNewerInstalledVersion" = "11:TRUE"
25732573
"InstallAllUsers" = "11:FALSE"
2574-
"ProductVersion" = "8:1.0.0"
2574+
"ProductVersion" = "8:3.0.0"
25752575
"Manufacturer" = "8:Azmodan"
25762576
"ARPHELPTELEPHONE" = "8:"
25772577
"ARPHELPLINK" = "8:https://free-e-target.com/"
25782578
"Title" = "8:freETarget Setup"
25792579
"Subject" = "8:"
25802580
"ARPCONTACT" = "8:Azmodan"
25812581
"Keywords" = "8:"
2582-
"ARPCOMMENTS" = "8:"
2582+
"ARPCOMMENTS" = "8:Installer kit for freETarget PC software"
25832583
"ARPURLINFOABOUT" = "8:https://github.com/ten-point-nine/freETarget"
2584-
"ARPPRODUCTICON" = "8:"
2584+
"ARPPRODUCTICON" = "8:_AB775BEA19644613BBF7B3BED9E723B7"
25852585
"ARPIconIndex" = "3:0"
25862586
"SearchPath" = "8:"
25872587
"UseSystemSearchPath" = "11:TRUE"

‎Software/C#/freETarget/App.config‎

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<value>True</value>
4545
</setting>
4646
<setting name="pdfPath" serializeAs="String">
47-
<value>.\pdf</value>
47+
<value />
4848
</setting>
4949
<setting name="targetDistance" serializeAs="String">
5050
<value>100</value>
@@ -82,55 +82,16 @@
8282
<setting name="fileLogging" serializeAs="String">
8383
<value>True</value>
8484
</setting>
85-
<setting name="SensorDiameter" serializeAs="String">
86-
<value>230</value>
87-
</setting>
88-
<setting name="SensorNorthX" serializeAs="String">
89-
<value>0</value>
90-
</setting>
91-
<setting name="SensorNorthY" serializeAs="String">
92-
<value>0</value>
93-
</setting>
94-
<setting name="SensorWestX" serializeAs="String">
95-
<value>0</value>
96-
</setting>
97-
<setting name="SensorWestY" serializeAs="String">
98-
<value>0</value>
99-
</setting>
100-
<setting name="SensorSouthX" serializeAs="String">
101-
<value>0</value>
102-
</setting>
103-
<setting name="SensorSouthY" serializeAs="String">
104-
<value>0</value>
105-
</setting>
106-
<setting name="SensorEastX" serializeAs="String">
107-
<value>0</value>
108-
</setting>
109-
<setting name="SensorEastY" serializeAs="String">
110-
<value>0</value>
111-
</setting>
112-
<setting name="Calibre" serializeAs="String">
113-
<value>45</value>
114-
</setting>
11585
<setting name="ignoreMiss" serializeAs="String">
11686
<value>False</value>
11787
</setting>
118-
<setting name="LEDbright" serializeAs="String">
119-
<value>50</value>
120-
</setting>
121-
<setting name="targetName" serializeAs="String">
122-
<value>0</value>
88+
<setting name="CommProtocol" serializeAs="String">
89+
<value>USB</value>
12390
</setting>
124-
<setting name="PaperTime" serializeAs="String">
125-
<value>0</value>
126-
</setting>
127-
<setting name="StepCount" serializeAs="String">
128-
<value>0</value>
129-
</setting>
130-
<setting name="StepTime" serializeAs="String">
131-
<value>0</value>
91+
<setting name="TcpIP" serializeAs="String">
92+
<value />
13293
</setting>
133-
<setting name="ZOffset" serializeAs="String">
94+
<setting name="TcpPort" serializeAs="String">
13495
<value>0</value>
13596
</setting>
13697
</freETarget.Properties.Settings>

‎Software/C#/freETarget/Echo.cs‎

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
using System.Globalization;
7+
8+
namespace freETarget {
9+
public class Echo {
10+
11+
public string NAME;
12+
public int ANGLE;
13+
public int CALIBREx10;
14+
public int DIP;
15+
public int LED_BRIGHT;
16+
public string MFS;
17+
public int NAME_ID;
18+
public int PAPER_ECO;
19+
public int PAPER_TIME;
20+
public int POWER_SAVE;
21+
public int SEND_MISS;
22+
public decimal SENSOR;
23+
public int SN;
24+
public int STEP_COUNT;
25+
public int STEP_TIME;
26+
public int TARGET_TYPE;
27+
public int TEST;
28+
public int TRGT_1_RINGx10;
29+
public int Z_OFFSET;
30+
public int NORTH_X;
31+
public int NORTH_Y;
32+
public int EAST_X;
33+
public int EAST_Y;
34+
public int SOUTH_X;
35+
public int SOUTH_Y;
36+
public int WEST_X;
37+
public int WEST_Y;
38+
public int IS_TRACE;
39+
public decimal TEMPERATURE;
40+
public decimal SPEED_SOUND;
41+
public decimal V_REF;
42+
public int TIMER_COUNT;
43+
public int WiFi;
44+
public string VERSION;
45+
public int BRD_REV;
46+
public int INIT;
47+
48+
49+
private Echo() {
50+
51+
}
52+
public static Echo parseJson(string json) {
53+
54+
string[] t2 = json.Split(',');
55+
if (t2[0].Contains("NAME")) {
56+
Echo ret = new Echo();
57+
foreach (string t3 in t2) {
58+
string[] t4 = t3.Split(':');
59+
switch (t4[0].Trim()) {
60+
case "\"NAME\"":
61+
ret.NAME = t4[1].ToString();
62+
break;
63+
case "\"ANGLE\"":
64+
ret.ANGLE = int.Parse(t4[1], CultureInfo.InvariantCulture);
65+
break;
66+
case "\"CALIBREx10\"":
67+
ret.CALIBREx10 = int.Parse(t4[1], CultureInfo.InvariantCulture);
68+
break;
69+
case "\"DIP\"":
70+
ret.DIP = int.Parse(t4[1], CultureInfo.InvariantCulture);
71+
break;
72+
case "\"LED_BRIGHT\"":
73+
ret.LED_BRIGHT = int.Parse(t4[1], CultureInfo.InvariantCulture);
74+
break;
75+
case "\"MFS\"":
76+
ret.MFS = t4[1].ToString();
77+
break;
78+
case "\"NAME_ID\"":
79+
ret.NAME_ID = int.Parse(t4[1], CultureInfo.InvariantCulture);
80+
break;
81+
case "\"PAPER_ECO\"":
82+
ret.PAPER_ECO = int.Parse(t4[1], CultureInfo.InvariantCulture);
83+
break;
84+
case "\"PAPER_TIME\"":
85+
ret.PAPER_TIME = int.Parse(t4[1], CultureInfo.InvariantCulture);
86+
break;
87+
case "\"POWER_SAVE\"":
88+
ret.POWER_SAVE = int.Parse(t4[1], CultureInfo.InvariantCulture);
89+
break;
90+
case "\"SEND_MISS\"":
91+
ret.SEND_MISS = int.Parse(t4[1], CultureInfo.InvariantCulture);
92+
break;
93+
case "\"SENSOR\"":
94+
ret.SENSOR = decimal.Parse(t4[1], CultureInfo.InvariantCulture);
95+
break;
96+
case "\"SN\"":
97+
ret.SN = int.Parse(t4[1], CultureInfo.InvariantCulture);
98+
break;
99+
case "\"STEP_COUNT\"":
100+
ret.STEP_COUNT = int.Parse(t4[1], CultureInfo.InvariantCulture);
101+
break;
102+
case "\"STEP_TIME\"":
103+
ret.STEP_TIME = int.Parse(t4[1], CultureInfo.InvariantCulture);
104+
break;
105+
case "\"TARGET_TYPE\"":
106+
ret.TARGET_TYPE = int.Parse(t4[1], CultureInfo.InvariantCulture);
107+
break;
108+
case "\"TEST\"":
109+
ret.TEST = int.Parse(t4[1], CultureInfo.InvariantCulture);
110+
break;
111+
case "\"TRGT_1_RINGx10\"":
112+
ret.TRGT_1_RINGx10 = int.Parse(t4[1], CultureInfo.InvariantCulture);
113+
break;
114+
case "\"Z_OFFSET\"":
115+
ret.Z_OFFSET = int.Parse(t4[1], CultureInfo.InvariantCulture);
116+
break;
117+
case "\"NORTH_X\"":
118+
ret.NORTH_X = int.Parse(t4[1], CultureInfo.InvariantCulture);
119+
break;
120+
case "\"NORTH_Y\"":
121+
ret.NORTH_Y = int.Parse(t4[1], CultureInfo.InvariantCulture);
122+
break;
123+
case "\"EAST_X\"":
124+
ret.EAST_X = int.Parse(t4[1], CultureInfo.InvariantCulture);
125+
break;
126+
case "\"EAST_Y\"":
127+
ret.EAST_Y = int.Parse(t4[1], CultureInfo.InvariantCulture);
128+
break;
129+
case "\"SOUTH_X\"":
130+
ret.SOUTH_X = int.Parse(t4[1], CultureInfo.InvariantCulture);
131+
break;
132+
case "\"SOUTH_Y\"":
133+
ret.SOUTH_Y = int.Parse(t4[1], CultureInfo.InvariantCulture);
134+
break;
135+
case "\"WEST_X\"":
136+
ret.WEST_X = int.Parse(t4[1], CultureInfo.InvariantCulture);
137+
break;
138+
case "\"WEST_Y\"":
139+
ret.WEST_Y = int.Parse(t4[1], CultureInfo.InvariantCulture);
140+
break;
141+
case "\"IS_TRACE\"":
142+
ret.IS_TRACE = int.Parse(t4[1], CultureInfo.InvariantCulture);
143+
break;
144+
case "\"TEMPERATURE\"":
145+
ret.TEMPERATURE = decimal.Parse(t4[1], CultureInfo.InvariantCulture);
146+
break;
147+
case "\"SPEED_SOUND\"":
148+
ret.SPEED_SOUND = decimal.Parse(t4[1], CultureInfo.InvariantCulture);
149+
break;
150+
case "\"V_REF\"":
151+
ret.V_REF = decimal.Parse(t4[1], CultureInfo.InvariantCulture);
152+
break;
153+
case "\"TIMER_COUNT\"":
154+
ret.TIMER_COUNT = int.Parse(t4[1], CultureInfo.InvariantCulture);
155+
break;
156+
case "\"WiFi\"":
157+
ret.WiFi = int.Parse(t4[1], CultureInfo.InvariantCulture);
158+
break;
159+
case "\"VERSION\"":
160+
ret.VERSION = t4[1].ToString();
161+
break;
162+
case "\"BRD_REV\"":
163+
ret.BRD_REV = int.Parse(t4[1], CultureInfo.InvariantCulture);
164+
break;
165+
case "\"INIT\"":
166+
ret.INIT = int.Parse(t4[1], CultureInfo.InvariantCulture);
167+
break;
168+
169+
}
170+
}
171+
return ret;
172+
} else {
173+
return null;
174+
}
175+
}
176+
}
177+
178+
179+
180+
}

‎Software/C#/freETarget/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("2.3.1.0")]
36-
[assembly: AssemblyFileVersion("2.3.1.0")]
35+
[assembly: AssemblyVersion("3.0.0.0")]
36+
[assembly: AssemblyFileVersion("3.0.0.0")]

0 commit comments

Comments
 (0)