ASM-2211 #time 1h bug fix for data block splitting

Author: marknolan

ShimmerDriver/src/main/java/com/shimmerresearch/verisense/payloaddesign/PayloadContentsDetails.java

@@ -35,6 +35,7 @@ public abstract class PayloadContentsDetails implements Serializable {
 
 	public static boolean DEBUG_ACCEL_ARRAYS = false;
 	private static boolean DEBUG_DATA_BLOCKS = false;
+	public static boolean SPLIT_CSVS_AT_MIDDAY_AND_MIDNIGHT = true;
 
 	protected transient List<DataBlockDetails> listOfDataBlocksInOrder = new ArrayList<DataBlockDetails>();
 	public transient DatasetToSave datasetToSave = new DatasetToSave();

ShimmerDriver/src/main/java/com/shimmerresearch/verisense/payloaddesign/PayloadContentsDetailsV8orAbove.java

@@ -131,7 +131,7 @@ public void parsePayloadContentsMetaData(int binFileByteIndex) throws IOExceptio
 		}
 
 		// If midday/midnight transition detected within a payload, dive down deeper to find out where it is
-		if(UtilVerisenseDriver.isTransitionMidDayOrMidnight(getStartTimeRwcMs(), getEndTimeRwcMs())) {
+		if(SPLIT_CSVS_AT_MIDDAY_AND_MIDNIGHT && UtilVerisenseDriver.isTransitionMidDayOrMidnight(getStartTimeRwcMs(), getEndTimeRwcMs())) {
 			splitDataBlocksAtMiddayMidnight(listOfDataBlocksInOrder, verisenseDevice.getMapOfSensorIdsPerDataBlock().keySet());
 		}
 
@@ -398,9 +398,11 @@ public void parsePayloadSensorData() {
 						verisenseDevice.resetAlgorithmBuffersAssociatedWithSensor(sensorClassKey);
 					}
 				}
-
-				// Added offset for sensor ID byte and 3 bytes RTC ticks 
-				currentByteIndex += BYTE_COUNT.PAYLOAD_CONTENTS_GEN8_SENSOR_ID + BYTE_COUNT.PAYLOAD_CONTENTS_RTC_BYTES_TICKS;
+				
+				// Added offset for sensor ID byte and 3 bytes RTC ticks (as long as it's not the second half of a split datablock)
+				if(!dataBlockDetails.isSecondPartOfSplitDataBlock()) {
+					currentByteIndex += BYTE_COUNT.PAYLOAD_CONTENTS_GEN8_SENSOR_ID + BYTE_COUNT.PAYLOAD_CONTENTS_RTC_BYTES_TICKS;
+				}
 
 				if(dataBlockDetails.listOfSensorClassKeys.contains(sensorClassKey)) {
 					verisenseDevice.parseDataBlockData(dataBlockDetails, byteBuffer, currentByteIndex, COMMUNICATION_TYPE.SD);