diff --git a/DroneClient/.vs/DroneClient/DesignTimeBuild/.dtbcache.v2 b/DroneClient/.vs/DroneClient/DesignTimeBuild/.dtbcache.v2 index 4e73ff1..6610050 100644 Binary files a/DroneClient/.vs/DroneClient/DesignTimeBuild/.dtbcache.v2 and b/DroneClient/.vs/DroneClient/DesignTimeBuild/.dtbcache.v2 differ diff --git a/DroneClient/.vs/DroneClient/FileContentIndex/4bebe7c4-f6da-4c88-adc5-b3c5f28d11f4.vsidx b/DroneClient/.vs/DroneClient/FileContentIndex/4bebe7c4-f6da-4c88-adc5-b3c5f28d11f4.vsidx deleted file mode 100644 index 764d593..0000000 Binary files a/DroneClient/.vs/DroneClient/FileContentIndex/4bebe7c4-f6da-4c88-adc5-b3c5f28d11f4.vsidx and /dev/null differ diff --git a/DroneClient/.vs/DroneClient/v17/.suo b/DroneClient/.vs/DroneClient/v17/.suo index 870cbf3..f99c179 100644 Binary files a/DroneClient/.vs/DroneClient/v17/.suo and b/DroneClient/.vs/DroneClient/v17/.suo differ diff --git a/DroneClient/.vs/DroneClient/v17/DocumentLayout.backup.json b/DroneClient/.vs/DroneClient/v17/DocumentLayout.backup.json index 8228d5d..6290ad3 100644 --- a/DroneClient/.vs/DroneClient/v17/DocumentLayout.backup.json +++ b/DroneClient/.vs/DroneClient/v17/DocumentLayout.backup.json @@ -1,12 +1,53 @@ { "Version": 1, - "WorkspaceRootPath": "D:\\CPL\\Simulator\\DroneClient\\DroneClient\\", - "Documents": [], + "WorkspaceRootPath": "C:\\Projects\\Simulator\\DroneClient\\", + "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{B66DBB0A-CCDD-4711-ADB0-5AA11AC1760D}|DroneClient.csproj|C:\\Projects\\Simulator\\DroneClient\\formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", + "RelativeMoniker": "D:0:0:{B66DBB0A-CCDD-4711-ADB0-5AA11AC1760D}|DroneClient.csproj|solutionrelative:formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" + }, + { + "AbsoluteMoniker": "D:0:0:{B66DBB0A-CCDD-4711-ADB0-5AA11AC1760D}|DroneClient.csproj|c:\\projects\\simulator\\droneclient\\formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{B66DBB0A-CCDD-4711-ADB0-5AA11AC1760D}|DroneClient.csproj|solutionrelative:formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + } + ], "DocumentGroupContainers": [ { "Orientation": 0, "VerticalTabListWidth": 256, - "DocumentGroups": [] + "DocumentGroups": [ + { + "DockedWidth": 200, + "SelectedChildIndex": 0, + "Children": [ + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "FormMain.cs [\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440]", + "DocumentMoniker": "C:\\Projects\\Simulator\\DroneClient\\FormMain.cs", + "RelativeDocumentMoniker": "FormMain.cs", + "ToolTip": "C:\\Projects\\Simulator\\DroneClient\\FormMain.cs [\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440]*", + "RelativeToolTip": "FormMain.cs [\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440]*", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-01T08:13:27.111Z", + "EditorCaption": " [\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440]" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "FormMain.cs", + "DocumentMoniker": "C:\\Projects\\Simulator\\DroneClient\\FormMain.cs", + "RelativeDocumentMoniker": "FormMain.cs", + "ToolTip": "C:\\Projects\\Simulator\\DroneClient\\FormMain.cs*", + "RelativeToolTip": "FormMain.cs*", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAGsAAAAgAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-27T13:11:11.045Z", + "EditorCaption": "" + } + ] + } + ] } ] } \ No newline at end of file diff --git a/DroneClient/.vs/DroneClient/v17/DocumentLayout.json b/DroneClient/.vs/DroneClient/v17/DocumentLayout.json index f629855..306706a 100644 --- a/DroneClient/.vs/DroneClient/v17/DocumentLayout.json +++ b/DroneClient/.vs/DroneClient/v17/DocumentLayout.json @@ -1,14 +1,14 @@ { "Version": 1, - "WorkspaceRootPath": "D:\\CPL\\Simulator\\DroneClient\\DroneClient\\", + "WorkspaceRootPath": "C:\\Projects\\Simulator\\DroneClient\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{B66DBB0A-CCDD-4711-ADB0-5AA11AC1760D}|DroneClient.csproj|d:\\cpl\\simulator\\droneclient\\droneclient\\formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{B66DBB0A-CCDD-4711-ADB0-5AA11AC1760D}|DroneClient.csproj|solutionrelative:formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{B66DBB0A-CCDD-4711-ADB0-5AA11AC1760D}|DroneClient.csproj|C:\\Projects\\Simulator\\DroneClient\\formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", + "RelativeMoniker": "D:0:0:{B66DBB0A-CCDD-4711-ADB0-5AA11AC1760D}|DroneClient.csproj|solutionrelative:formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" }, { - "AbsoluteMoniker": "D:0:0:{B66DBB0A-CCDD-4711-ADB0-5AA11AC1760D}|DroneClient.csproj|d:\\cpl\\simulator\\droneclient\\droneclient\\formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", - "RelativeMoniker": "D:0:0:{B66DBB0A-CCDD-4711-ADB0-5AA11AC1760D}|DroneClient.csproj|solutionrelative:formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" + "AbsoluteMoniker": "D:0:0:{B66DBB0A-CCDD-4711-ADB0-5AA11AC1760D}|DroneClient.csproj|c:\\projects\\simulator\\droneclient\\formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{B66DBB0A-CCDD-4711-ADB0-5AA11AC1760D}|DroneClient.csproj|solutionrelative:formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -23,27 +23,27 @@ { "$type": "Document", "DocumentIndex": 0, - "Title": "FormMain.cs", - "DocumentMoniker": "D:\\CPL\\Simulator\\DroneClient\\DroneClient\\FormMain.cs", + "Title": "FormMain.cs [\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440]", + "DocumentMoniker": "C:\\Projects\\Simulator\\DroneClient\\FormMain.cs", "RelativeDocumentMoniker": "FormMain.cs", - "ToolTip": "D:\\CPL\\Simulator\\DroneClient\\DroneClient\\FormMain.cs", - "RelativeToolTip": "FormMain.cs", - "ViewState": "AgIAACEAAAAAAAAAAAAYwCYAAAAOAAAAAAAAAA==", + "ToolTip": "C:\\Projects\\Simulator\\DroneClient\\FormMain.cs [\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440]", + "RelativeToolTip": "FormMain.cs [\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440]", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-27T13:11:11.045Z", - "EditorCaption": "" + "WhenOpened": "2025-04-01T08:13:27.111Z", + "EditorCaption": " [\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440]" }, { "$type": "Document", "DocumentIndex": 1, - "Title": "FormMain.cs [\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440]", - "DocumentMoniker": "D:\\CPL\\Simulator\\DroneClient\\DroneClient\\FormMain.cs", + "Title": "FormMain.cs", + "DocumentMoniker": "C:\\Projects\\Simulator\\DroneClient\\FormMain.cs", "RelativeDocumentMoniker": "FormMain.cs", - "ToolTip": "D:\\CPL\\Simulator\\DroneClient\\DroneClient\\FormMain.cs [\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440]", - "RelativeToolTip": "FormMain.cs [\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440]", + "ToolTip": "C:\\Projects\\Simulator\\DroneClient\\FormMain.cs", + "RelativeToolTip": "FormMain.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAGsAAAAgAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-03-27T13:11:01.471Z", - "EditorCaption": " [\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440]" + "WhenOpened": "2025-03-27T13:11:11.045Z", + "EditorCaption": "" } ] } diff --git a/DroneClient/.vs/ProjectEvaluation/droneclient.metadata.v9.bin b/DroneClient/.vs/ProjectEvaluation/droneclient.metadata.v9.bin index 7de7e09..96bddf4 100644 Binary files a/DroneClient/.vs/ProjectEvaluation/droneclient.metadata.v9.bin and b/DroneClient/.vs/ProjectEvaluation/droneclient.metadata.v9.bin differ diff --git a/DroneClient/.vs/ProjectEvaluation/droneclient.projects.v9.bin b/DroneClient/.vs/ProjectEvaluation/droneclient.projects.v9.bin index d77a715..e00cdf0 100644 Binary files a/DroneClient/.vs/ProjectEvaluation/droneclient.projects.v9.bin and b/DroneClient/.vs/ProjectEvaluation/droneclient.projects.v9.bin differ diff --git a/DroneClient/.vs/ProjectEvaluation/droneclient.strings.v9.bin b/DroneClient/.vs/ProjectEvaluation/droneclient.strings.v9.bin index 110e35e..a482864 100644 Binary files a/DroneClient/.vs/ProjectEvaluation/droneclient.strings.v9.bin and b/DroneClient/.vs/ProjectEvaluation/droneclient.strings.v9.bin differ diff --git a/DroneClient/FormMain.Designer.cs b/DroneClient/FormMain.Designer.cs index f7eb90a..43d47e9 100644 --- a/DroneClient/FormMain.Designer.cs +++ b/DroneClient/FormMain.Designer.cs @@ -20,460 +20,503 @@ base.Dispose(disposing); } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - components = new System.ComponentModel.Container(); - timer_Test = new System.Windows.Forms.Timer(components); - groupBox1 = new GroupBox(); - textBox_Server_Addr = new TextBox(); - label2 = new Label(); - button_Connect = new Button(); - numericUpDown_Server_Port = new NumericUpDown(); - label3 = new Label(); - label1 = new Label(); - groupBox2 = new GroupBox(); - label_Acc_Z = new Label(); - label7 = new Label(); - label_Acc_Y = new Label(); - label5 = new Label(); - label_Acc_X = new Label(); - groupBox3 = new GroupBox(); - label_Gyr_Z = new Label(); - label9 = new Label(); - label_Gyr_Y = new Label(); - label11 = new Label(); - label_Gyr_X = new Label(); - label13 = new Label(); - groupBox4 = new GroupBox(); - label_Pos_L = new Label(); - label6 = new Label(); - label_Pos_Y = new Label(); - label10 = new Label(); - label_Pos_X = new Label(); - label14 = new Label(); - trackBar_Power = new TrackBar(); - button_LL = new Button(); - button_UU = new Button(); - button_DD = new Button(); - button_RR = new Button(); - label_Pow = new Label(); - button_ML = new Button(); - button_MR = new Button(); - groupBox1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)numericUpDown_Server_Port).BeginInit(); - groupBox2.SuspendLayout(); - groupBox3.SuspendLayout(); - groupBox4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)trackBar_Power).BeginInit(); - SuspendLayout(); - // - // timer_Test - // - timer_Test.Enabled = true; - timer_Test.Interval = 10; - timer_Test.Tick += timer_Test_Tick; - // - // groupBox1 - // - groupBox1.Controls.Add(textBox_Server_Addr); - groupBox1.Controls.Add(label2); - groupBox1.Controls.Add(button_Connect); - groupBox1.Controls.Add(numericUpDown_Server_Port); - groupBox1.Controls.Add(label3); - groupBox1.Dock = DockStyle.Top; - groupBox1.Location = new Point(0, 0); - groupBox1.Name = "groupBox1"; - groupBox1.Size = new Size(275, 80); - groupBox1.TabIndex = 3; - groupBox1.TabStop = false; - groupBox1.Tag = ""; - groupBox1.Text = "Server"; - // - // textBox_Server_Addr - // - textBox_Server_Addr.Location = new Point(48, 16); - textBox_Server_Addr.Name = "textBox_Server_Addr"; - textBox_Server_Addr.Size = new Size(125, 23); - textBox_Server_Addr.TabIndex = 4; - textBox_Server_Addr.Text = "127.0.0.1"; - // - // label2 - // - label2.AutoSize = true; - label2.Location = new Point(6, 19); - label2.Name = "label2"; - label2.Size = new Size(36, 15); - label2.TabIndex = 3; - label2.Tag = ""; - label2.Text = "Addr:"; - // - // button_Connect - // - button_Connect.BackColor = Color.Transparent; - button_Connect.Location = new Point(112, 46); - button_Connect.Name = "button_Connect"; - button_Connect.Size = new Size(61, 23); - button_Connect.TabIndex = 2; - button_Connect.Tag = ""; - button_Connect.Text = "Connect"; - button_Connect.UseVisualStyleBackColor = false; - button_Connect.Click += button_Connect_Click; - // - // numericUpDown_Server_Port - // - numericUpDown_Server_Port.Location = new Point(44, 48); - numericUpDown_Server_Port.Maximum = new decimal(new int[] { 65000, 0, 0, 0 }); - numericUpDown_Server_Port.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); - numericUpDown_Server_Port.Name = "numericUpDown_Server_Port"; - numericUpDown_Server_Port.Size = new Size(62, 23); - numericUpDown_Server_Port.TabIndex = 1; - numericUpDown_Server_Port.Value = new decimal(new int[] { 1001, 0, 0, 0 }); - // - // label3 - // - label3.AutoSize = true; - label3.Location = new Point(6, 50); - label3.Name = "label3"; - label3.Size = new Size(32, 15); - label3.TabIndex = 0; - label3.Tag = "#clients_port"; - label3.Text = "Port:"; - // - // label1 - // - label1.AutoSize = true; - label1.Location = new Point(6, 19); - label1.Name = "label1"; - label1.Size = new Size(17, 15); - label1.TabIndex = 4; - label1.Text = "X:"; - // - // groupBox2 - // - groupBox2.Controls.Add(label_Acc_Z); - groupBox2.Controls.Add(label7); - groupBox2.Controls.Add(label_Acc_Y); - groupBox2.Controls.Add(label5); - groupBox2.Controls.Add(label_Acc_X); - groupBox2.Controls.Add(label1); - groupBox2.Location = new Point(6, 86); - groupBox2.Name = "groupBox2"; - groupBox2.Size = new Size(78, 100); - groupBox2.TabIndex = 5; - groupBox2.TabStop = false; - groupBox2.Text = "Acc"; - // - // label_Acc_Z - // - label_Acc_Z.AutoSize = true; - label_Acc_Z.Location = new Point(19, 70); - label_Acc_Z.Name = "label_Acc_Z"; - label_Acc_Z.Size = new Size(13, 15); - label_Acc_Z.TabIndex = 9; - label_Acc_Z.Text = "0"; - // - // label7 - // - label7.AutoSize = true; - label7.Location = new Point(6, 70); - label7.Name = "label7"; - label7.Size = new Size(17, 15); - label7.TabIndex = 8; - label7.Text = "Z:"; - // - // label_Acc_Y - // - label_Acc_Y.AutoSize = true; - label_Acc_Y.Location = new Point(19, 45); - label_Acc_Y.Name = "label_Acc_Y"; - label_Acc_Y.Size = new Size(13, 15); - label_Acc_Y.TabIndex = 7; - label_Acc_Y.Text = "0"; - // - // label5 - // - label5.AutoSize = true; - label5.Location = new Point(6, 45); - label5.Name = "label5"; - label5.Size = new Size(17, 15); - label5.TabIndex = 6; - label5.Text = "Y:"; - // - // label_Acc_X - // - label_Acc_X.AutoSize = true; - label_Acc_X.Location = new Point(19, 19); - label_Acc_X.Name = "label_Acc_X"; - label_Acc_X.Size = new Size(13, 15); - label_Acc_X.TabIndex = 5; - label_Acc_X.Text = "0"; - // - // groupBox3 - // - groupBox3.Controls.Add(label_Gyr_Z); - groupBox3.Controls.Add(label9); - groupBox3.Controls.Add(label_Gyr_Y); - groupBox3.Controls.Add(label11); - groupBox3.Controls.Add(label_Gyr_X); - groupBox3.Controls.Add(label13); - groupBox3.Location = new Point(95, 86); - groupBox3.Name = "groupBox3"; - groupBox3.Size = new Size(78, 100); - groupBox3.TabIndex = 6; - groupBox3.TabStop = false; - groupBox3.Text = "Gyr"; - // - // label_Gyr_Z - // - label_Gyr_Z.AutoSize = true; - label_Gyr_Z.Location = new Point(19, 70); - label_Gyr_Z.Name = "label_Gyr_Z"; - label_Gyr_Z.Size = new Size(13, 15); - label_Gyr_Z.TabIndex = 9; - label_Gyr_Z.Text = "0"; - // - // label9 - // - label9.AutoSize = true; - label9.Location = new Point(6, 70); - label9.Name = "label9"; - label9.Size = new Size(17, 15); - label9.TabIndex = 8; - label9.Text = "Z:"; - // - // label_Gyr_Y - // - label_Gyr_Y.AutoSize = true; - label_Gyr_Y.Location = new Point(19, 45); - label_Gyr_Y.Name = "label_Gyr_Y"; - label_Gyr_Y.Size = new Size(13, 15); - label_Gyr_Y.TabIndex = 7; - label_Gyr_Y.Text = "0"; - // - // label11 - // - label11.AutoSize = true; - label11.Location = new Point(6, 45); - label11.Name = "label11"; - label11.Size = new Size(17, 15); - label11.TabIndex = 6; - label11.Text = "Y:"; - // - // label_Gyr_X - // - label_Gyr_X.AutoSize = true; - label_Gyr_X.Location = new Point(19, 19); - label_Gyr_X.Name = "label_Gyr_X"; - label_Gyr_X.Size = new Size(13, 15); - label_Gyr_X.TabIndex = 5; - label_Gyr_X.Text = "0"; - // - // label13 - // - label13.AutoSize = true; - label13.Location = new Point(6, 19); - label13.Name = "label13"; - label13.Size = new Size(17, 15); - label13.TabIndex = 4; - label13.Text = "X:"; - // - // groupBox4 - // - groupBox4.Controls.Add(label_Pos_L); - groupBox4.Controls.Add(label6); - groupBox4.Controls.Add(label_Pos_Y); - groupBox4.Controls.Add(label10); - groupBox4.Controls.Add(label_Pos_X); - groupBox4.Controls.Add(label14); - groupBox4.Location = new Point(188, 86); - groupBox4.Name = "groupBox4"; - groupBox4.Size = new Size(78, 100); - groupBox4.TabIndex = 7; - groupBox4.TabStop = false; - groupBox4.Text = "Pos"; - // - // label_Pos_L - // - label_Pos_L.AutoSize = true; - label_Pos_L.Location = new Point(19, 70); - label_Pos_L.Name = "label_Pos_L"; - label_Pos_L.Size = new Size(13, 15); - label_Pos_L.TabIndex = 9; - label_Pos_L.Text = "0"; - // - // label6 - // - label6.AutoSize = true; - label6.Location = new Point(6, 70); - label6.Name = "label6"; - label6.Size = new Size(16, 15); - label6.TabIndex = 8; - label6.Text = "L:"; - // - // label_Pos_Y - // - label_Pos_Y.AutoSize = true; - label_Pos_Y.Location = new Point(19, 45); - label_Pos_Y.Name = "label_Pos_Y"; - label_Pos_Y.Size = new Size(13, 15); - label_Pos_Y.TabIndex = 7; - label_Pos_Y.Text = "0"; - // - // label10 - // - label10.AutoSize = true; - label10.Location = new Point(6, 45); - label10.Name = "label10"; - label10.Size = new Size(17, 15); - label10.TabIndex = 6; - label10.Text = "Y:"; - // - // label_Pos_X - // - label_Pos_X.AutoSize = true; - label_Pos_X.Location = new Point(19, 19); - label_Pos_X.Name = "label_Pos_X"; - label_Pos_X.Size = new Size(13, 15); - label_Pos_X.TabIndex = 5; - label_Pos_X.Text = "0"; - // - // label14 - // - label14.AutoSize = true; - label14.Location = new Point(6, 19); - label14.Name = "label14"; - label14.Size = new Size(17, 15); - label14.TabIndex = 4; - label14.Text = "X:"; - // - // trackBar_Power - // - trackBar_Power.Location = new Point(112, 240); - trackBar_Power.Maximum = 100; - trackBar_Power.Name = "trackBar_Power"; - trackBar_Power.Orientation = Orientation.Vertical; - trackBar_Power.Size = new Size(45, 141); - trackBar_Power.TabIndex = 12; - trackBar_Power.Scroll += trackBar_Power_Scroll; - // - // button_LL - // - button_LL.Location = new Point(9, 318); - button_LL.Name = "button_LL"; - button_LL.Size = new Size(75, 23); - button_LL.TabIndex = 13; - button_LL.Text = "LL"; - button_LL.UseVisualStyleBackColor = true; - button_LL.MouseDown += button_UU_MouseDown; - button_LL.MouseUp += button_UU_MouseUp; - // - // button_UU - // - button_UU.Location = new Point(98, 211); - button_UU.Name = "button_UU"; - button_UU.Size = new Size(75, 23); - button_UU.TabIndex = 14; - button_UU.Text = "UU"; - button_UU.UseVisualStyleBackColor = true; - button_UU.MouseDown += button_UU_MouseDown; - button_UU.MouseUp += button_UU_MouseUp; - // - // button_DD - // - button_DD.Location = new Point(98, 412); - button_DD.Name = "button_DD"; - button_DD.Size = new Size(75, 23); - button_DD.TabIndex = 15; - button_DD.Text = "DD"; - button_DD.UseVisualStyleBackColor = true; - button_DD.MouseDown += button_UU_MouseDown; - button_DD.MouseUp += button_UU_MouseUp; - // - // button_RR - // - button_RR.Location = new Point(188, 318); - button_RR.Name = "button_RR"; - button_RR.Size = new Size(75, 23); - button_RR.TabIndex = 16; - button_RR.Text = "RR"; - button_RR.UseVisualStyleBackColor = true; - button_RR.MouseDown += button_UU_MouseDown; - button_RR.MouseUp += button_UU_MouseUp; - // - // label_Pow - // - label_Pow.AutoSize = true; - label_Pow.Location = new Point(126, 384); - label_Pow.Name = "label_Pow"; - label_Pow.Size = new Size(13, 15); - label_Pow.TabIndex = 21; - label_Pow.Text = "0"; - // - // button_ML - // - button_ML.Location = new Point(9, 211); - button_ML.Name = "button_ML"; - button_ML.Size = new Size(75, 23); - button_ML.TabIndex = 22; - button_ML.Text = "<-"; - button_ML.UseVisualStyleBackColor = true; - button_ML.MouseDown += button_UU_MouseDown; - button_ML.MouseUp += button_UU_MouseUp; - // - // button_MR - // - button_MR.Location = new Point(188, 211); - button_MR.Name = "button_MR"; - button_MR.Size = new Size(75, 23); - button_MR.TabIndex = 23; - button_MR.Text = "->"; - button_MR.UseVisualStyleBackColor = true; - button_MR.MouseDown += button_UU_MouseDown; - button_MR.MouseUp += button_UU_MouseUp; - // - // Form_Main - // - AutoScaleDimensions = new SizeF(7F, 15F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(275, 447); - Controls.Add(button_MR); - Controls.Add(button_ML); - Controls.Add(label_Pow); - Controls.Add(button_RR); - Controls.Add(button_DD); - Controls.Add(button_UU); - Controls.Add(button_LL); - Controls.Add(trackBar_Power); - Controls.Add(groupBox4); - Controls.Add(groupBox3); - Controls.Add(groupBox2); - Controls.Add(groupBox1); - MinimumSize = new Size(291, 389); - Name = "Form_Main"; - Text = "Drone Client V1.0"; - FormClosing += Form_Main_FormClosing; - groupBox1.ResumeLayout(false); - groupBox1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)numericUpDown_Server_Port).EndInit(); - groupBox2.ResumeLayout(false); - groupBox2.PerformLayout(); - groupBox3.ResumeLayout(false); - groupBox3.PerformLayout(); - groupBox4.ResumeLayout(false); - groupBox4.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)trackBar_Power).EndInit(); - ResumeLayout(false); - PerformLayout(); - } + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + components = new System.ComponentModel.Container(); + timer_Test = new System.Windows.Forms.Timer(components); + groupBox1 = new GroupBox(); + textBox_Server_Addr = new TextBox(); + label2 = new Label(); + button_Connect = new Button(); + numericUpDown_Server_Port = new NumericUpDown(); + label3 = new Label(); + label1 = new Label(); + groupBox2 = new GroupBox(); + label_Acc_Z = new Label(); + label7 = new Label(); + label_Acc_Y = new Label(); + label5 = new Label(); + label_Acc_X = new Label(); + groupBox3 = new GroupBox(); + label_Gyr_Z = new Label(); + label9 = new Label(); + label_Gyr_Y = new Label(); + label11 = new Label(); + label_Gyr_X = new Label(); + label13 = new Label(); + groupBox4 = new GroupBox(); + label_Pos_L = new Label(); + label6 = new Label(); + label_Pos_Y = new Label(); + label10 = new Label(); + label_Pos_X = new Label(); + label14 = new Label(); + trackBar_Power = new TrackBar(); + button_LL = new Button(); + button_UU = new Button(); + button_DD = new Button(); + button_RR = new Button(); + label_Pow = new Label(); + button_ML = new Button(); + button_MR = new Button(); + groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDown_Server_Port).BeginInit(); + groupBox2.SuspendLayout(); + groupBox3.SuspendLayout(); + groupBox4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)trackBar_Power).BeginInit(); + SuspendLayout(); + // + // timer_Test + // + timer_Test.Enabled = true; + timer_Test.Interval = 10; + timer_Test.Tick += timer_Test_Tick; + // + // groupBox1 + // + groupBox1.Controls.Add(textBox_Server_Addr); + groupBox1.Controls.Add(label2); + groupBox1.Controls.Add(button_Connect); + groupBox1.Controls.Add(numericUpDown_Server_Port); + groupBox1.Controls.Add(label3); + groupBox1.Dock = DockStyle.Top; + groupBox1.Location = new Point(0, 0); + groupBox1.Margin = new Padding(6, 6, 6, 6); + groupBox1.Name = "groupBox1"; + groupBox1.Padding = new Padding(6, 6, 6, 6); + groupBox1.Size = new Size(511, 171); + groupBox1.TabIndex = 3; + groupBox1.TabStop = false; + groupBox1.Tag = ""; + groupBox1.Text = "Server"; + groupBox1.Enter += groupBox1_Enter; + // + // textBox_Server_Addr + // + textBox_Server_Addr.Location = new Point(89, 34); + textBox_Server_Addr.Margin = new Padding(6, 6, 6, 6); + textBox_Server_Addr.Name = "textBox_Server_Addr"; + textBox_Server_Addr.Size = new Size(229, 39); + textBox_Server_Addr.TabIndex = 4; + textBox_Server_Addr.Text = "127.0.0.1"; + textBox_Server_Addr.TextChanged += textBox_Server_Addr_TextChanged; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(11, 41); + label2.Margin = new Padding(6, 0, 6, 0); + label2.Name = "label2"; + label2.Size = new Size(70, 32); + label2.TabIndex = 3; + label2.Tag = ""; + label2.Text = "Addr:"; + // + // button_Connect + // + button_Connect.BackColor = Color.Transparent; + button_Connect.Location = new Point(208, 98); + button_Connect.Margin = new Padding(6, 6, 6, 6); + button_Connect.Name = "button_Connect"; + button_Connect.Size = new Size(113, 49); + button_Connect.TabIndex = 2; + button_Connect.Tag = ""; + button_Connect.Text = "Connect"; + button_Connect.UseVisualStyleBackColor = false; + button_Connect.Click += button_Connect_Click; + // + // numericUpDown_Server_Port + // + numericUpDown_Server_Port.Location = new Point(82, 102); + numericUpDown_Server_Port.Margin = new Padding(6, 6, 6, 6); + numericUpDown_Server_Port.Maximum = new decimal(new int[] { 65000, 0, 0, 0 }); + numericUpDown_Server_Port.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); + numericUpDown_Server_Port.Name = "numericUpDown_Server_Port"; + numericUpDown_Server_Port.Size = new Size(115, 39); + numericUpDown_Server_Port.TabIndex = 1; + numericUpDown_Server_Port.Value = new decimal(new int[] { 1001, 0, 0, 0 }); + // + // label3 + // + label3.AutoSize = true; + label3.Location = new Point(11, 107); + label3.Margin = new Padding(6, 0, 6, 0); + label3.Name = "label3"; + label3.Size = new Size(61, 32); + label3.TabIndex = 0; + label3.Tag = "#clients_port"; + label3.Text = "Port:"; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(11, 41); + label1.Margin = new Padding(6, 0, 6, 0); + label1.Name = "label1"; + label1.Size = new Size(33, 32); + label1.TabIndex = 4; + label1.Text = "X:"; + // + // groupBox2 + // + groupBox2.Controls.Add(label_Acc_Z); + groupBox2.Controls.Add(label7); + groupBox2.Controls.Add(label_Acc_Y); + groupBox2.Controls.Add(label5); + groupBox2.Controls.Add(label_Acc_X); + groupBox2.Controls.Add(label1); + groupBox2.Location = new Point(11, 183); + groupBox2.Margin = new Padding(6, 6, 6, 6); + groupBox2.Name = "groupBox2"; + groupBox2.Padding = new Padding(6, 6, 6, 6); + groupBox2.Size = new Size(145, 213); + groupBox2.TabIndex = 5; + groupBox2.TabStop = false; + groupBox2.Text = "Acc"; + // + // label_Acc_Z + // + label_Acc_Z.AutoSize = true; + label_Acc_Z.Location = new Point(35, 149); + label_Acc_Z.Margin = new Padding(6, 0, 6, 0); + label_Acc_Z.Name = "label_Acc_Z"; + label_Acc_Z.Size = new Size(27, 32); + label_Acc_Z.TabIndex = 9; + label_Acc_Z.Text = "0"; + // + // label7 + // + label7.AutoSize = true; + label7.Location = new Point(11, 149); + label7.Margin = new Padding(6, 0, 6, 0); + label7.Name = "label7"; + label7.Size = new Size(33, 32); + label7.TabIndex = 8; + label7.Text = "Z:"; + // + // label_Acc_Y + // + label_Acc_Y.AutoSize = true; + label_Acc_Y.Location = new Point(35, 96); + label_Acc_Y.Margin = new Padding(6, 0, 6, 0); + label_Acc_Y.Name = "label_Acc_Y"; + label_Acc_Y.Size = new Size(27, 32); + label_Acc_Y.TabIndex = 7; + label_Acc_Y.Text = "0"; + // + // label5 + // + label5.AutoSize = true; + label5.Location = new Point(11, 96); + label5.Margin = new Padding(6, 0, 6, 0); + label5.Name = "label5"; + label5.Size = new Size(32, 32); + label5.TabIndex = 6; + label5.Text = "Y:"; + // + // label_Acc_X + // + label_Acc_X.AutoSize = true; + label_Acc_X.Location = new Point(35, 41); + label_Acc_X.Margin = new Padding(6, 0, 6, 0); + label_Acc_X.Name = "label_Acc_X"; + label_Acc_X.Size = new Size(27, 32); + label_Acc_X.TabIndex = 5; + label_Acc_X.Text = "0"; + // + // groupBox3 + // + groupBox3.Controls.Add(label_Gyr_Z); + groupBox3.Controls.Add(label9); + groupBox3.Controls.Add(label_Gyr_Y); + groupBox3.Controls.Add(label11); + groupBox3.Controls.Add(label_Gyr_X); + groupBox3.Controls.Add(label13); + groupBox3.Location = new Point(176, 183); + groupBox3.Margin = new Padding(6, 6, 6, 6); + groupBox3.Name = "groupBox3"; + groupBox3.Padding = new Padding(6, 6, 6, 6); + groupBox3.Size = new Size(145, 213); + groupBox3.TabIndex = 6; + groupBox3.TabStop = false; + groupBox3.Text = "Gyr"; + // + // label_Gyr_Z + // + label_Gyr_Z.AutoSize = true; + label_Gyr_Z.Location = new Point(35, 149); + label_Gyr_Z.Margin = new Padding(6, 0, 6, 0); + label_Gyr_Z.Name = "label_Gyr_Z"; + label_Gyr_Z.Size = new Size(27, 32); + label_Gyr_Z.TabIndex = 9; + label_Gyr_Z.Text = "0"; + // + // label9 + // + label9.AutoSize = true; + label9.Location = new Point(11, 149); + label9.Margin = new Padding(6, 0, 6, 0); + label9.Name = "label9"; + label9.Size = new Size(33, 32); + label9.TabIndex = 8; + label9.Text = "Z:"; + // + // label_Gyr_Y + // + label_Gyr_Y.AutoSize = true; + label_Gyr_Y.Location = new Point(35, 96); + label_Gyr_Y.Margin = new Padding(6, 0, 6, 0); + label_Gyr_Y.Name = "label_Gyr_Y"; + label_Gyr_Y.Size = new Size(27, 32); + label_Gyr_Y.TabIndex = 7; + label_Gyr_Y.Text = "0"; + // + // label11 + // + label11.AutoSize = true; + label11.Location = new Point(11, 96); + label11.Margin = new Padding(6, 0, 6, 0); + label11.Name = "label11"; + label11.Size = new Size(32, 32); + label11.TabIndex = 6; + label11.Text = "Y:"; + // + // label_Gyr_X + // + label_Gyr_X.AutoSize = true; + label_Gyr_X.Location = new Point(35, 41); + label_Gyr_X.Margin = new Padding(6, 0, 6, 0); + label_Gyr_X.Name = "label_Gyr_X"; + label_Gyr_X.Size = new Size(27, 32); + label_Gyr_X.TabIndex = 5; + label_Gyr_X.Text = "0"; + // + // label13 + // + label13.AutoSize = true; + label13.Location = new Point(11, 41); + label13.Margin = new Padding(6, 0, 6, 0); + label13.Name = "label13"; + label13.Size = new Size(33, 32); + label13.TabIndex = 4; + label13.Text = "X:"; + // + // groupBox4 + // + groupBox4.Controls.Add(label_Pos_L); + groupBox4.Controls.Add(label6); + groupBox4.Controls.Add(label_Pos_Y); + groupBox4.Controls.Add(label10); + groupBox4.Controls.Add(label_Pos_X); + groupBox4.Controls.Add(label14); + groupBox4.Location = new Point(349, 183); + groupBox4.Margin = new Padding(6, 6, 6, 6); + groupBox4.Name = "groupBox4"; + groupBox4.Padding = new Padding(6, 6, 6, 6); + groupBox4.Size = new Size(145, 213); + groupBox4.TabIndex = 7; + groupBox4.TabStop = false; + groupBox4.Text = "Pos"; + // + // label_Pos_L + // + label_Pos_L.AutoSize = true; + label_Pos_L.Location = new Point(35, 149); + label_Pos_L.Margin = new Padding(6, 0, 6, 0); + label_Pos_L.Name = "label_Pos_L"; + label_Pos_L.Size = new Size(27, 32); + label_Pos_L.TabIndex = 9; + label_Pos_L.Text = "0"; + // + // label6 + // + label6.AutoSize = true; + label6.Location = new Point(11, 149); + label6.Margin = new Padding(6, 0, 6, 0); + label6.Name = "label6"; + label6.Size = new Size(30, 32); + label6.TabIndex = 8; + label6.Text = "L:"; + // + // label_Pos_Y + // + label_Pos_Y.AutoSize = true; + label_Pos_Y.Location = new Point(35, 96); + label_Pos_Y.Margin = new Padding(6, 0, 6, 0); + label_Pos_Y.Name = "label_Pos_Y"; + label_Pos_Y.Size = new Size(27, 32); + label_Pos_Y.TabIndex = 7; + label_Pos_Y.Text = "0"; + // + // label10 + // + label10.AutoSize = true; + label10.Location = new Point(11, 96); + label10.Margin = new Padding(6, 0, 6, 0); + label10.Name = "label10"; + label10.Size = new Size(32, 32); + label10.TabIndex = 6; + label10.Text = "Y:"; + // + // label_Pos_X + // + label_Pos_X.AutoSize = true; + label_Pos_X.Location = new Point(35, 41); + label_Pos_X.Margin = new Padding(6, 0, 6, 0); + label_Pos_X.Name = "label_Pos_X"; + label_Pos_X.Size = new Size(27, 32); + label_Pos_X.TabIndex = 5; + label_Pos_X.Text = "0"; + label_Pos_X.Click += label_Pos_X_Click; + // + // label14 + // + label14.AutoSize = true; + label14.Location = new Point(11, 41); + label14.Margin = new Padding(6, 0, 6, 0); + label14.Name = "label14"; + label14.Size = new Size(33, 32); + label14.TabIndex = 4; + label14.Text = "X:"; + // + // trackBar_Power + // + trackBar_Power.Location = new Point(208, 512); + trackBar_Power.Margin = new Padding(6, 6, 6, 6); + trackBar_Power.Maximum = 100; + trackBar_Power.Name = "trackBar_Power"; + trackBar_Power.Orientation = Orientation.Vertical; + trackBar_Power.Size = new Size(90, 301); + trackBar_Power.TabIndex = 12; + trackBar_Power.Scroll += trackBar_Power_Scroll; + // + // button_LL + // + button_LL.Location = new Point(17, 678); + button_LL.Margin = new Padding(6, 6, 6, 6); + button_LL.Name = "button_LL"; + button_LL.Size = new Size(139, 49); + button_LL.TabIndex = 13; + button_LL.Text = "LL"; + button_LL.UseVisualStyleBackColor = true; + button_LL.MouseDown += button_UU_MouseDown; + button_LL.MouseUp += button_UU_MouseUp; + // + // button_UU + // + button_UU.Location = new Point(182, 450); + button_UU.Margin = new Padding(6, 6, 6, 6); + button_UU.Name = "button_UU"; + button_UU.Size = new Size(139, 49); + button_UU.TabIndex = 14; + button_UU.Text = "UU"; + button_UU.UseVisualStyleBackColor = true; + button_UU.MouseDown += button_UU_MouseDown; + button_UU.MouseUp += button_UU_MouseUp; + // + // button_DD + // + button_DD.Location = new Point(182, 879); + button_DD.Margin = new Padding(6, 6, 6, 6); + button_DD.Name = "button_DD"; + button_DD.Size = new Size(139, 49); + button_DD.TabIndex = 15; + button_DD.Text = "DD"; + button_DD.UseVisualStyleBackColor = true; + button_DD.MouseDown += button_UU_MouseDown; + button_DD.MouseUp += button_UU_MouseUp; + // + // button_RR + // + button_RR.Location = new Point(349, 678); + button_RR.Margin = new Padding(6, 6, 6, 6); + button_RR.Name = "button_RR"; + button_RR.Size = new Size(139, 49); + button_RR.TabIndex = 16; + button_RR.Text = "RR"; + button_RR.UseVisualStyleBackColor = true; + button_RR.MouseDown += button_UU_MouseDown; + button_RR.MouseUp += button_UU_MouseUp; + // + // label_Pow + // + label_Pow.AutoSize = true; + label_Pow.Location = new Point(234, 819); + label_Pow.Margin = new Padding(6, 0, 6, 0); + label_Pow.Name = "label_Pow"; + label_Pow.Size = new Size(27, 32); + label_Pow.TabIndex = 21; + label_Pow.Text = "0"; + // + // button_ML + // + button_ML.Location = new Point(17, 450); + button_ML.Margin = new Padding(6, 6, 6, 6); + button_ML.Name = "button_ML"; + button_ML.Size = new Size(139, 49); + button_ML.TabIndex = 22; + button_ML.Text = "<-"; + button_ML.UseVisualStyleBackColor = true; + button_ML.MouseDown += button_UU_MouseDown; + button_ML.MouseUp += button_UU_MouseUp; + // + // button_MR + // + button_MR.Location = new Point(349, 450); + button_MR.Margin = new Padding(6, 6, 6, 6); + button_MR.Name = "button_MR"; + button_MR.Size = new Size(139, 49); + button_MR.TabIndex = 23; + button_MR.Text = "->"; + button_MR.UseVisualStyleBackColor = true; + button_MR.MouseDown += button_UU_MouseDown; + button_MR.MouseUp += button_UU_MouseUp; + // + // Form_Main + // + AutoScaleDimensions = new SizeF(13F, 32F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(511, 954); + Controls.Add(button_MR); + Controls.Add(button_ML); + Controls.Add(label_Pow); + Controls.Add(button_RR); + Controls.Add(button_DD); + Controls.Add(button_UU); + Controls.Add(button_LL); + Controls.Add(trackBar_Power); + Controls.Add(groupBox4); + Controls.Add(groupBox3); + Controls.Add(groupBox2); + Controls.Add(groupBox1); + Margin = new Padding(6, 6, 6, 6); + MinimumSize = new Size(518, 749); + Name = "Form_Main"; + Text = "Drone Client V1.0"; + FormClosing += Form_Main_FormClosing; + groupBox1.ResumeLayout(false); + groupBox1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDown_Server_Port).EndInit(); + groupBox2.ResumeLayout(false); + groupBox2.PerformLayout(); + groupBox3.ResumeLayout(false); + groupBox3.PerformLayout(); + groupBox4.ResumeLayout(false); + groupBox4.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)trackBar_Power).EndInit(); + ResumeLayout(false); + PerformLayout(); + } - #endregion - private System.Windows.Forms.Timer timer_Test; + #endregion + private System.Windows.Forms.Timer timer_Test; private GroupBox groupBox1; private TextBox textBox_Server_Addr; private Label label2; diff --git a/DroneClient/FormMain.cs b/DroneClient/FormMain.cs index d479e1a..2d5d300 100644 --- a/DroneClient/FormMain.cs +++ b/DroneClient/FormMain.cs @@ -6,149 +6,169 @@ using DroneClient; namespace DroneSimulator { - public partial class Form_Main : Form - { - private NetClient netClient = new NetClient(); - - public Form_Main() + public partial class Form_Main : Form { - InitializeComponent(); - } + private NetClient netClient = new NetClient(); - private void ConnectionCallback(object o) - { - ConnectData data = (ConnectData)o; - - if (!data.Connect) - { - Invoke((MethodInvoker)delegate + public Form_Main() { - button_Connect.Text = "Connect"; - button_Connect.BackColor = Color.Transparent; - MessageBox.Show("Connection closed"); - }); + InitializeComponent(); + } - return; - } + private void ConnectionCallback(object o) + { + ConnectData data = (ConnectData)o; - byte[] send = Drone.getBytes(sendDrone); + if (!data.Connect) + { + Invoke((MethodInvoker)delegate + { + button_Connect.Text = "Connect"; + button_Connect.BackColor = Color.Transparent; + MessageBox.Show("Connection closed"); + }); - data.Server.Send(send); + return; + } + + byte[] send = Drone.getBytes(sendDrone); + + data.Server.Send(send); + } + + Drone.DataIn sendDrone; + + Drone.DataOut recvDrone; + + private void ReceiveCallback(object o) + { + ReceiveData data = (ReceiveData)o; + + recvDrone = (Drone.DataOut)Drone.fromBytes(data.Buffer, typeof(Drone.DataOut)); + + byte[] send = Drone.getBytes(sendDrone); + + try { data.Server.Send(send); } + catch { } + } + + private void button_Connect_Click(object sender, EventArgs e) + { + var done = netClient.Connect(textBox_Server_Addr.Text, (int)numericUpDown_Server_Port.Value, ConnectionCallback, ReceiveCallback); + + switch (done) + { + case NetClient.ClientState.Error: + { + MessageBox.Show("Error connecting to server"); + break; + } + case NetClient.ClientState.Connected: + { + button_Connect.Text = "Disconnect"; + button_Connect.BackColor = Color.LimeGreen; + break; + } + case NetClient.ClientState.Stop: + { + button_Connect.Text = "Connect"; + button_Connect.BackColor = Color.Transparent; + break; + } + } + + if (done != NetClient.ClientState.Connected) return; + } + + private void Form_Main_FormClosing(object sender, FormClosingEventArgs e) + { + netClient?.Close(); + netClient = null; + } + + private void timer_Test_Tick(object sender, EventArgs e) + { + label_Acc_X.Text = recvDrone.AccX.ToString(); + label_Acc_Y.Text = recvDrone.AccY.ToString(); + label_Acc_Z.Text = recvDrone.AccZ.ToString(); + + label_Gyr_X.Text = recvDrone.GyrX.ToString(); + label_Gyr_Y.Text = recvDrone.GyrY.ToString(); + label_Gyr_Z.Text = recvDrone.GyrZ.ToString(); + + label_Pos_X.Text = recvDrone.PosX.ToString(); + label_Pos_Y.Text = recvDrone.PosY.ToString(); + label_Pos_L.Text = recvDrone.LaserRange.ToString(); + } + + private void trackBar_Power_Scroll(object sender, EventArgs e) + { + float pow = (float)trackBar_Power.Value / 100; + + label_Pow.Text = pow.ToString(); + + sendDrone.MotorUL = sendDrone.MotorUR = sendDrone.MotorDL = sendDrone.MotorDR = pow; + } + + private void button_UU_MouseDown(object sender, MouseEventArgs e) + { + if (sender == button_UU) + { + sendDrone.MotorUL -= 0.1f; sendDrone.MotorUR -= 0.1f; + sendDrone.MotorDL += 0.1f; sendDrone.MotorDR += 0.1f; + } + if (sender == button_DD) + { + sendDrone.MotorUL += 0.1f; sendDrone.MotorUR += 0.1f; + sendDrone.MotorDL -= 0.1f; sendDrone.MotorDR -= 0.1f; + } + if (sender == button_LL) + { + sendDrone.MotorUL -= 0.1f; sendDrone.MotorUR += 0.1f; + sendDrone.MotorDL -= 0.1f; sendDrone.MotorDR += 0.1f; + } + if (sender == button_RR) + { + sendDrone.MotorUL += 0.1f; sendDrone.MotorUR -= 0.1f; + sendDrone.MotorDL += 0.1f; sendDrone.MotorDR -= 0.1f; + } + + if (sender == button_ML) + { + sendDrone.MotorUL -= 0.1f; sendDrone.MotorUR += 0.1f; + sendDrone.MotorDL += 0.1f; sendDrone.MotorDR -= 0.1f; + } + + if (sender == button_MR) + { + sendDrone.MotorUL += 0.1f; sendDrone.MotorUR -= 0.1f; + sendDrone.MotorDL -= 0.1f; sendDrone.MotorDR += 0.1f; + } + } + + private void button_UU_MouseUp(object sender, MouseEventArgs e) + { + trackBar_Power_Scroll(null, null); + } + + private void groupBox2_Enter(object sender, EventArgs e) + { + + } + + private void groupBox1_Enter(object sender, EventArgs e) + { + + } + + private void textBox_Server_Addr_TextChanged(object sender, EventArgs e) + { + + } + + private void label_Pos_X_Click(object sender, EventArgs e) + { + + } } - - Drone.DataIn sendDrone; - - Drone.DataOut recvDrone; - - private void ReceiveCallback(object o) - { - ReceiveData data = (ReceiveData)o; - - recvDrone = (Drone.DataOut)Drone.fromBytes(data.Buffer, typeof(Drone.DataOut)); - - byte[] send = Drone.getBytes(sendDrone); - - try { data.Server.Send(send); } - catch { } - } - - private void button_Connect_Click(object sender, EventArgs e) - { - var done = netClient.Connect(textBox_Server_Addr.Text, (int)numericUpDown_Server_Port.Value, ConnectionCallback, ReceiveCallback); - - switch (done) - { - case NetClient.ClientState.Error: - { - MessageBox.Show("Error connecting to server"); - break; - } - case NetClient.ClientState.Connected: - { - button_Connect.Text = "Disconnect"; - button_Connect.BackColor = Color.LimeGreen; - break; - } - case NetClient.ClientState.Stop: - { - button_Connect.Text = "Connect"; - button_Connect.BackColor = Color.Transparent; - break; - } - } - - if (done != NetClient.ClientState.Connected) return; - } - - private void Form_Main_FormClosing(object sender, FormClosingEventArgs e) - { - netClient?.Close(); - netClient = null; - } - - private void timer_Test_Tick(object sender, EventArgs e) - { - label_Acc_X.Text = recvDrone.AccX.ToString(); - label_Acc_Y.Text = recvDrone.AccY.ToString(); - label_Acc_Z.Text = recvDrone.AccZ.ToString(); - - label_Gyr_X.Text = recvDrone.GyrX.ToString(); - label_Gyr_Y.Text = recvDrone.GyrY.ToString(); - label_Gyr_Z.Text = recvDrone.GyrZ.ToString(); - - label_Pos_X.Text = recvDrone.PosX.ToString(); - label_Pos_Y.Text = recvDrone.PosY.ToString(); - label_Pos_L.Text = recvDrone.LaserRange.ToString(); - } - - private void trackBar_Power_Scroll(object sender, EventArgs e) - { - float pow = (float)trackBar_Power.Value / 100; - - label_Pow.Text = pow.ToString(); - - sendDrone.MotorUL = sendDrone.MotorUR = sendDrone.MotorDL = sendDrone.MotorDR = pow; - } - - private void button_UU_MouseDown(object sender, MouseEventArgs e) - { - if (sender == button_UU) - { - sendDrone.MotorUL -= 0.1f; sendDrone.MotorUR -= 0.1f; - sendDrone.MotorDL += 0.1f; sendDrone.MotorDR += 0.1f; - } - if (sender == button_DD) - { - sendDrone.MotorUL += 0.1f; sendDrone.MotorUR += 0.1f; - sendDrone.MotorDL -= 0.1f; sendDrone.MotorDR -= 0.1f; - } - if (sender == button_LL) - { - sendDrone.MotorUL -= 0.1f; sendDrone.MotorUR += 0.1f; - sendDrone.MotorDL -= 0.1f; sendDrone.MotorDR += 0.1f; - } - if (sender == button_RR) - { - sendDrone.MotorUL += 0.1f; sendDrone.MotorUR -= 0.1f; - sendDrone.MotorDL += 0.1f; sendDrone.MotorDR -= 0.1f; - } - - if (sender == button_ML) - { - sendDrone.MotorUL -= 0.1f; sendDrone.MotorUR += 0.1f; - sendDrone.MotorDL += 0.1f; sendDrone.MotorDR -= 0.1f; - } - - if (sender == button_MR) - { - sendDrone.MotorUL += 0.1f; sendDrone.MotorUR -= 0.1f; - sendDrone.MotorDL -= 0.1f; sendDrone.MotorDR += 0.1f; - } - } - - private void button_UU_MouseUp(object sender, MouseEventArgs e) - { - trackBar_Power_Scroll(null, null); - } - } } diff --git a/DroneClient/bin/Debug/net9.0-windows/DroneClient.dll b/DroneClient/bin/Debug/net9.0-windows/DroneClient.dll index 4737dbf..623ad1a 100644 Binary files a/DroneClient/bin/Debug/net9.0-windows/DroneClient.dll and b/DroneClient/bin/Debug/net9.0-windows/DroneClient.dll differ diff --git a/DroneClient/bin/Debug/net9.0-windows/DroneClient.exe b/DroneClient/bin/Debug/net9.0-windows/DroneClient.exe index 92d0918..6d974a1 100644 Binary files a/DroneClient/bin/Debug/net9.0-windows/DroneClient.exe and b/DroneClient/bin/Debug/net9.0-windows/DroneClient.exe differ diff --git a/DroneClient/bin/Debug/net9.0-windows/DroneClient.pdb b/DroneClient/bin/Debug/net9.0-windows/DroneClient.pdb index fc70bf0..1388df9 100644 Binary files a/DroneClient/bin/Debug/net9.0-windows/DroneClient.pdb and b/DroneClient/bin/Debug/net9.0-windows/DroneClient.pdb differ diff --git a/DroneClient/obj/Debug/net9.0-windows/DroneClient.AssemblyInfo.cs b/DroneClient/obj/Debug/net9.0-windows/DroneClient.AssemblyInfo.cs index a3fe7a8..537889c 100644 --- a/DroneClient/obj/Debug/net9.0-windows/DroneClient.AssemblyInfo.cs +++ b/DroneClient/obj/Debug/net9.0-windows/DroneClient.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("DroneClient")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5591bb0a46e83d558505955cf7b5795edb3e95dc")] [assembly: System.Reflection.AssemblyProductAttribute("DroneClient")] [assembly: System.Reflection.AssemblyTitleAttribute("DroneClient")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/DroneClient/obj/Debug/net9.0-windows/DroneClient.AssemblyInfoInputs.cache b/DroneClient/obj/Debug/net9.0-windows/DroneClient.AssemblyInfoInputs.cache index 550a2a5..45f18d7 100644 --- a/DroneClient/obj/Debug/net9.0-windows/DroneClient.AssemblyInfoInputs.cache +++ b/DroneClient/obj/Debug/net9.0-windows/DroneClient.AssemblyInfoInputs.cache @@ -1 +1 @@ -372de9fd6d36597e50cdb2250f48b9cb0d5e8e1a2d1e568b83e287afe9580301 +457638ed7b06907c227ddcc810c7083b9dc1a90bbc1673f7940fba1f754d22bf diff --git a/DroneClient/obj/Debug/net9.0-windows/DroneClient.GeneratedMSBuildEditorConfig.editorconfig b/DroneClient/obj/Debug/net9.0-windows/DroneClient.GeneratedMSBuildEditorConfig.editorconfig index 8652b6b..042eadb 100644 --- a/DroneClient/obj/Debug/net9.0-windows/DroneClient.GeneratedMSBuildEditorConfig.editorconfig +++ b/DroneClient/obj/Debug/net9.0-windows/DroneClient.GeneratedMSBuildEditorConfig.editorconfig @@ -14,7 +14,7 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = DroneClient -build_property.ProjectDir = D:\CPL\Simulator\DroneClient\DroneClient\ +build_property.ProjectDir = C:\Projects\Simulator\DroneClient\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.CsWinRTUseWindowsUIXamlProjections = false diff --git a/DroneClient/obj/Debug/net9.0-windows/DroneClient.assets.cache b/DroneClient/obj/Debug/net9.0-windows/DroneClient.assets.cache index 2d918c1..d2cf885 100644 Binary files a/DroneClient/obj/Debug/net9.0-windows/DroneClient.assets.cache and b/DroneClient/obj/Debug/net9.0-windows/DroneClient.assets.cache differ diff --git a/DroneClient/obj/Debug/net9.0-windows/DroneClient.csproj.CoreCompileInputs.cache b/DroneClient/obj/Debug/net9.0-windows/DroneClient.csproj.CoreCompileInputs.cache index a1dc96f..daff5eb 100644 --- a/DroneClient/obj/Debug/net9.0-windows/DroneClient.csproj.CoreCompileInputs.cache +++ b/DroneClient/obj/Debug/net9.0-windows/DroneClient.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -01e86f1c7bc139724ab77bc57845e8da30f3f593b41b11317ce8867d8fb43c28 +e448410659ef13e2a3a4fa5ebfa0e5367402d6f31fe64fbb56ddbed87fd02c51 diff --git a/DroneClient/obj/Debug/net9.0-windows/DroneClient.csproj.FileListAbsolute.txt b/DroneClient/obj/Debug/net9.0-windows/DroneClient.csproj.FileListAbsolute.txt index f8d2f18..a38397a 100644 --- a/DroneClient/obj/Debug/net9.0-windows/DroneClient.csproj.FileListAbsolute.txt +++ b/DroneClient/obj/Debug/net9.0-windows/DroneClient.csproj.FileListAbsolute.txt @@ -30,3 +30,19 @@ D:\CPL\Simulator\DroneClient\DroneClient\obj\Debug\net9.0-windows\refint\DroneCl D:\CPL\Simulator\DroneClient\DroneClient\obj\Debug\net9.0-windows\DroneClient.pdb D:\CPL\Simulator\DroneClient\DroneClient\obj\Debug\net9.0-windows\DroneClient.genruntimeconfig.cache D:\CPL\Simulator\DroneClient\DroneClient\obj\Debug\net9.0-windows\ref\DroneClient.dll +C:\Projects\Simulator\DroneClient\bin\Debug\net9.0-windows\DroneClient.exe +C:\Projects\Simulator\DroneClient\bin\Debug\net9.0-windows\DroneClient.deps.json +C:\Projects\Simulator\DroneClient\bin\Debug\net9.0-windows\DroneClient.runtimeconfig.json +C:\Projects\Simulator\DroneClient\bin\Debug\net9.0-windows\DroneClient.dll +C:\Projects\Simulator\DroneClient\bin\Debug\net9.0-windows\DroneClient.pdb +C:\Projects\Simulator\DroneClient\obj\Debug\net9.0-windows\DroneSimulator.Form_Main.resources +C:\Projects\Simulator\DroneClient\obj\Debug\net9.0-windows\DroneClient.csproj.GenerateResource.cache +C:\Projects\Simulator\DroneClient\obj\Debug\net9.0-windows\DroneClient.GeneratedMSBuildEditorConfig.editorconfig +C:\Projects\Simulator\DroneClient\obj\Debug\net9.0-windows\DroneClient.AssemblyInfoInputs.cache +C:\Projects\Simulator\DroneClient\obj\Debug\net9.0-windows\DroneClient.AssemblyInfo.cs +C:\Projects\Simulator\DroneClient\obj\Debug\net9.0-windows\DroneClient.csproj.CoreCompileInputs.cache +C:\Projects\Simulator\DroneClient\obj\Debug\net9.0-windows\DroneClient.dll +C:\Projects\Simulator\DroneClient\obj\Debug\net9.0-windows\refint\DroneClient.dll +C:\Projects\Simulator\DroneClient\obj\Debug\net9.0-windows\DroneClient.pdb +C:\Projects\Simulator\DroneClient\obj\Debug\net9.0-windows\DroneClient.genruntimeconfig.cache +C:\Projects\Simulator\DroneClient\obj\Debug\net9.0-windows\ref\DroneClient.dll diff --git a/DroneClient/obj/Debug/net9.0-windows/DroneClient.csproj.GenerateResource.cache b/DroneClient/obj/Debug/net9.0-windows/DroneClient.csproj.GenerateResource.cache index c346dc5..a7c07ae 100644 Binary files a/DroneClient/obj/Debug/net9.0-windows/DroneClient.csproj.GenerateResource.cache and b/DroneClient/obj/Debug/net9.0-windows/DroneClient.csproj.GenerateResource.cache differ diff --git a/DroneClient/obj/Debug/net9.0-windows/DroneClient.designer.runtimeconfig.json b/DroneClient/obj/Debug/net9.0-windows/DroneClient.designer.runtimeconfig.json index 9657ac9..df08f59 100644 --- a/DroneClient/obj/Debug/net9.0-windows/DroneClient.designer.runtimeconfig.json +++ b/DroneClient/obj/Debug/net9.0-windows/DroneClient.designer.runtimeconfig.json @@ -12,8 +12,8 @@ } ], "additionalProbingPaths": [ - "C:\\Users\\Дана\\.dotnet\\store\\|arch|\\|tfm|", - "C:\\Users\\Дана\\.nuget\\packages", + "C:\\Users\\vladi\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\vladi\\.nuget\\packages", "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configProperties": { diff --git a/DroneClient/obj/Debug/net9.0-windows/DroneClient.dll b/DroneClient/obj/Debug/net9.0-windows/DroneClient.dll index 4737dbf..623ad1a 100644 Binary files a/DroneClient/obj/Debug/net9.0-windows/DroneClient.dll and b/DroneClient/obj/Debug/net9.0-windows/DroneClient.dll differ diff --git a/DroneClient/obj/Debug/net9.0-windows/DroneClient.genruntimeconfig.cache b/DroneClient/obj/Debug/net9.0-windows/DroneClient.genruntimeconfig.cache index 5b1f791..1f9495f 100644 --- a/DroneClient/obj/Debug/net9.0-windows/DroneClient.genruntimeconfig.cache +++ b/DroneClient/obj/Debug/net9.0-windows/DroneClient.genruntimeconfig.cache @@ -1 +1 @@ -812e26f7e032de5fb2d5301fec24f483552f39e0a38ac0c052cba2ffa3a73bbd +1169c8f1755fd284418bb0f5a0b8ea8019e8852e272598e42988c80424912c03 diff --git a/DroneClient/obj/Debug/net9.0-windows/DroneClient.pdb b/DroneClient/obj/Debug/net9.0-windows/DroneClient.pdb index fc70bf0..1388df9 100644 Binary files a/DroneClient/obj/Debug/net9.0-windows/DroneClient.pdb and b/DroneClient/obj/Debug/net9.0-windows/DroneClient.pdb differ diff --git a/DroneClient/obj/Debug/net9.0-windows/apphost.exe b/DroneClient/obj/Debug/net9.0-windows/apphost.exe index 92d0918..6d974a1 100644 Binary files a/DroneClient/obj/Debug/net9.0-windows/apphost.exe and b/DroneClient/obj/Debug/net9.0-windows/apphost.exe differ diff --git a/DroneClient/obj/Debug/net9.0-windows/ref/DroneClient.dll b/DroneClient/obj/Debug/net9.0-windows/ref/DroneClient.dll index 331abf7..6e58907 100644 Binary files a/DroneClient/obj/Debug/net9.0-windows/ref/DroneClient.dll and b/DroneClient/obj/Debug/net9.0-windows/ref/DroneClient.dll differ diff --git a/DroneClient/obj/Debug/net9.0-windows/refint/DroneClient.dll b/DroneClient/obj/Debug/net9.0-windows/refint/DroneClient.dll index 331abf7..6e58907 100644 Binary files a/DroneClient/obj/Debug/net9.0-windows/refint/DroneClient.dll and b/DroneClient/obj/Debug/net9.0-windows/refint/DroneClient.dll differ diff --git a/DroneClient/obj/DroneClient.csproj.nuget.dgspec.json b/DroneClient/obj/DroneClient.csproj.nuget.dgspec.json index 0f88e49..ae28aef 100644 --- a/DroneClient/obj/DroneClient.csproj.nuget.dgspec.json +++ b/DroneClient/obj/DroneClient.csproj.nuget.dgspec.json @@ -1,23 +1,23 @@ { "format": 1, "restore": { - "D:\\CPL\\Simulator\\DroneClient\\DroneClient\\DroneClient.csproj": {} + "C:\\Projects\\Simulator\\DroneClient\\DroneClient.csproj": {} }, "projects": { - "D:\\CPL\\Simulator\\DroneClient\\DroneClient\\DroneClient.csproj": { + "C:\\Projects\\Simulator\\DroneClient\\DroneClient.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\CPL\\Simulator\\DroneClient\\DroneClient\\DroneClient.csproj", + "projectUniqueName": "C:\\Projects\\Simulator\\DroneClient\\DroneClient.csproj", "projectName": "DroneClient", - "projectPath": "D:\\CPL\\Simulator\\DroneClient\\DroneClient\\DroneClient.csproj", - "packagesPath": "C:\\Users\\Дана\\.nuget\\packages\\", - "outputPath": "D:\\CPL\\Simulator\\DroneClient\\DroneClient\\obj\\", + "projectPath": "C:\\Projects\\Simulator\\DroneClient\\DroneClient.csproj", + "packagesPath": "C:\\Users\\vladi\\.nuget\\packages\\", + "outputPath": "C:\\Projects\\Simulator\\DroneClient\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Дана\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\vladi\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -44,7 +44,7 @@ "auditLevel": "low", "auditMode": "direct" }, - "SdkAnalysisLevel": "9.0.200" + "SdkAnalysisLevel": "9.0.100" }, "frameworks": { "net9.0-windows7.0": { @@ -68,7 +68,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.101/PortableRuntimeIdentifierGraph.json" } } } diff --git a/DroneClient/obj/DroneClient.csproj.nuget.g.props b/DroneClient/obj/DroneClient.csproj.nuget.g.props index 02c5408..d907a2b 100644 --- a/DroneClient/obj/DroneClient.csproj.nuget.g.props +++ b/DroneClient/obj/DroneClient.csproj.nuget.g.props @@ -5,12 +5,12 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Дана\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\vladi\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.13.2 + 6.12.2 - + \ No newline at end of file diff --git a/DroneClient/obj/project.assets.json b/DroneClient/obj/project.assets.json index bb8d343..39f8b16 100644 --- a/DroneClient/obj/project.assets.json +++ b/DroneClient/obj/project.assets.json @@ -8,23 +8,23 @@ "net9.0-windows7.0": [] }, "packageFolders": { - "C:\\Users\\Дана\\.nuget\\packages\\": {}, + "C:\\Users\\vladi\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\CPL\\Simulator\\DroneClient\\DroneClient\\DroneClient.csproj", + "projectUniqueName": "C:\\Projects\\Simulator\\DroneClient\\DroneClient.csproj", "projectName": "DroneClient", - "projectPath": "D:\\CPL\\Simulator\\DroneClient\\DroneClient\\DroneClient.csproj", - "packagesPath": "C:\\Users\\Дана\\.nuget\\packages\\", - "outputPath": "D:\\CPL\\Simulator\\DroneClient\\DroneClient\\obj\\", + "projectPath": "C:\\Projects\\Simulator\\DroneClient\\DroneClient.csproj", + "packagesPath": "C:\\Users\\vladi\\.nuget\\packages\\", + "outputPath": "C:\\Projects\\Simulator\\DroneClient\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Дана\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\vladi\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -51,7 +51,7 @@ "auditLevel": "low", "auditMode": "direct" }, - "SdkAnalysisLevel": "9.0.200" + "SdkAnalysisLevel": "9.0.100" }, "frameworks": { "net9.0-windows7.0": { @@ -75,7 +75,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.201/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.101/PortableRuntimeIdentifierGraph.json" } } } diff --git a/DroneClient/obj/project.nuget.cache b/DroneClient/obj/project.nuget.cache index c7efde6..b93dccc 100644 --- a/DroneClient/obj/project.nuget.cache +++ b/DroneClient/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "ddOSNwF62rQ=", + "dgSpecHash": "qI+XM2Lr+jE=", "success": true, - "projectFilePath": "D:\\CPL\\Simulator\\DroneClient\\DroneClient\\DroneClient.csproj", + "projectFilePath": "C:\\Projects\\Simulator\\DroneClient\\DroneClient.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/DroneClientCpp/DroneClientCpp.sln b/DroneClientCpp/DroneClientCpp.sln new file mode 100644 index 0000000..d6ab8bc --- /dev/null +++ b/DroneClientCpp/DroneClientCpp.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.12.35527.113 d17.12 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DroneClientCpp", "DroneClientCpp.vcxproj", "{690C304C-A70B-4B0F-BF61-8C51290BF444}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {690C304C-A70B-4B0F-BF61-8C51290BF444}.Debug|x64.ActiveCfg = Debug|x64 + {690C304C-A70B-4B0F-BF61-8C51290BF444}.Debug|x64.Build.0 = Debug|x64 + {690C304C-A70B-4B0F-BF61-8C51290BF444}.Debug|x86.ActiveCfg = Debug|Win32 + {690C304C-A70B-4B0F-BF61-8C51290BF444}.Debug|x86.Build.0 = Debug|Win32 + {690C304C-A70B-4B0F-BF61-8C51290BF444}.Release|x64.ActiveCfg = Release|x64 + {690C304C-A70B-4B0F-BF61-8C51290BF444}.Release|x64.Build.0 = Release|x64 + {690C304C-A70B-4B0F-BF61-8C51290BF444}.Release|x86.ActiveCfg = Release|Win32 + {690C304C-A70B-4B0F-BF61-8C51290BF444}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/DroneClientCpp/DroneClientCpp.vcxproj b/DroneClientCpp/DroneClientCpp.vcxproj new file mode 100644 index 0000000..46349e2 --- /dev/null +++ b/DroneClientCpp/DroneClientCpp.vcxproj @@ -0,0 +1,136 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 17.0 + {690C304C-A70B-4B0F-BF61-8C51290BF444} + v4.7.2 + ManagedCProj + DroneClientCpp + 10.0 + + + + Application + true + v143 + true + Unicode + + + Application + false + v143 + true + Unicode + + + Application + true + v143 + true + Unicode + + + Application + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + Level3 + _DEBUG;%(PreprocessorDefinitions) + + + + + + + + Level3 + WIN32;_DEBUG;%(PreprocessorDefinitions) + + + + + + + + Level3 + WIN32;NDEBUG;%(PreprocessorDefinitions) + + + + + + + + Level3 + NDEBUG;%(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + CppForm + + + + + FormMain.h + + + + + + \ No newline at end of file diff --git a/DroneClientCpp/DroneClientCpp.vcxproj.filters b/DroneClientCpp/DroneClientCpp.vcxproj.filters new file mode 100644 index 0000000..5ad5172 --- /dev/null +++ b/DroneClientCpp/DroneClientCpp.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Исходные файлы + + + + + Файлы заголовков + + + \ No newline at end of file diff --git a/DroneClientCpp/FormMain.cpp b/DroneClientCpp/FormMain.cpp new file mode 100644 index 0000000..dfbdfbc --- /dev/null +++ b/DroneClientCpp/FormMain.cpp @@ -0,0 +1,12 @@ +#include "FormMain.h" + +#include + +using namespace DroneClientCpp; + +int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) { + Application::EnableVisualStyles(); + Application::SetCompatibleTextRenderingDefault(false); + Application::Run(gcnew FormMain); + return 0; +} \ No newline at end of file diff --git a/DroneClientCpp/FormMain.h b/DroneClientCpp/FormMain.h new file mode 100644 index 0000000..0729ff1 Binary files /dev/null and b/DroneClientCpp/FormMain.h differ diff --git a/DroneClientCpp/FormMain.resx b/DroneClientCpp/FormMain.resx new file mode 100644 index 0000000..59099f2 --- /dev/null +++ b/DroneClientCpp/FormMain.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/DroneClientCpp/MyForm.cpp b/DroneClientCpp/MyForm.cpp new file mode 100644 index 0000000..7c411c2 --- /dev/null +++ b/DroneClientCpp/MyForm.cpp @@ -0,0 +1,12 @@ +#include "MyForm.h" + +#include + +using namespace DroneClientCpp; + +int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) { + Application::EnableVisualStyles(); + Application::SetCompatibleTextRenderingDefault(false); + Application::Run(gcnew MyForm); + return 0; +} \ No newline at end of file diff --git a/DroneClientCpp/MyForm.h b/DroneClientCpp/MyForm.h new file mode 100644 index 0000000..bdc5a39 Binary files /dev/null and b/DroneClientCpp/MyForm.h differ diff --git a/DroneClientCpp/MyForm.resx b/DroneClientCpp/MyForm.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DroneClientCpp/MyForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/DroneClientCpp/Source.cpp b/DroneClientCpp/Source.cpp new file mode 100644 index 0000000..6c8d9fb --- /dev/null +++ b/DroneClientCpp/Source.cpp @@ -0,0 +1,11 @@ +#include "MyForm.h" + +using namespace MyWinFormsApp; // ???????????? ???? ?????? ??????? + +[STAThread] +int main(array^ args) { + Application::EnableVisualStyles(); // ???????? ??????????? ????? ????????? ?????????? + Application::SetCompatibleTextRenderingDefault(false); // ????????? ?????????? ?????? + Application::Run(gcnew MyForm()); // ?????? ????? + return 0; +} \ No newline at end of file