Skip to content

Commit 0925602

Browse files
ScavangerScavanger
committed
- Relflight 9.5 compatibility
- Readme changes - Small adjustments
1 parent b29f09e commit 0925602

File tree

10 files changed

+472
-9
lines changed

10 files changed

+472
-9
lines changed

‎INAV-SIM-OSD.csproj‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,20 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net6.0-windows</TargetFramework>
5+
<TargetFramework>net7.0-windows</TargetFramework>
66
<RootNamespace>INAV_SIM_OSD</RootNamespace>
77
<Nullable>enable</Nullable>
88
<UseWindowsForms>true</UseWindowsForms>
99
<ImplicitUsings>enable</ImplicitUsings>
1010
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
1111
<Title>I</Title>
12+
<ApplicationIcon>Resources\inav-icon-osd.ico</ApplicationIcon>
1213
</PropertyGroup>
1314

15+
<ItemGroup>
16+
<Content Include="Resources\inav-icon-osd.ico" />
17+
</ItemGroup>
18+
1419
<ItemGroup>
1520
<PackageReference Include="System.IO.Ports" Version="7.0.0" />
1621
</ItemGroup>
@@ -31,6 +36,11 @@
3136
</ItemGroup>
3237

3338
<ItemGroup>
39+
<Compile Update="Properties\Resources.Designer.cs">
40+
<DesignTime>True</DesignTime>
41+
<AutoGen>True</AutoGen>
42+
<DependentUpon>Resources.resx</DependentUpon>
43+
</Compile>
3444
<Compile Update="Properties\Settings.Designer.cs">
3545
<DesignTimeSharedInput>True</DesignTimeSharedInput>
3646
<AutoGen>True</AutoGen>
@@ -112,4 +122,11 @@
112122
<Folder Include="img\" />
113123
</ItemGroup>
114124

125+
<ItemGroup>
126+
<EmbeddedResource Update="Properties\Resources.resx">
127+
<Generator>ResXFileCodeGenerator</Generator>
128+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
129+
</EmbeddedResource>
130+
</ItemGroup>
131+
115132
</Project>

‎INAV-SIM-OSD.sln‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.3.32929.385
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "INAV-SIM-OSD", "INAV-SIM-OSD.csproj", "{7C43438B-CF5F-4D7F-A71B-E05F38D88D2F}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "INAV-SIM-OSD", "INAV-SIM-OSD.csproj", "{7C43438B-CF5F-4D7F-A71B-E05F38D88D2F}"
7+
EndProject
8+
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "INAV-SIM-OSD-Setup", "..\INAV-SIM-OSD-Setup\INAV-SIM-OSD-Setup.vdproj", "{1CD04935-8DD8-4888-B33D-CB8B6D98BD34}"
79
EndProject
810
Global
911
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,6 +17,8 @@ Global
1517
{7C43438B-CF5F-4D7F-A71B-E05F38D88D2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
1618
{7C43438B-CF5F-4D7F-A71B-E05F38D88D2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
1719
{7C43438B-CF5F-4D7F-A71B-E05F38D88D2F}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{1CD04935-8DD8-4888-B33D-CB8B6D98BD34}.Debug|Any CPU.ActiveCfg = Debug
21+
{1CD04935-8DD8-4888-B33D-CB8B6D98BD34}.Release|Any CPU.ActiveCfg = Release
1822
EndGlobalSection
1923
GlobalSection(SolutionProperties) = preSolution
2024
HideSolutionNode = FALSE

‎MainForm.Designer.cs‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MainForm.resx‎

Lines changed: 240 additions & 0 deletions
Large diffs are not rendered by default.

‎OSD.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ private static Image[] WTFOSOsdFontToImages(byte[] fontBytes, Graphics graphics)
165165

166166
ms.Seek(0, SeekOrigin.Begin);
167167
ms.Flush();
168-
images[i] = graphics.CreateImage(ms.GetBuffer(), PixelFormat.Format32bppPRGBA);
168+
images[i] = graphics.CreateImage(ms.GetBuffer(), PixelFormat.Format32bppPRGBA);
169169
}
170170
return images;
171171
}

‎OSDInterface.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ internal class OSDInterface
77
private readonly Dictionary<string, string> PROCESS_NAMES = new Dictionary<string, string>()
88
{
99
{"RealFlight64", "RealFlight" },
10+
{"Realflight", "RealFlight" },
1011
{"X-Plane", "X-Plane" }
1112
};
1213

‎Properties/Resources.Designer.cs‎

Lines changed: 73 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Properties/Resources.resx‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="inav-icon-osd" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>..\Resources\inav-icon-osd.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123+
</data>
124+
</root>

‎Resources/inav-icon-osd.ico‎

13.7 KB
Binary file not shown.

‎readme.md‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,22 @@ PC OSD for INAV SITL/HITL
66

77
You may need to install the .NET Desktop Runtime 6 (latest version): https://dotnet.microsoft.com/en-us/download/dotnet/6.0
88

9-
## SITL:
9+
## SITL
1010
Configure a MSP-Displayport on any UART and connect via TCP to localhost (127.0.0.1) and the corresponding TCP port.
1111
See INAV SITL documentaion for more details.
1212

13-
## HITL:
13+
## HITL
1414
Configure a MSP-Displayport on any UART and connect via UART to USB module and select corresponding COM-Port.
1515

16-
## Font:
17-
The HD fonts from DJI WTFOS are used. New or updated fonts can simply be placed in a new subfolder in "osd-font".
16+
## Font
17+
The HD fonts from DJI WTFOS are used. New or updated fonts can simply be placed in a new subfolder in "osd_font".
1818

19-
# Supported Simulators:
19+
Select "DJIWTF" as video format in INAV.
20+
21+
## Supported Simulators:
2022
- RealFlight
2123
- XPlane
2224

23-
# Known issues:
25+
## Known issues
2426
- Works only if simulator is in window mode (No fullscreen)
2527
- OSD stick menu isn't working (will be fixed soon)

0 commit comments

Comments
 (0)