Recognize ChemStation B.06.43 files

diff --git a/libhpcs.c b/libhpcs.c
index 9df05b6e681bc9e8d1d601f3ceb43ed1003ca70e..eb03c723823cbb77ec5e85bbc85db83b35599c84 100644 (file)
--- 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 b52965798b2456c984b7cdf3b2c93698e35c80f6..d2c1577038ecd1fad26e5b55b192c4be3d3d73ec 100644 (file)
--- 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;