diff --git a/tracking and telemetry/Client/.vs/Client/DesignTimeBuild/.dtbcache b/tracking and telemetry/Client/.vs/Client/DesignTimeBuild/.dtbcache index 7d46607..fb4e420 100644 Binary files a/tracking and telemetry/Client/.vs/Client/DesignTimeBuild/.dtbcache and b/tracking and telemetry/Client/.vs/Client/DesignTimeBuild/.dtbcache differ diff --git a/tracking and telemetry/Client/.vs/Client/v16/.suo b/tracking and telemetry/Client/.vs/Client/v16/.suo index 97bb1f2..acd799a 100644 Binary files a/tracking and telemetry/Client/.vs/Client/v16/.suo and b/tracking and telemetry/Client/.vs/Client/v16/.suo differ diff --git a/tracking and telemetry/Client/.vs/Client/v16/Server/sqlite3/storage.ide b/tracking and telemetry/Client/.vs/Client/v16/Server/sqlite3/storage.ide index 0e570e8..65ffac5 100644 Binary files a/tracking and telemetry/Client/.vs/Client/v16/Server/sqlite3/storage.ide and b/tracking and telemetry/Client/.vs/Client/v16/Server/sqlite3/storage.ide differ diff --git a/tracking and telemetry/Client/Client.Designer.cs b/tracking and telemetry/Client/Client.Designer.cs index c0e0296..866efa8 100644 --- a/tracking and telemetry/Client/Client.Designer.cs +++ b/tracking and telemetry/Client/Client.Designer.cs @@ -47,6 +47,7 @@ this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); this.label5 = new System.Windows.Forms.Label(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -54,18 +55,18 @@ // this.CMB_comport.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.CMB_comport.FormattingEnabled = true; - this.CMB_comport.Location = new System.Drawing.Point(13, 13); + this.CMB_comport.Location = new System.Drawing.Point(6, 13); this.CMB_comport.Name = "CMB_comport"; - this.CMB_comport.Size = new System.Drawing.Size(167, 26); + this.CMB_comport.Size = new System.Drawing.Size(124, 26); this.CMB_comport.TabIndex = 0; this.CMB_comport.Click += new System.EventHandler(this.CMB_comport_Click); // // but_connect // this.but_connect.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.but_connect.Location = new System.Drawing.Point(186, 13); + this.but_connect.Location = new System.Drawing.Point(136, 13); this.but_connect.Name = "but_connect"; - this.but_connect.Size = new System.Drawing.Size(103, 27); + this.but_connect.Size = new System.Drawing.Size(103, 59); this.but_connect.TabIndex = 2; this.but_connect.Text = "Connect"; this.but_connect.UseVisualStyleBackColor = true; @@ -76,9 +77,9 @@ this.listBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.listBox1.FormattingEnabled = true; this.listBox1.ItemHeight = 16; - this.listBox1.Location = new System.Drawing.Point(6, 48); + this.listBox1.Location = new System.Drawing.Point(6, 83); this.listBox1.Name = "listBox1"; - this.listBox1.Size = new System.Drawing.Size(199, 196); + this.listBox1.Size = new System.Drawing.Size(195, 180); this.listBox1.TabIndex = 3; // // mav_messages_Label @@ -86,7 +87,7 @@ this.mav_messages_Label.AutoSize = true; this.mav_messages_Label.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.mav_messages_Label.ForeColor = System.Drawing.Color.Red; - this.mav_messages_Label.Location = new System.Drawing.Point(-6, 265); + this.mav_messages_Label.Location = new System.Drawing.Point(1, 266); this.mav_messages_Label.Name = "mav_messages_Label"; this.mav_messages_Label.Size = new System.Drawing.Size(212, 25); this.mav_messages_Label.TabIndex = 6; @@ -217,26 +218,42 @@ // // progressBar1 // - this.progressBar1.Location = new System.Drawing.Point(518, 207); + this.progressBar1.Location = new System.Drawing.Point(471, 213); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(334, 37); + this.progressBar1.Size = new System.Drawing.Size(374, 31); this.progressBar1.TabIndex = 18; // // label5 // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(395, 207); + this.label5.Location = new System.Drawing.Point(348, 213); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(117, 31); this.label5.TabIndex = 19; this.label5.Text = "Battery:"; // + // comboBox1 + // + this.comboBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Items.AddRange(new object[] { + "9600", + "19200", + "38400", + "57600", + "115200"}); + this.comboBox1.Location = new System.Drawing.Point(6, 46); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(124, 26); + this.comboBox1.TabIndex = 20; + // // client // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1924, 545); + this.Controls.Add(this.comboBox1); this.Controls.Add(this.label5); this.Controls.Add(this.progressBar1); this.Controls.Add(this.button1); @@ -256,7 +273,7 @@ this.Controls.Add(this.CMB_comport); this.ForeColor = System.Drawing.SystemColors.ControlText; this.Name = "client"; - this.Text = "Form1"; + this.Text = "Tracking and Telemetry Client"; this.TransparencyKey = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.Load += new System.EventHandler(this.client_Load); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); @@ -285,6 +302,7 @@ private System.Windows.Forms.Button button1; private System.Windows.Forms.ProgressBar progressBar1; private System.Windows.Forms.Label label5; + private System.Windows.Forms.ComboBox comboBox1; } } diff --git a/tracking and telemetry/Client/Client.cs b/tracking and telemetry/Client/Client.cs index 221e2cc..d724bb1 100644 --- a/tracking and telemetry/Client/Client.cs +++ b/tracking and telemetry/Client/Client.cs @@ -50,29 +50,38 @@ namespace Client private void but_connect_Click(object sender, EventArgs e) { - // if the port is open close it - if (serialPort1.IsOpen) - { - serialPort1.Close(); - marker.IsVisible = false; - return; - } + try + { + // if the port is open close it + if (serialPort1.IsOpen) + { + serialPort1.Close(); + marker.IsVisible = false; + return; + } - // set the comport options - serialPort1.PortName = CMB_comport.Text; - serialPort1.BaudRate = 115200; + // set the comport options + serialPort1.PortName = CMB_comport.Text; + serialPort1.BaudRate = 115200; - // open the comport - serialPort1.Open(); + // open the comport + serialPort1.Open(); - // set timeout to 2 seconds - serialPort1.ReadTimeout = 2000; + // set timeout to 2 seconds + serialPort1.ReadTimeout = 2000; - BackgroundWorker bgw = new BackgroundWorker(); + BackgroundWorker bgw = new BackgroundWorker(); - bgw.DoWork += bgw_DoWork; + bgw.DoWork += bgw_DoWork; - bgw.RunWorkerAsync(); + bgw.RunWorkerAsync(); + } + catch (Exception ex) + { + Console.WriteLine("------------------------------------------------------------"); + Console.WriteLine(ex.ToString()); + Console.WriteLine("------------------------------------------------------------"); + } } public static DisplayAttribute GetDisplayAttributesFrom(Enum enumValue, Type enumType) @@ -208,7 +217,9 @@ namespace Client } catch (Exception ex) { - MessageBox.Show(ex.ToString()); + Console.WriteLine("--------------------------------------"); + Console.WriteLine(ex.ToString()); + Console.WriteLine("--------------------------------------"); } System.Threading.Thread.Sleep(1); @@ -260,7 +271,15 @@ namespace Client } private void button1_Click(object sender, EventArgs e){ - Process.Start(@"C:\Users\Giorgos Ger\Desktop\Talos_Drones_Tracking_and_Telemetry\camera module\viewer\viewer.exe"); + try { + string viewer_path = System.IO.Path.GetFullPath(System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"..\..\..\..\camera module\viewer\viewer.exe")); + Process.Start(viewer_path); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + } + } - } + } } \ No newline at end of file diff --git a/tracking and telemetry/Client/bin/Debug/Client.exe b/tracking and telemetry/Client/bin/Debug/Client.exe index 05d48d1..58ffdcc 100644 Binary files a/tracking and telemetry/Client/bin/Debug/Client.exe and b/tracking and telemetry/Client/bin/Debug/Client.exe differ diff --git a/tracking and telemetry/Client/bin/Debug/Client.pdb b/tracking and telemetry/Client/bin/Debug/Client.pdb index ed2777b..22ffce5 100644 Binary files a/tracking and telemetry/Client/bin/Debug/Client.pdb and b/tracking and telemetry/Client/bin/Debug/Client.pdb differ diff --git a/tracking and telemetry/Client/bin/Debug/MAVLink.dll b/tracking and telemetry/Client/bin/Debug/MAVLink.dll index 693c9aa..bf6d23b 100644 Binary files a/tracking and telemetry/Client/bin/Debug/MAVLink.dll and b/tracking and telemetry/Client/bin/Debug/MAVLink.dll differ diff --git a/tracking and telemetry/Client/bin/Debug/MAVLink.pdb b/tracking and telemetry/Client/bin/Debug/MAVLink.pdb index 0313a41..a41661b 100644 Binary files a/tracking and telemetry/Client/bin/Debug/MAVLink.pdb and b/tracking and telemetry/Client/bin/Debug/MAVLink.pdb differ diff --git a/tracking and telemetry/Client/bin/Debug/viewer.py b/tracking and telemetry/Client/bin/Debug/viewer.py deleted file mode 100644 index 5db5ca3..0000000 --- a/tracking and telemetry/Client/bin/Debug/viewer.py +++ /dev/null @@ -1,22 +0,0 @@ -import cv2 -import zmq -import base64 -import numpy as np - -context = zmq.Context() -footage_socket = context.socket(zmq.SUB) -footage_socket.bind('tcp://*:5555') -footage_socket.setsockopt_string(zmq.SUBSCRIBE, np.unicode('')) - -while True: - try: - frame = footage_socket.recv_string() - img = base64.b64decode(frame) - npimg = np.fromstring(img, dtype=np.uint8) - source = cv2.imdecode(npimg, 1) - cv2.imshow("Stream", source) - cv2.waitKey(1) - - except KeyboardInterrupt: - cv2.destroyAllWindows() - break \ No newline at end of file diff --git a/tracking and telemetry/Client/obj/Debug/Client.csproj.GenerateResource.cache b/tracking and telemetry/Client/obj/Debug/Client.csproj.GenerateResource.cache index 9422bff..980621b 100644 Binary files a/tracking and telemetry/Client/obj/Debug/Client.csproj.GenerateResource.cache and b/tracking and telemetry/Client/obj/Debug/Client.csproj.GenerateResource.cache differ diff --git a/tracking and telemetry/Client/obj/Debug/Client.csprojAssemblyReference.cache b/tracking and telemetry/Client/obj/Debug/Client.csprojAssemblyReference.cache index 98d97a7..9824197 100644 Binary files a/tracking and telemetry/Client/obj/Debug/Client.csprojAssemblyReference.cache and b/tracking and telemetry/Client/obj/Debug/Client.csprojAssemblyReference.cache differ diff --git a/tracking and telemetry/Client/obj/Debug/Client.exe b/tracking and telemetry/Client/obj/Debug/Client.exe index 05d48d1..58ffdcc 100644 Binary files a/tracking and telemetry/Client/obj/Debug/Client.exe and b/tracking and telemetry/Client/obj/Debug/Client.exe differ diff --git a/tracking and telemetry/Client/obj/Debug/Client.pdb b/tracking and telemetry/Client/obj/Debug/Client.pdb index ed2777b..22ffce5 100644 Binary files a/tracking and telemetry/Client/obj/Debug/Client.pdb and b/tracking and telemetry/Client/obj/Debug/Client.pdb differ diff --git a/tracking and telemetry/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/tracking and telemetry/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index bdf03de..857073d 100644 Binary files a/tracking and telemetry/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/tracking and telemetry/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/tracking and telemetry/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/tracking and telemetry/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index be30a54..6fd43aa 100644 Binary files a/tracking and telemetry/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/tracking and telemetry/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/tracking and telemetry/Mavlink/bin/Debug/MAVLink.1.0.5.nupkg b/tracking and telemetry/Mavlink/bin/Debug/MAVLink.1.0.5.nupkg index 7515fb1..b5beab6 100644 Binary files a/tracking and telemetry/Mavlink/bin/Debug/MAVLink.1.0.5.nupkg and b/tracking and telemetry/Mavlink/bin/Debug/MAVLink.1.0.5.nupkg differ diff --git a/tracking and telemetry/Mavlink/bin/Debug/net35/MAVLink.dll b/tracking and telemetry/Mavlink/bin/Debug/net35/MAVLink.dll index 202346a..7fd8d86 100644 Binary files a/tracking and telemetry/Mavlink/bin/Debug/net35/MAVLink.dll and b/tracking and telemetry/Mavlink/bin/Debug/net35/MAVLink.dll differ diff --git a/tracking and telemetry/Mavlink/bin/Debug/net35/MAVLink.pdb b/tracking and telemetry/Mavlink/bin/Debug/net35/MAVLink.pdb index 1d9db97..2e2beb2 100644 Binary files a/tracking and telemetry/Mavlink/bin/Debug/net35/MAVLink.pdb and b/tracking and telemetry/Mavlink/bin/Debug/net35/MAVLink.pdb differ diff --git a/tracking and telemetry/Mavlink/bin/Debug/net461/MAVLink.dll b/tracking and telemetry/Mavlink/bin/Debug/net461/MAVLink.dll index 693c9aa..bf6d23b 100644 Binary files a/tracking and telemetry/Mavlink/bin/Debug/net461/MAVLink.dll and b/tracking and telemetry/Mavlink/bin/Debug/net461/MAVLink.dll differ diff --git a/tracking and telemetry/Mavlink/bin/Debug/net461/MAVLink.pdb b/tracking and telemetry/Mavlink/bin/Debug/net461/MAVLink.pdb index 0313a41..a41661b 100644 Binary files a/tracking and telemetry/Mavlink/bin/Debug/net461/MAVLink.pdb and b/tracking and telemetry/Mavlink/bin/Debug/net461/MAVLink.pdb differ diff --git a/tracking and telemetry/Mavlink/bin/Debug/netstandard2.0/MAVLink.dll b/tracking and telemetry/Mavlink/bin/Debug/netstandard2.0/MAVLink.dll index 6738f6f..667ac08 100644 Binary files a/tracking and telemetry/Mavlink/bin/Debug/netstandard2.0/MAVLink.dll and b/tracking and telemetry/Mavlink/bin/Debug/netstandard2.0/MAVLink.dll differ diff --git a/tracking and telemetry/Mavlink/bin/Debug/netstandard2.0/MAVLink.pdb b/tracking and telemetry/Mavlink/bin/Debug/netstandard2.0/MAVLink.pdb index 29aa412..40aedf5 100644 Binary files a/tracking and telemetry/Mavlink/bin/Debug/netstandard2.0/MAVLink.pdb and b/tracking and telemetry/Mavlink/bin/Debug/netstandard2.0/MAVLink.pdb differ diff --git a/tracking and telemetry/Mavlink/obj/Debug/MAVLink.1.0.5.nuspec b/tracking and telemetry/Mavlink/obj/Debug/MAVLink.1.0.5.nuspec index 4a22c0f..01e3d8e 100644 --- a/tracking and telemetry/Mavlink/obj/Debug/MAVLink.1.0.5.nuspec +++ b/tracking and telemetry/Mavlink/obj/Debug/MAVLink.1.0.5.nuspec @@ -16,8 +16,8 @@ - - - + + + \ No newline at end of file diff --git a/tracking and telemetry/Mavlink/obj/Debug/net35/MAVLink.assets.cache b/tracking and telemetry/Mavlink/obj/Debug/net35/MAVLink.assets.cache index 2dbcb4b..732d437 100644 Binary files a/tracking and telemetry/Mavlink/obj/Debug/net35/MAVLink.assets.cache and b/tracking and telemetry/Mavlink/obj/Debug/net35/MAVLink.assets.cache differ diff --git a/tracking and telemetry/Mavlink/obj/Debug/net35/MAVLink.csprojAssemblyReference.cache b/tracking and telemetry/Mavlink/obj/Debug/net35/MAVLink.csprojAssemblyReference.cache index 697a78a..06183c6 100644 Binary files a/tracking and telemetry/Mavlink/obj/Debug/net35/MAVLink.csprojAssemblyReference.cache and b/tracking and telemetry/Mavlink/obj/Debug/net35/MAVLink.csprojAssemblyReference.cache differ diff --git a/tracking and telemetry/Mavlink/obj/Debug/net35/MAVLink.dll b/tracking and telemetry/Mavlink/obj/Debug/net35/MAVLink.dll index 202346a..7fd8d86 100644 Binary files a/tracking and telemetry/Mavlink/obj/Debug/net35/MAVLink.dll and b/tracking and telemetry/Mavlink/obj/Debug/net35/MAVLink.dll differ diff --git a/tracking and telemetry/Mavlink/obj/Debug/net35/MAVLink.pdb b/tracking and telemetry/Mavlink/obj/Debug/net35/MAVLink.pdb index 1d9db97..2e2beb2 100644 Binary files a/tracking and telemetry/Mavlink/obj/Debug/net35/MAVLink.pdb and b/tracking and telemetry/Mavlink/obj/Debug/net35/MAVLink.pdb differ diff --git a/tracking and telemetry/Mavlink/obj/Debug/net461/MAVLink.assets.cache b/tracking and telemetry/Mavlink/obj/Debug/net461/MAVLink.assets.cache index 16c9809..dba1e46 100644 Binary files a/tracking and telemetry/Mavlink/obj/Debug/net461/MAVLink.assets.cache and b/tracking and telemetry/Mavlink/obj/Debug/net461/MAVLink.assets.cache differ diff --git a/tracking and telemetry/Mavlink/obj/Debug/net461/MAVLink.csprojAssemblyReference.cache b/tracking and telemetry/Mavlink/obj/Debug/net461/MAVLink.csprojAssemblyReference.cache index e8a2507..32373f7 100644 Binary files a/tracking and telemetry/Mavlink/obj/Debug/net461/MAVLink.csprojAssemblyReference.cache and b/tracking and telemetry/Mavlink/obj/Debug/net461/MAVLink.csprojAssemblyReference.cache differ diff --git a/tracking and telemetry/Mavlink/obj/Debug/net461/MAVLink.dll b/tracking and telemetry/Mavlink/obj/Debug/net461/MAVLink.dll index 693c9aa..bf6d23b 100644 Binary files a/tracking and telemetry/Mavlink/obj/Debug/net461/MAVLink.dll and b/tracking and telemetry/Mavlink/obj/Debug/net461/MAVLink.dll differ diff --git a/tracking and telemetry/Mavlink/obj/Debug/net461/MAVLink.pdb b/tracking and telemetry/Mavlink/obj/Debug/net461/MAVLink.pdb index 0313a41..a41661b 100644 Binary files a/tracking and telemetry/Mavlink/obj/Debug/net461/MAVLink.pdb and b/tracking and telemetry/Mavlink/obj/Debug/net461/MAVLink.pdb differ diff --git a/tracking and telemetry/Mavlink/obj/Debug/netstandard2.0/MAVLink.assets.cache b/tracking and telemetry/Mavlink/obj/Debug/netstandard2.0/MAVLink.assets.cache index b9493fd..6d94c68 100644 Binary files a/tracking and telemetry/Mavlink/obj/Debug/netstandard2.0/MAVLink.assets.cache and b/tracking and telemetry/Mavlink/obj/Debug/netstandard2.0/MAVLink.assets.cache differ diff --git a/tracking and telemetry/Mavlink/obj/Debug/netstandard2.0/MAVLink.csprojAssemblyReference.cache b/tracking and telemetry/Mavlink/obj/Debug/netstandard2.0/MAVLink.csprojAssemblyReference.cache index 59d570a..6126a9d 100644 Binary files a/tracking and telemetry/Mavlink/obj/Debug/netstandard2.0/MAVLink.csprojAssemblyReference.cache and b/tracking and telemetry/Mavlink/obj/Debug/netstandard2.0/MAVLink.csprojAssemblyReference.cache differ diff --git a/tracking and telemetry/Mavlink/obj/Debug/netstandard2.0/MAVLink.dll b/tracking and telemetry/Mavlink/obj/Debug/netstandard2.0/MAVLink.dll index 6738f6f..667ac08 100644 Binary files a/tracking and telemetry/Mavlink/obj/Debug/netstandard2.0/MAVLink.dll and b/tracking and telemetry/Mavlink/obj/Debug/netstandard2.0/MAVLink.dll differ diff --git a/tracking and telemetry/Mavlink/obj/Debug/netstandard2.0/MAVLink.pdb b/tracking and telemetry/Mavlink/obj/Debug/netstandard2.0/MAVLink.pdb index 29aa412..40aedf5 100644 Binary files a/tracking and telemetry/Mavlink/obj/Debug/netstandard2.0/MAVLink.pdb and b/tracking and telemetry/Mavlink/obj/Debug/netstandard2.0/MAVLink.pdb differ diff --git a/tracking and telemetry/Mavlink/obj/MAVLink.csproj.nuget.cache b/tracking and telemetry/Mavlink/obj/MAVLink.csproj.nuget.cache index 59c3019..75c7193 100644 --- a/tracking and telemetry/Mavlink/obj/MAVLink.csproj.nuget.cache +++ b/tracking and telemetry/Mavlink/obj/MAVLink.csproj.nuget.cache @@ -1,5 +1,5 @@ { "version": 1, - "dgSpecHash": "BMGtCCk4FceRPZQ8UoY4BK0IG5v3lF+DQNRO7D8QeSza51b62rEvJioVn3CMuEhqg306+1i2Bgfp7PzRxm1UJg==", + "dgSpecHash": "Ag7lXZtqstH3xklYuTDl+YMeB0rg7JeJHg+s0sz+OCF4AU2HDCYiTkOcOpzkQQOf7ny4zGjQXB0BwUALr06mnQ==", "success": true } \ No newline at end of file diff --git a/tracking and telemetry/Mavlink/obj/MAVLink.csproj.nuget.dgspec.json b/tracking and telemetry/Mavlink/obj/MAVLink.csproj.nuget.dgspec.json index 4782eb7..45b288a 100644 --- a/tracking and telemetry/Mavlink/obj/MAVLink.csproj.nuget.dgspec.json +++ b/tracking and telemetry/Mavlink/obj/MAVLink.csproj.nuget.dgspec.json @@ -1,21 +1,24 @@ { "format": 1, "restore": { - "C:\\Users\\GeorgiosGerontakis\\Desktop\\Talos_Drones_Tracking_and_Telemetry\\tracking and telemetry\\Mavlink\\MAVLink.csproj": {} + "C:\\Users\\Giorgos Ger\\Desktop\\Talos_Drones_Tracking_and_Telemetry\\tracking and telemetry\\Mavlink\\MAVLink.csproj": {} }, "projects": { - "C:\\Users\\GeorgiosGerontakis\\Desktop\\Talos_Drones_Tracking_and_Telemetry\\tracking and telemetry\\Mavlink\\MAVLink.csproj": { + "C:\\Users\\Giorgos Ger\\Desktop\\Talos_Drones_Tracking_and_Telemetry\\tracking and telemetry\\Mavlink\\MAVLink.csproj": { "version": "1.0.5", "restore": { - "projectUniqueName": "C:\\Users\\GeorgiosGerontakis\\Desktop\\Talos_Drones_Tracking_and_Telemetry\\tracking and telemetry\\Mavlink\\MAVLink.csproj", + "projectUniqueName": "C:\\Users\\Giorgos Ger\\Desktop\\Talos_Drones_Tracking_and_Telemetry\\tracking and telemetry\\Mavlink\\MAVLink.csproj", "projectName": "MAVLink", - "projectPath": "C:\\Users\\GeorgiosGerontakis\\Desktop\\Talos_Drones_Tracking_and_Telemetry\\tracking and telemetry\\Mavlink\\MAVLink.csproj", - "packagesPath": "C:\\Users\\GeorgiosGerontakis\\.nuget\\packages\\", - "outputPath": "C:\\Users\\GeorgiosGerontakis\\Desktop\\Talos_Drones_Tracking_and_Telemetry\\tracking and telemetry\\Mavlink\\obj\\", + "projectPath": "C:\\Users\\Giorgos Ger\\Desktop\\Talos_Drones_Tracking_and_Telemetry\\tracking and telemetry\\Mavlink\\MAVLink.csproj", + "packagesPath": "C:\\Users\\Giorgos Ger\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Giorgos Ger\\Desktop\\Talos_Drones_Tracking_and_Telemetry\\tracking and telemetry\\Mavlink\\obj\\", "projectStyle": "PackageReference", "crossTargeting": true, + "fallbackFolders": [ + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\GeorgiosGerontakis\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Giorgos Ger\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -46,10 +49,10 @@ }, "frameworks": { "net35": { - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.101\\RuntimeIdentifierGraph.json" }, "net461": { - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.101\\RuntimeIdentifierGraph.json" }, "netstandard2.0": { "dependencies": { @@ -70,7 +73,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.101\\RuntimeIdentifierGraph.json" } } } diff --git a/tracking and telemetry/Mavlink/obj/MAVLink.csproj.nuget.g.props b/tracking and telemetry/Mavlink/obj/MAVLink.csproj.nuget.g.props index e93d137..56d9c7f 100644 --- a/tracking and telemetry/Mavlink/obj/MAVLink.csproj.nuget.g.props +++ b/tracking and telemetry/Mavlink/obj/MAVLink.csproj.nuget.g.props @@ -5,7 +5,7 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\GeorgiosGerontakis\.nuget\packages\ + C:\Users\Giorgos Ger\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference 5.4.0 diff --git a/tracking and telemetry/Mavlink/obj/MAVLink.csproj.nuget.g.targets b/tracking and telemetry/Mavlink/obj/MAVLink.csproj.nuget.g.targets index 010350b..a5824de 100644 --- a/tracking and telemetry/Mavlink/obj/MAVLink.csproj.nuget.g.targets +++ b/tracking and telemetry/Mavlink/obj/MAVLink.csproj.nuget.g.targets @@ -4,6 +4,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/tracking and telemetry/Mavlink/obj/project.assets.json b/tracking and telemetry/Mavlink/obj/project.assets.json index e998e48..6a86d1e 100644 --- a/tracking and telemetry/Mavlink/obj/project.assets.json +++ b/tracking and telemetry/Mavlink/obj/project.assets.json @@ -183,20 +183,24 @@ ] }, "packageFolders": { - "C:\\Users\\GeorgiosGerontakis\\.nuget\\packages\\": {} + "C:\\Users\\Giorgos Ger\\.nuget\\packages\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.5", "restore": { - "projectUniqueName": "C:\\Users\\GeorgiosGerontakis\\Desktop\\Talos_Drones_Tracking_and_Telemetry\\tracking and telemetry\\Mavlink\\MAVLink.csproj", + "projectUniqueName": "C:\\Users\\Giorgos Ger\\Desktop\\Talos_Drones_Tracking_and_Telemetry\\tracking and telemetry\\Mavlink\\MAVLink.csproj", "projectName": "MAVLink", - "projectPath": "C:\\Users\\GeorgiosGerontakis\\Desktop\\Talos_Drones_Tracking_and_Telemetry\\tracking and telemetry\\Mavlink\\MAVLink.csproj", - "packagesPath": "C:\\Users\\GeorgiosGerontakis\\.nuget\\packages\\", - "outputPath": "C:\\Users\\GeorgiosGerontakis\\Desktop\\Talos_Drones_Tracking_and_Telemetry\\tracking and telemetry\\Mavlink\\obj\\", + "projectPath": "C:\\Users\\Giorgos Ger\\Desktop\\Talos_Drones_Tracking_and_Telemetry\\tracking and telemetry\\Mavlink\\MAVLink.csproj", + "packagesPath": "C:\\Users\\Giorgos Ger\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Giorgos Ger\\Desktop\\Talos_Drones_Tracking_and_Telemetry\\tracking and telemetry\\Mavlink\\obj\\", "projectStyle": "PackageReference", "crossTargeting": true, + "fallbackFolders": [ + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "C:\\Users\\GeorgiosGerontakis\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Giorgos Ger\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ @@ -227,10 +231,10 @@ }, "frameworks": { "net35": { - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.101\\RuntimeIdentifierGraph.json" }, "net461": { - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.101\\RuntimeIdentifierGraph.json" }, "netstandard2.0": { "dependencies": { @@ -251,7 +255,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.101\\RuntimeIdentifierGraph.json" } } }