Update to RT Protocol version 1.25 (#41)

daoo · Daniel Oom · web-flow · commit ca46fbebaa43 · 2024-06-05T08:27:40.000+02:00
Co-authored-by: Daniel Oom &lt;daniel.oom@qualisys.se&gt;
diff --git a/RTClientExample/Input.cpp b/RTClientExample/Input.cpp
@@ -710,14 +710,15 @@ void CInput::ReadCameraSettings(unsigned int &nCameraId,        int   &nMode,
     }
 
     printf("Enter Video Resolution :\n");
-    printf("  1 : 1080p\n");
-    printf("  2 : 720p\n");
-    printf("  3 : 540p\n");
-    printf("  4 : 480p\n");
-    printf("  5 : None (default)\n");
-    printf("Select 1 - 5 : ");
+    printf("  1 : 1440p\n");
+    printf("  2 : 1080p\n");
+    printf("  3 : 720p\n");
+    printf("  4 : 540p\n");
+    printf("  5 : 480p\n");
+    printf("  6 : None (default)\n");
+    printf("Select 1 - 6 : ");
     int tmpVideoRes = ReadChar('1', true) - '0' - 1;
-    if (tmpVideoRes >= 0 && tmpVideoRes <= 3)
+    if (tmpVideoRes >= 0 && tmpVideoRes <= 4)
     {
         videoResolution = (CRTProtocol::EVideoResolution)tmpVideoRes;
     }
diff --git a/RTClientExample/OutputSettings.cpp b/RTClientExample/OutputSettings.cpp
@@ -284,6 +284,9 @@ void COutput::PrintGeneralSettings(CRTProtocol* poRTProtocol)
             case CRTProtocol::ModelMiqusVideoColor:
                 printf("  Model: Miqus Video Color   ");
                 break;
+            case CRTProtocol::ModelMiqusVideoColorPlus:
+                printf("  Model: Miqus Video Color Plus  ");
+                break;
             case CRTProtocol::ModelArqusA5:
                 printf("  Model: Arqus A5   ");
                 break;
@@ -339,6 +342,9 @@ void COutput::PrintGeneralSettings(CRTProtocol* poRTProtocol)
             {
                 switch (videoResolution)
                 {
+                    case CRTProtocol::VideoResolution1440p:
+                        printf("  Video Resolution: 1440p\n");
+                        break;
                     case CRTProtocol::VideoResolution1080p :
                         printf("  Video Resolution: 1080p\n");
                         break;
diff --git a/RTClientExample/RTClientExample.cpp b/RTClientExample/RTClientExample.cpp
@@ -1,7 +1,7 @@
 #include "Operations.h"
 
 #define LATEST_SELECTABLE_MAJOR_VERSION 1
-#define LATEST_SELECTABLE_MINOR_VERSION 24
+#define LATEST_SELECTABLE_MINOR_VERSION 25
 #define PROGRAM_VERSION 0
 
 int main(int argc, char **argv)
@@ -139,4 +139,4 @@ int main(int argc, char **argv)
     delete poInput;
 
     return 1;
-} // main
+} // main
diff --git a/RTPacket.h b/RTPacket.h
@@ -14,7 +14,7 @@
 #endif
 
 #define MAJOR_VERSION           1
-#define MINOR_VERSION           24
+#define MINOR_VERSION           25
 
 class DLL_EXPORT CRTPacket
 {
@@ -329,4 +329,4 @@ class DLL_EXPORT CRTPacket
 }; // RTPacket
 
 
-#endif // RTPACKET_H
+#endif // RTPACKET_H
diff --git a/RTProtocol.cpp b/RTProtocol.cpp
@@ -2237,6 +2237,10 @@ bool CRTProtocol::ReadGeneralSettings()
         {
             sCameraSettings.eModel = ModelMiqusHybrid;
         }
+        else if (tStr == "miqus video color plus")
+        {
+            sCameraSettings.eModel = ModelMiqusVideoColorPlus;
+        }
         else if (tStr == "arqus a5")
         {
             sCameraSettings.eModel = ModelArqusA5;
@@ -2314,7 +2318,11 @@ bool CRTProtocol::ReadGeneralSettings()
         if (oXML.FindChildElem("Video_Resolution"))
         {
             tStr = ToLower(oXML.GetChildData());
-            if (tStr == "1080p")
+            if (tStr == "1440p")
+            {
+                sCameraSettings.eVideoResolution = VideoResolution1440p;
+            }
+            else if (tStr == "1080p")
             {
                 sCameraSettings.eVideoResolution = VideoResolution1080p;
             }
@@ -5467,6 +5475,9 @@ bool CRTProtocol::SetCameraVideoSettings(
     {
         switch (*eVideoResolution)
         {
+            case VideoResolution1440p:
+                oXML.AddElem("Video_Resolution", "1440p");
+                break;
             case VideoResolution1080p:
                 oXML.AddElem("Video_Resolution", "1080p");
                 break;
diff --git a/RTProtocol.h b/RTProtocol.h
@@ -78,33 +78,34 @@ class DLL_EXPORT CRTProtocol
 
     enum ECameraModel
     {
-        ModelMacReflex       = 0,
-        ModelProReflex120    = 1,
-        ModelProReflex240    = 2,
-        ModelProReflex500    = 3,
-        ModelProReflex1000   = 4,
-        ModelOqus100         = 5,
-        ModelOqus300         = 6,
-        ModelOqus300Plus     = 7,
-        ModelOqus400         = 8,
-        ModelOqus500         = 9,
-        ModelOqus200C        = 10,
-        ModelOqus500Plus     = 11,
-        ModelOqus700         = 12,
-        ModelOqus700Plus     = 13,
-        ModelOqus600Plus     = 14,
-        ModelMiqusM1         = 15,
-        ModelMiqusM3         = 16,
-        ModelMiqusM5         = 17,
-        ModelMiqusSyncUnit   = 18,
-        ModelMiqusVideo      = 19,
-        ModelMiqusVideoColor = 20,
-        ModelMiqusHybrid     = 21,
-        ModelArqusA5         = 22,
-        ModelArqusA12        = 23,
-        ModelArqusA9         = 24,
-        ModelArqusA26         = 25,
-        ModelUnknown         = 26
+        ModelMacReflex           = 0,
+        ModelProReflex120        = 1,
+        ModelProReflex240        = 2,
+        ModelProReflex500        = 3,
+        ModelProReflex1000       = 4,
+        ModelOqus100             = 5,
+        ModelOqus300             = 6,
+        ModelOqus300Plus         = 7,
+        ModelOqus400             = 8,
+        ModelOqus500             = 9,
+        ModelOqus200C            = 10,
+        ModelOqus500Plus         = 11,
+        ModelOqus700             = 12,
+        ModelOqus700Plus         = 13,
+        ModelOqus600Plus         = 14,
+        ModelMiqusM1             = 15,
+        ModelMiqusM3             = 16,
+        ModelMiqusM5             = 17,
+        ModelMiqusSyncUnit       = 18,
+        ModelMiqusVideo          = 19,
+        ModelMiqusVideoColor     = 20,
+        ModelMiqusHybrid         = 21,
+        ModelArqusA5             = 22,
+        ModelArqusA12            = 23,
+        ModelArqusA9             = 24,
+        ModelArqusA26            = 25,
+        ModelMiqusVideoColorPlus = 26,
+        ModelUnknown             = 27
     };
 
     enum ECameraMode
@@ -116,11 +117,12 @@ class DLL_EXPORT CRTProtocol
 
     enum EVideoResolution
     {
-        VideoResolution1080p = 0,
-        VideoResolution720p = 1,
-        VideoResolution540p = 2,
-        VideoResolution480p = 3,
-        VideoResolutionNone = 4
+        VideoResolution1440p = 0,
+        VideoResolution1080p = 1,
+        VideoResolution720p = 2,
+        VideoResolution540p = 3,
+        VideoResolution480p = 4,
+        VideoResolutionNone = 5
     };
 
     enum EVideoAspectRatio

Original file line number	Diff line number	Diff line change
`@@ -2237,6 +2237,10 @@ bool CRTProtocol::ReadGeneralSettings()`
`2237`	`2237`	`{`
`2238`	`2238`	`sCameraSettings.eModel = ModelMiqusHybrid;`
`2239`	`2239`	`}`
	`2240`	`+ else if (tStr == "miqus video color plus")`
	`2241`	`+ {`
	`2242`	`+ sCameraSettings.eModel = ModelMiqusVideoColorPlus;`
	`2243`	`+ }`
`2240`	`2244`	`else if (tStr == "arqus a5")`
`2241`	`2245`	`{`
`2242`	`2246`	`sCameraSettings.eModel = ModelArqusA5;`
`@@ -2314,7 +2318,11 @@ bool CRTProtocol::ReadGeneralSettings()`
`2314`	`2318`	`if (oXML.FindChildElem("Video_Resolution"))`
`2315`	`2319`	`{`
`2316`	`2320`	`tStr = ToLower(oXML.GetChildData());`
`2317`		`- if (tStr == "1080p")`
	`2321`	`+ if (tStr == "1440p")`
	`2322`	`+ {`
	`2323`	`+ sCameraSettings.eVideoResolution = VideoResolution1440p;`
	`2324`	`+ }`
	`2325`	`+ else if (tStr == "1080p")`
`2318`	`2326`	`{`
`2319`	`2327`	`sCameraSettings.eVideoResolution = VideoResolution1080p;`
`2320`	`2328`	`}`
`@@ -5467,6 +5475,9 @@ bool CRTProtocol::SetCameraVideoSettings(`
`5467`	`5475`	`{`
`5468`	`5476`	`switch (*eVideoResolution)`
`5469`	`5477`	`{`
	`5478`	`+ case VideoResolution1440p:`
	`5479`	`+ oXML.AddElem("Video_Resolution", "1440p");`
	`5480`	`+ break;`
`5470`	`5481`	`case VideoResolution1080p:`
`5471`	`5482`	`oXML.AddElem("Video_Resolution", "1080p");`
`5472`	`5483`	`break;`