X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02.git/blobdiff_plain/947c0b142aa307f1379a177e0b1a4b871ad3cbbe..fde89ac0b02bb52ea8744e58f1ca9eee6530e37e:/exec/bkgpslog

diff --git a/exec/bkgpslog b/exec/bkgpslog
index 372ebde..215dd7b 100755
--- a/exec/bkgpslog
+++ b/exec/bkgpslog
@@ -241,23 +241,20 @@ main() {
 	declare debugCounter; debugCounter="0"
 	while [[ "$SECONDS" -lt "$scriptTTL" ]]; do
 	    ((debugCounter++))
-	    # Fill buffer
-	    buffer="$(timeout "$bufferTTL""s" gpspipe -r)"; # Record gpspipe nmea data to buffer for bufferTTL seconds
-	    # Process buffer
-	    buffer_GPX="$(echo "$buffer" | gpsbabel -i nmea -f - -o gpx -F - )"; # Convert buffer to GPX format
-	    buffer_KML="$(echo "$buffer" | gpsbabel -i nmea -f - -o kml -F - )"; # Convert buffer to KML format
-	    # Determine output file paths
-	    FILEOUT_BASENAME="$(dateTimeShort)".."$SCRIPT_HOSTNAME"_location ;
+      	    # Determine output file paths (time is start of buffer period)
+	    FILEOUT_BASENAME="$(dateTimeShort)""--P""$bufferTTL""S..""$SCRIPT_HOSTNAME""_location" ; # ISO-8601 YYYYmmddTHHMMSS+zzP[$bufferTTL]S
 	    FILEOUT_NMEA="$FILEOUT_BASENAME".nmea ;
 	    FILEOUT_GPX="$FILEOUT_BASENAME".gpx ;
 	    FILEOUT_KML="$FILEOUT_BASENAME".kml ;
-	    # Save processed buffer data
-	    echo "$buffer"     > "$DIROUT"/"$FILEOUT_NMEA" # Save NMEA format
-	    echo "$buffer_GPX" > "$DIROUT"/"$FILEOUT_GPX" # Save GPX format
-	    echo "$buffer_KML" > "$DIROUT"/"$FILEOUT_KML" # Save KML format
+	    # Fill buffer
+	    buffer="$(timeout "$bufferTTL""s" gpspipe -r)"; # Record gpspipe nmea data to buffer for bufferTTL seconds
+	    # Process and save buffers
+	    echo "$buffer"                                     > "$DIROUT"/"$FILEOUT_NMEA" & # Save NMEA format
+	    echo "$buffer" | gpsbabel -i nmea -f - -o gpx -F - > "$DIROUT"/"$FILEOUT_GPX"  & # Save GPX format
+	    echo "$buffer" | gpsbabel -i nmea -f - -o kml -F - > "$DIROUT"/"$FILEOUT_KML"  & # Save KML format
 	    vbm "DEBUG:Completed buffer session $debugCounter ." 1>&2;
-	    # Reset buffer
-	    unset buffer buffer_GPX buffer_KML
+	    # Reset buffer and filenames
+	    unset buffer buffer_GPX buffer_KML FILEOUT_BASENAME FILEOUT_NMEA FILEOUT_GPX FILEOUT_KML;
 	done
     fi
 } # Main function.