Skip to content

Commit 03cdf37

Browse files
KamooolKamoool
committed
Added receive data function
1 parent 529dabe commit 03cdf37

4 files changed

Lines changed: 118 additions & 260 deletions

File tree

‎QS_DS_Program/QS_DS_Program.cs‎

Lines changed: 0 additions & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -12,161 +12,16 @@ namespace QS_DS_Program
1212
{
1313
public partial class QS_DS_Program : Form
1414
{
15-
16-
//private List<Button> MainComponentsButtons = new List<Button>();
17-
//private List<Label> MainComponentsLabels = new List<Label>();
18-
//private List<ComboBox> MainComponentsCombo = new List<ComboBox>();
19-
//private List<Button> TopButtons = new List<Button>();
20-
21-
//private List<Label> GeneralLabels = new List<Label>();
22-
//private List<NumericUpDown> GeneralNumerics = new List<NumericUpDown>();
23-
//private List<ProgressBar> GeneralBar = new List<ProgressBar>();
24-
25-
//private List<CheckBox> QSCheckbox = new List<CheckBox>();
26-
//private List<Button> QSButton = new List<Button>();
27-
//private List<Label> QS1Labels = new List<Label>();
28-
//private List<NumericUpDown> QS1Numerics = new List<NumericUpDown>();
29-
30-
//private List<Label> QS2Labels = new List<Label>();
31-
//private List<NumericUpDown> QS2Numerics = new List<NumericUpDown>();
32-
33-
//private List<CheckBox> DSCheckbox = new List<CheckBox>();
34-
//private List<Button> DSButton = new List<Button>();
35-
//private List<Label> DS1Labels = new List<Label>();
36-
//private List<NumericUpDown> DS1Numerics = new List<NumericUpDown>();
37-
38-
//private LinkedList<CheckBox> CheckBoxData = new LinkedList<CheckBox>();
39-
//private LinkedList<NumericUpDown> NumericData = new LinkedList<NumericUpDown>();
40-
4115
public QS_DS_Program()
4216
{
4317
InitializeComponent();
4418
AssignItems();
4519
DisableFunctionAll();
46-
47-
4820
}
4921

5022

5123
private void QS_DS_Program_Load(object sender, EventArgs e)
5224
{
53-
MainComponentsLabels.Add(Label1);
54-
MainComponentsCombo.Add(comboBox1);
55-
MainComponentsButtons.Add(Refresh_BTN);
56-
MainComponentsButtons.Add(Connect_BTN);
57-
58-
TopButtons.Add(Read_BTN);
59-
TopButtons.Add(Save_BTN);
60-
TopButtons.Add(Reset_BTN);
61-
62-
GeneralLabels.Add(LabelGeneral1);
63-
GeneralNumerics.Add(Pulses);
64-
GeneralLabels.Add(LabelRPMCur);
65-
GeneralLabels.Add(RPMRead);
66-
GeneralLabels.Add(LabelSensorOutput);
67-
GeneralLabels.Add(LabelSensorReading);
68-
GeneralBar.Add(ProgressBarSensor);
69-
70-
QSCheckbox.Add(QSEnable_Check);
71-
QSCheckbox.Add(Push_Check_QS);
72-
QSCheckbox.Add(Pull_Check_QS);
73-
QSButton.Add(CutTest_BTN);
74-
75-
QS1Labels.Add(LabelQS1);
76-
QS1Labels.Add(LabelQS2);
77-
QS1Labels.Add(LabelQS3);
78-
QS1Labels.Add(LabelQS4);
79-
QS1Labels.Add(LabelQS5);
80-
QS1Labels.Add(LabelQS6);
81-
QS1Labels.Add(LabelQS7);
82-
QS1Labels.Add(LabelQS8);
83-
QS1Labels.Add(LabelQS9);
84-
QS1Labels.Add(LabelQS10);
85-
QS1Labels.Add(LabelQS11);
86-
87-
QS1Numerics.Add(PreDelayQS);
88-
QS1Numerics.Add(CutTime1);
89-
QS1Numerics.Add(CutTime2);
90-
QS1Numerics.Add(CutTime3);
91-
QS1Numerics.Add(CutTime4);
92-
QS1Numerics.Add(CutTime5);
93-
QS1Numerics.Add(CutTime6);
94-
QS1Numerics.Add(CutTime7);
95-
QS1Numerics.Add(CutTime8);
96-
QS1Numerics.Add(QSForce);
97-
QS1Numerics.Add(MinRPMQS);
98-
99-
100-
QS2Labels.Add(LabelQS1);
101-
QS2Labels.Add(LabelCutTime);
102-
QS2Labels.Add(LabelQS10);
103-
QS2Labels.Add(LabelQS11);
104-
QS2Numerics.Add(PreDelayQS);
105-
QS2Numerics.Add(CutTime1);
106-
QS2Numerics.Add(QSForce);
107-
QS2Numerics.Add(MinRPMQS);
108-
109-
DSCheckbox.Add(DSEnable_Check);
110-
DSButton.Add(BlipTest_BTN);
111-
DSCheckbox.Add(Push_Check_DS);
112-
DSCheckbox.Add(Pull_Check_DS);
113-
DS1Labels.Add(LabelDS1);
114-
DS1Labels.Add(LabelDS2);
115-
DS1Labels.Add(LabelDS3);
116-
DS1Labels.Add(LabelDS4);
117-
DS1Labels.Add(LabelDS5);
118-
DS1Labels.Add(LabelDS6);
119-
DS1Labels.Add(LabelDS7);
120-
DS1Labels.Add(LabelDS8);
121-
DS1Labels.Add(LabelDS9);
122-
DS1Labels.Add(LabelDS10);
123-
DS1Labels.Add(LabelDS11);
124-
DS1Labels.Add(LabelDS12);
125-
DS1Numerics.Add(PreDelayDS);
126-
DS1Numerics.Add(BlipTime1);
127-
DS1Numerics.Add(BlipTime2);
128-
DS1Numerics.Add(BlipTime3);
129-
DS1Numerics.Add(BlipTime4);
130-
DS1Numerics.Add(BlipTime5);
131-
DS1Numerics.Add(BlipTime6);
132-
DS1Numerics.Add(BlipTime7);
133-
DS1Numerics.Add(BlipTime8);
134-
DS1Numerics.Add(DSForce);
135-
DS1Numerics.Add(MinRPMDS);
136-
DS1Numerics.Add(MaxRPMDS);
137-
138-
139-
CheckBoxData.AddLast(QSEnable_Check);
140-
CheckBoxData.AddLast(Push_Check_QS);
141-
CheckBoxData.AddLast(DSEnable_Check);
142-
143-
NumericData.AddLast(Pulses);
144-
NumericData.AddLast(PreDelayQS);
145-
NumericData.AddLast(CutTime1);
146-
NumericData.AddLast(CutTime2);
147-
NumericData.AddLast(CutTime3);
148-
NumericData.AddLast(CutTime4);
149-
NumericData.AddLast(CutTime5);
150-
NumericData.AddLast(CutTime6);
151-
NumericData.AddLast(CutTime7);
152-
NumericData.AddLast(CutTime8);
153-
NumericData.AddLast(QSForce);
154-
NumericData.AddLast(MinRPMQS);
155-
NumericData.AddLast(PreDelayDS);
156-
NumericData.AddLast(BlipTime1);
157-
NumericData.AddLast(BlipTime2);
158-
NumericData.AddLast(BlipTime3);
159-
NumericData.AddLast(BlipTime4);
160-
NumericData.AddLast(BlipTime5);
161-
NumericData.AddLast(BlipTime6);
162-
NumericData.AddLast(BlipTime7);
163-
NumericData.AddLast(BlipTime8);
164-
NumericData.AddLast(DSForce);
165-
NumericData.AddLast(MinRPMDS);
166-
NumericData.AddLast(MaxRPMDS);
167-
168-
169-
17025
}
17126

17227
}

‎QS_DS_Program/QS_DS_Program_Data_Handling.cs‎

Lines changed: 3 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace QS_DS_Program
99
{
1010
public partial class QS_DS_Program : Form
1111
{
12-
private void ReceivedDataHandle(object sender, EventArgs e) // metoda wyświetlania temperatury
12+
private void ReceivedDataHandle(object sender, EventArgs e)
1313
{
1414
string[] SplitData = IncomingData.Split(',');
1515

@@ -21,82 +21,8 @@ private void ReceivedDataHandle(object sender, EventArgs e) // metoda wyświetla
2121
{
2222
//TODO - ADD Version label
2323
DisableFunctionAll();
24-
if (SplitData[3] == "0")
25-
{
26-
Typ = 1;
27-
EnableFunction1();
28-
}
29-
else if (SplitData[1] == "2")
30-
{
31-
Typ = 2;
32-
EnableFunction2();
33-
}
34-
else if (SplitData[1] == "3")
35-
{
36-
Typ = 3;
37-
EnableFunction3();
38-
}
39-
if (SplitData[2] == "1")
40-
{
41-
Push_Check_QS.Checked = true;
42-
Pull_Check_QS.Checked = false;
43-
Push_Check_DS.Checked = false;
44-
Pull_Check_DS.Checked = true;
45-
}
46-
else if (SplitData[2] == "0")
47-
{
48-
Pull_Check_QS.Checked = true;
49-
Push_Check_QS.Checked = false;
50-
Pull_Check_DS.Checked = false;
51-
Push_Check_DS.Checked = true;
52-
}
53-
54-
QSForce.Value = Int32.Parse(SplitData[3]);
55-
DSForce.Value = Int32.Parse(SplitData[4]);
56-
Pulses.Value = Decimal.Parse(SplitData[5], NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture);
57-
MinRPMQS.Value = Int32.Parse(SplitData[6]);
58-
MinRPMDS.Value = Int32.Parse(SplitData[7]);
59-
if (SplitData[8] == "1")
60-
{
61-
QSEnable_Check.Checked = true;
62-
}
63-
else if (SplitData[8] == "0")
64-
{
65-
QSEnable_Check.Checked = false;
66-
}
67-
68-
PreDelayQS.Value = Int32.Parse(SplitData[9]);
69-
CutTime1.Value = Int32.Parse(SplitData[10]);
70-
CutTime2.Value = Int32.Parse(SplitData[11]);
71-
CutTime3.Value = Int32.Parse(SplitData[12]);
72-
CutTime4.Value = Int32.Parse(SplitData[13]);
73-
CutTime5.Value = Int32.Parse(SplitData[14]);
74-
CutTime6.Value = Int32.Parse(SplitData[15]);
75-
CutTime7.Value = Int32.Parse(SplitData[16]);
76-
CutTime8.Value = Int32.Parse(SplitData[17]);
77-
78-
if (SplitData[18] == "1")
79-
{
80-
DSEnable_Check.Checked = true;
81-
}
82-
else if (SplitData[18] == "0")
83-
{
84-
DSEnable_Check.Checked = false;
85-
}
86-
87-
PreDelayDS.Value = Int32.Parse(SplitData[19]);
88-
BlipTime1.Value = Int32.Parse(SplitData[20]);
89-
BlipTime2.Value = Int32.Parse(SplitData[21]);
90-
BlipTime3.Value = Int32.Parse(SplitData[22]);
91-
BlipTime4.Value = Int32.Parse(SplitData[23]);
92-
BlipTime5.Value = Int32.Parse(SplitData[24]);
93-
BlipTime6.Value = Int32.Parse(SplitData[25]);
94-
BlipTime7.Value = Int32.Parse(SplitData[26]);
95-
BlipTime8.Value = Int32.Parse(SplitData[27]);
96-
97-
MaxRPMDS.Value = Int32.Parse(SplitData[28]);
98-
99-
24+
FunctionsAssignValues(SplitData);
25+
FunctionsShowTable();
10026
}
10127
}
10228
}

0 commit comments

Comments
 (0)