Sat Jan 20 19:04:06 MST 2018

Author: Daniel Buscombe

PyHum/_pyhum_read.py

@@ -296,6 +296,9 @@ def read(humfile, sonpath, cs2cs_args="epsg:26949", c=1450.0, draft=0.3, doplot=
           elif model=='helix':
              model=1
              print("Data is from the HELIX series")
+          elif model=='mega':
+             model=2
+             print("Data is from the MEGA series")
 #    if cog:
 #       cog = int(cog)
 #       if cog==1:

PyHum/pyread.c

@@ -61,6 +61,8 @@ cdef class pyread:
           headbytes=68
        elif model=='1': ##helix
           headbytes=68
+       elif model=='2': ##mega
+          headbytes=68
        else: #tested so far 998, 1198
           headbytes=67
 
@@ -239,7 +241,7 @@ cdef class pyread:
        head.append(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0]) # gps1
        head.append(float(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0])/10) # heading_deg    
 
-       if model==1199 or model==0 or model==1: #onix, helix  
+       if model==1199 or model==0 or model==2: #onix, helix, mega  
           spacer = self._fread(fid, 1, 'B')
           head.append(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0]) # gps2
           head.append(float(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0])/10) # speed_ms

PyHum/pyread.o

@@ -76,6 +76,8 @@ cdef class pyread:
           headbytes=68
        elif model=='1': ##helix
           headbytes=68
+       elif model=='2': ##mega
+          headbytes=68
        else: #tested so far 998, 1198, 898
           headbytes=67
 
@@ -244,7 +246,7 @@ cdef class pyread:
        head.append(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0]) # gps1
        head.append(float(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0])/10) # heading_deg    
 
-       if model==1199 or model==0: ##'onix'
+       if model==1199 or model==0 or model==2: #onix, helix, mega  
           spacer = self._fread(fid, 1, 'B')
           head.append(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0]) # gps2
           head.append(float(struct.unpack('>h', ''.join(self._fread(fid,2,'c')) )[0])/10) # speed_ms