add Orion and ANAN10E

k3it · Jul 25, 2017 · 0d43d27 · 0d43d27
1 parent d4b2cfe
commit 0d43d27
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/HermesIntf/Hermes.cpp b/HermesIntf/Hermes.cpp
@@ -24,7 +24,9 @@ extern "C" const char  HERMESLT[]       = "HermesLT";
 extern "C" const char  UNKNOWN_BRD_ID[] = "Unknown brd ID";
 extern "C" const char  RTLDNGL[]        = "RTLdngl";
 extern "C" const char  REDPITAYA[]      = "RP";	// Was "RedPitaya" -- name too long for CWSL_Tee / Skimmer
-extern "C" const char  AFREDI[]         = "Afedri";
+extern "C" const char  AFEDRI[]         = "Afedri";
+extern "C" const char  ORION[]          = "Orion";
+extern "C" const char  ANAN10E[]        = "Anan10E";
 
 namespace HermesIntf 
 {
@@ -370,6 +372,12 @@ namespace HermesIntf
 					{
 						max_recvrs = 4;
 					}
+					else if (ver >= 15 && ver < 18 )
+					{
+						// ANAN10E board masquerades as a Hermes but sends a lower firmware version
+						max_recvrs = 2;
+						devname = (char *) ANAN10E;
+					}
 					else {
 						max_recvrs = 4;
 					}
@@ -388,6 +396,12 @@ namespace HermesIntf
 					Att = 0;
 					MaxAtt = 31;
 					break;
+				case 0x05:
+					devname = (char *) ORION;
+					max_recvrs = 7;
+					Att = 0;
+					MaxAtt = 31;
+					break;
 				case 0x06:
 					devname = (char *) HERMESLT;
 					max_recvrs = 2;
@@ -458,7 +472,7 @@ namespace HermesIntf
 
 				//special case for Afedri emulation ID for Afedri
 				if (strcmp(emulation_id, "AFEDRIRX") == 0) {
-					devname = (char *) AFREDI;
+					devname = (char *) AFEDRI;
 					max_recvrs = recvbuff[19];
 					clock = (recvbuff[20] & 0xFF) << 24 | (recvbuff[21] & 0xFF) << 16 | (recvbuff[22] & 0xFF) << 8 | (recvbuff[23] & 0xFF);
 					MaxAtt = 0;

diff --git a/HermesIntf/HermesIntf.cpp b/HermesIntf/HermesIntf.cpp
@@ -25,7 +25,9 @@ extern "C" const char HERMESLT[];
 extern "C" const char UNKNOWN_BRD_ID[];
 extern "C" const char RTLDNGL[];
 extern "C" const char REDPITAYA[];
-extern "C" const char AFREDI[];
+extern "C" const char AFEDRI[];
+extern "C" const char ORION[];
+extern "C" const char ANAN10E[];
 
 // String buffer for device name
 char display_name[50];
@@ -451,7 +453,7 @@ namespace HermesIntf
 					pInfo->MaxRecvCount = myHermes.max_recvrs;
 				}
 
-				if (strcmp(myHermes.devname, AFREDI) == 0) {
+				if (strcmp(myHermes.devname, AFEDRI) == 0) {
 
 					pInfo->ExactRates[RATE_48KHZ] = calculate_afedri_sr(48e3);
 					pInfo->ExactRates[RATE_96KHZ] = calculate_afedri_sr(96e3);
@@ -568,7 +570,7 @@ namespace HermesIntf
 
 
 			//for Hermes/Angelia start the AGC loop
-			if (myHermes.devname == HERMES || myHermes.devname == ANGELIA) {
+			if (myHermes.devname == HERMES || myHermes.devname == ANGELIA || myHermes.devname == ORION || myHermes.devname == ANAN10E) {
 
 				ghAgc = CreateThread(NULL, 0, Agc, NULL, 0, &gidAgc);
 				if (ghAgc == NULL)

diff --git a/HermesIntf/hermes.rc b/HermesIntf/hermes.rc
@@ -14,8 +14,8 @@
 //
 
 1 VERSIONINFO
- FILEVERSION 17,7,6,1
- PRODUCTVERSION 17,7,6,1
+ FILEVERSION 17,7,24,1
+ PRODUCTVERSION 17,7,24,1
  FILEFLAGSMASK 0x0L
 #ifdef _DEBUG
  FILEFLAGS 0x21L
@@ -32,11 +32,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Zibatek,Inc."
             VALUE "FileDescription", "HPSDR Skimmer Server Interface"
-            VALUE "FileVersion", "17.7.6.1"
+            VALUE "FileVersion", "17.7.24.1"
             VALUE "LegalCopyright", "Vasiliy Gokoyev K3IT, 2017"
             VALUE "OriginalFilename", "HermesIntf.dll"
             VALUE "ProductName", "HPSDR Skimmer Server Interface"
-            VALUE "ProductVersion", "17.7.6.1"
+            VALUE "ProductVersion", "17.7.24.1"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/readme.txt b/readme.txt
@@ -98,6 +98,7 @@ Please send feedback to [email protected]
 ==========================================
 CHANGES
 ==========================================
+17.7.24 - Add Orion and Anan10e, fix a typo
 17.7.6 - Improved integration w/ CWSL_Tee, minor bug fixes, updated device names (N6TV)
 17.7.5 - fix Angelia board detection issue
 16.6.27 - add support for Red Pitaya