diff Discovery/Src/logbook_miniLive.c @ 981:c6c781a2e85b default tip

Merge into default
author heinrichsweikamp
date Tue, 11 Feb 2025 18:12:00 +0100 (41 hours ago)
parents 6d8ae8fbccf5
children
line wrap: on
line diff
--- a/Discovery/Src/logbook_miniLive.c	Tue Aug 13 13:24:54 2024 +0200
+++ b/Discovery/Src/logbook_miniLive.c	Tue Feb 11 18:12:00 2025 +0100
@@ -367,7 +367,7 @@
     	ReplayDataOffset = StepBackwards;
 		logbook_getHeader(StepBackwards ,&logbookHeader);
 
-		dataLength = logbook_readSampleData(StepBackwards, DEPTH_DATA_LENGTH, ReplayDepthData,NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ReplayMarkerData);
+		dataLength = logbook_readSampleData(StepBackwards, DEPTH_DATA_LENGTH, ReplayDepthData,NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ReplayMarkerData);
 
 	/* check if a marker is provided. If not disable marker functionality for the replay block */
 		for(index = 0; index < dataLength; index++)
@@ -383,14 +383,7 @@
 			ReplayMarkerData[0] = 0xFF;
 		}
 
-		if( dataLength == DEPTH_DATA_LENGTH)		/* log data has been compressed to fit into buffer */
-		{
-			ReplayDataResolution = (logbookHeader.diveTimeMinutes * 60 + logbookHeader.diveTimeSeconds) / dataLength;
-		}
-		else
-		{
-			ReplayDataResolution = logbookHeader.samplingRate;
-		}
+		ReplayDataResolution = logbookHeader.total_diveTime_seconds / dataLength;
 		ReplayDataLength = dataLength;
 		ReplayDataMaxDepth = logbookHeader.maxDepth;
 		ReplayDataMinutes =  logbookHeader.diveTimeMinutes;