diff --git a/tracking and telemetry/Client/.vs/Client/v16/.suo b/tracking and telemetry/Client/.vs/Client/v16/.suo index 21d7021..24ee4b7 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-shm b/tracking and telemetry/Client/.vs/Client/v16/Server/sqlite3/storage.ide-shm new file mode 100644 index 0000000..d56a717 Binary files /dev/null and b/tracking and telemetry/Client/.vs/Client/v16/Server/sqlite3/storage.ide-shm differ diff --git a/tracking and telemetry/Client/.vs/Client/v16/Server/sqlite3/storage.ide-wal b/tracking and telemetry/Client/.vs/Client/v16/Server/sqlite3/storage.ide-wal new file mode 100644 index 0000000..fe6a03d Binary files /dev/null and b/tracking and telemetry/Client/.vs/Client/v16/Server/sqlite3/storage.ide-wal differ diff --git a/tracking and telemetry/Client/Client.cs b/tracking and telemetry/Client/Client.cs index 816d3df..e149370 100644 --- a/tracking and telemetry/Client/Client.cs +++ b/tracking and telemetry/Client/Client.cs @@ -64,20 +64,6 @@ namespace Client .GetCustomAttribute(); } - public string FriutTypeDescription(Enum FruitType) - { - FieldInfo fi = FruitType.GetType().GetField(FruitType.ToString()); - DescriptionAttribute[] attributes = (DescriptionAttribute[])fi.GetCustomAttributes(typeof(DescriptionAttribute), false); - if (attributes.Length > 0) - { - return attributes[0].Description; - } - else - { - return FruitType.ToString(); - } - } - void bgw_DoWork(object sender, DoWorkEventArgs e) { while (serialPort1.IsOpen) @@ -143,12 +129,11 @@ namespace Client if (packet.msgid == (byte)MAVLink.MAVLINK_MSG_ID.HEARTBEAT){ var heartbeat = (MAVLink.mavlink_heartbeat_t)packet.data; - var heartbeat_string = "Vehicle type: " + "" + - "\n Autopilot: " + FriutTypeDescription((MAVLink.MAV_AUTOPILOT)heartbeat.autopilot) + - "\n Base mode: " + heartbeat.base_mode + - "\n Custom mode: " + heartbeat.custom_mode + + var heartbeat_string = "Vehicle type: " + (MAVLink.MAV_TYPE)heartbeat.autopilot + + "\n Autopilot: " + (MAVLink.MAV_AUTOPILOT)heartbeat.autopilot + + "\n Base mode: " + (MAVLink.MAV_MODE_FLAG)heartbeat.base_mode + "\n Mavlink Version: " + heartbeat.mavlink_version + - "\n System status: " + heartbeat.system_status; + "\n System status: " + (MAVLink.MAV_SYS_STATUS_SENSOR)heartbeat.system_status; richTextBox1.Invoke(new Action(() => { richTextBox1.Text = heartbeat_string; diff --git a/tracking and telemetry/Client/obj/Debug/Client.csprojAssemblyReference.cache b/tracking and telemetry/Client/obj/Debug/Client.csprojAssemblyReference.cache index a82d70f..2a912d2 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/TempPE/Properties.Resources.Designer.cs.dll b/tracking and telemetry/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index 1d0e209..5ac7a6a 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/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 b900e96..5552ec0 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/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 547b3a9..482c9ce 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/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/MAVLink.csproj.nuget.cache b/tracking and telemetry/Mavlink/obj/MAVLink.csproj.nuget.cache index 59c3019..4aacbdd 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": "/1AerUNn95KVWx/sgb/Vdff+93ngStdRcPbkPEeF37jHks+abLCiOaLcm44+CqJC2nYFWYLoTdsOeQ45Zcpq1A==", "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..d9d0990 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": [ 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..1b9f173 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": [