Merge branch 'H-J-P-master'

s-d-a · Apr 10, 2017 · b656f27 · b656f27
2 parents 8b1f836 + ea76546
commit b656f27
Show file tree

Hide file tree

Showing 21 changed files with 6,083 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,5 @@ Backup*/
 .com.greenworldsoft.syncfolderspro
 *.log
 Log.png
+*Temp.*
+*temp.*
diff --git a/Ikarus/Ikarus.exe b/Ikarus/Ikarus.exe
diff --git a/Ikarus/Ikarus.pdb b/Ikarus/Ikarus.pdb
diff --git a/Ikarus/Images/Textures3D/AJS37_ADI.jpg b/Ikarus/Images/Textures3D/AJS37_ADI.jpg
diff --git a/Ikarus/Images/Textures3D/AJS37_ADI_blue.jpg b/Ikarus/Images/Textures3D/AJS37_ADI_blue.jpg
diff --git a/Ikarus/Images/Textures3D/CheckerTest.jpg b/Ikarus/Images/Textures3D/CheckerTest.jpg
diff --git a/Ikarus/Images/Textures3D/US_ADI.jpg b/Ikarus/Images/Textures3D/US_ADI.jpg
diff --git a/Ikarus/L-39C-RED.ikarus b/Ikarus/L-39C-RED.ikarus
@@ -224,7 +224,7 @@
   <Instruments>
     <IDInst>18</IDInst>
     <Name>R_832M Channel</Name>
-    <Class>Display7Segment</Class>
+    <Class>Display</Class>
     <PosX>15</PosX>
     <PosY>245</PosY>
     <Size>50</Size>
@@ -237,7 +237,7 @@
   <Instruments>
     <IDInst>19</IDInst>
     <Name>R_832M Frequency</Name>
-    <Class>Display7Segment</Class>
+    <Class>Display</Class>
     <PosX>15</PosX>
     <PosY>285</PosY>
     <Size>130</Size>
@@ -247,6 +247,32 @@
     <Reactivate>false</Reactivate>
     <WindowID>1</WindowID>
   </Instruments>
+  <Instruments>
+    <IDInst>20</IDInst>
+    <Name>RSBN NAV Channel</Name>
+    <Class>Display</Class>
+    <PosX>15</PosX>
+    <PosY>325</PosY>
+    <Size>50</Size>
+    <Rotate>0</Rotate>
+    <ImageFrame>-</ImageFrame>
+    <ImageLight>-</ImageLight>
+    <Reactivate>false</Reactivate>
+    <WindowID>1</WindowID>
+  </Instruments>
+  <Instruments>
+    <IDInst>21</IDInst>
+    <Name>RSBN LAND Channel</Name>
+    <Class>Display</Class>
+    <PosX>15</PosX>
+    <PosY>365</PosY>
+    <Size>50</Size>
+    <Rotate>0</Rotate>
+    <ImageFrame>-</ImageFrame>
+    <ImageLight>-</ImageLight>
+    <Reactivate>false</Reactivate>
+    <WindowID>1</WindowID>
+  </Instruments>
   <Functions>
     <IDInst>1</IDInst>
     <IDFct>1</IDFct>
@@ -1031,6 +1057,34 @@
     <AsciiValue />
     <OldAsciiValue />
   </Functions>
+  <Functions>
+    <IDInst>20</IDInst>
+    <IDFct>1</IDFct>
+    <Name>RSBN NAV Channel</Name>
+    <Arg_number>189</Arg_number>
+    <Value>0</Value>
+    <OldValue>0</OldValue>
+    <Offset>0</Offset>
+    <Input>EFEFEF</Input>
+    <Output>2</Output>
+    <Ascii>true</Ascii>
+    <AsciiValue />
+    <OldAsciiValue />
+  </Functions>
+  <Functions>
+    <IDInst>21</IDInst>
+    <IDFct>1</IDFct>
+    <Name>RSBN LAND Channel</Name>
+    <Arg_number>190</Arg_number>
+    <Value>0</Value>
+    <OldValue>0</OldValue>
+    <Offset>0</Offset>
+    <Input>EFEFEF</Input>
+    <Output>2</Output>
+    <Ascii>true</Ascii>
+    <AsciiValue />
+    <OldAsciiValue />
+  </Functions>
   <Lamps>
     <ID>1</ID>
     <Class>LampOnOff</Class>
@@ -1257,4 +1311,4 @@
     <Background>L-39-Background.png</Background>
     <BackgroundNight>-</BackgroundNight>
   </Window>
-</DataSet1>
+</DataSet1>