From: User <User>
Date: Tue, 8 Dec 2015 13:13:08 +0000 (+0100)
Subject: Recognize ChemStation B.06.43 files
X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=ee372aee0ecf9007d5bb553b317988220445d734;p=libHPCS.git

Recognize ChemStation B.06.43 files
---

diff --git a/libhpcs.c b/libhpcs.c
index 9df05b6..eb03c72 100644
--- a/libhpcs.c
+++ b/libhpcs.c
@@ -317,6 +317,10 @@ static enum HPCS_ChemStationVer detect_chemstation_version(const char*const vers
 		PR_DEBUG("ChemStation B.06.26\n");
 		return CHEMSTAT_B0626;
 	}
+	else if (!strcmp(version_string, CHEMSTAT_B0643_STR)) {
+		PR_DEBUG("ChemStation B.06.43\n");
+		return CHEMSTAT_B0643;
+	}
 	else if (strlen(version_string) == 0) {
 		PR_DEBUG("ChemStation Untagged\n");
 		return CHEMSTAT_UNTAGGED;
@@ -380,8 +384,10 @@ static void guess_sampling_rate(const enum HPCS_ChemStationVer version, struct H
 		}
 		break;
 	case CHEMSTAT_B0626:
+	case CHEMSTAT_B0643:
 		switch (mdata->file_type) {
 		case HPCS_TYPE_CE_DAD:
+		case HPCS_TYPE_CE_CCD:
 			mdata->sampling_rate /= 100;
 			break;
 		default:
diff --git a/libhpcs_p.h b/libhpcs_p.h
index b529657..d2c1577 100644
--- a/libhpcs_p.h
+++ b/libhpcs_p.h
@@ -125,12 +125,14 @@ enum HPCS_ChemStationVer {
 	CHEMSTAT_UNTAGGED,
 	CHEMSTAT_B0625,
 	CHEMSTAT_B0626,
+	CHEMSTAT_B0643,
 	CHEMSTAT_UNKNOWN
 };
 
 /* Known ChemStation format versions */
 const char CHEMSTAT_B0625_STR[] = "B.06.25 [0003]";
 const char CHEMSTAT_B0626_STR[] = "B.06.26 [0010]";
+const char CHEMSTAT_B0643_STR[] = "B.06.43 [0001]";
 
 /* Values of markers found in .ch files */
 const char BIN_MARKER_A = 0x10;