Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to RT Protocol version 1.25 #41

Merged
merged 1 commit into from
Jun 5, 2024
Merged

Update to RT Protocol version 1.25 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions RTClientExample/Input.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 6 additions & 0 deletions RTClientExample/OutputSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions RTClientExample/RTClientExample.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -139,4 +139,4 @@ int main(int argc, char **argv)
delete poInput;

return 1;
} // main
} // main
4 changes: 2 additions & 2 deletions RTPacket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#endif

#define MAJOR_VERSION 1
#define MINOR_VERSION 24
#define MINOR_VERSION 25

class DLL_EXPORT CRTPacket
{
Expand Down Expand Up @@ -329,4 +329,4 @@ class DLL_EXPORT CRTPacket
}; // RTPacket


#endif // RTPACKET_H
#endif // RTPACKET_H
13 changes: 12 additions & 1 deletion RTProtocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down
66 changes: 34 additions & 32 deletions RTProtocol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down