From cc23dfe0cac7afd0ae52e78ec76ba727d9d0de92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B5=D0=BD=D0=B8=D1=81=20=D0=9A=D1=83=D0=B7=D0=BD?=
 =?UTF-8?q?=D0=B5=D1=86=D0=BE=D0=B2?= <d.kuznetsov@gitlab.local>
Date: Wed, 25 Oct 2023 14:43:20 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=B4=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=9F=D0=98?=
 =?UTF-8?q?=D0=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 udplib.cs | 64 ++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 49 insertions(+), 15 deletions(-)

diff --git a/udplib.cs b/udplib.cs
index b3c1fdc..04fdf33 100644
--- a/udplib.cs
+++ b/udplib.cs
@@ -541,6 +541,51 @@ namespace UDPLIB
         public static Boolean status_rs { set; get; }
         public static Boolean status_eth { set; get; }
     }
+    public class Res2
+    {
+        public Bitmap Bmp;
+        public Bitmap Crop;
+        public Bitmap Clearimg;
+        public UInt16 Iwidth;
+        public UInt16 Iheight;
+        public UInt32 Frames;
+        public float Fps;
+        public float AzUpr;
+        public float ElUpr;
+        public Int32 Shirota;
+        public Int32 Dolgota;
+        public Int32 Vysota;
+        public Int16 Course;
+        public Int16 Roll;
+        public Int16 Pitch;
+        public UInt16 X;
+        public UInt16 Y;
+        public Byte lx;
+        public Byte ly;
+        public Byte rejim_oes;         // Режим ОЭС: «0» – Обзор, «1» – АС
+        public Byte zahvat;            // Захват: «0» – отсутствие захвата, «1» – налачие захвата
+        public Byte color;             // Цвет изображения: «1» – цветное, «0» – монохромное
+        public String Version
+        {
+            get
+            {
+                return "1.1.0.255";
+            }
+        }
+        public String Configuration
+        {
+            get
+            {
+#if DEBUG
+                return "Debug";
+#else
+            return "Release";
+#endif
+            }
+        }
+        public Boolean status_rs { set; get; }
+        public Boolean status_eth { set; get; }
+    }
     public static class CallBack
     {
         public delegate void Event_newimg();
@@ -549,21 +594,10 @@ namespace UDPLIB
         public delegate void Event_crop_transmitted();
         public static Event_crop_transmitted Event_crop_transmitted_Handler;
 
+        public delegate void Event_newimg2(Res2 data);
+        public static Event_newimg2 Event_newimg_Handler2;
 
-        //public delegate void callbackEvent_bmp(Bitmap bmp);
-        //public delegate void callbackEvent_newimage();
-        //public delegate void callbackEvent_newpacket();
-        //public delegate void callbackEvent_str(String str);
-        //public delegate void callback_BVM2OES();
-        //public delegate void callback_etalon(Point pnt);
-        //public static callbackEvent_bmp callbackEventHandler_bmp;
-        //public static callbackEvent_newimage callbackEventHandler_newimage;
-        //public static callbackEvent_newpacket callbackEventHandler_newpacket;
-        //public static callbackEvent_str callbackEventHandler_str;
-        //public static callback_BVM2OES callback_BVM2OESHandler;
-        //public static callback_etalon callback_etalonHandler;
-        //public static Bitmap img { get; set; }
-
-
+        public delegate void Event_transmitted();
+        public static Event_transmitted Event_transmitted_Handler;
     }
 }