X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02.git/blobdiff_plain/4835b7bbe038dc4bfb4c51e4f9bc39053b6c19e1..b9a85f636f3f6be40306ef5eccd7134d4c079adc:/exec/bkgpslog

diff --git a/exec/bkgpslog b/exec/bkgpslog
index 9de6a09..ef7e13f 100755
--- a/exec/bkgpslog
+++ b/exec/bkgpslog
@@ -128,7 +128,7 @@ echoerr() {
 } # Define stderr message function.
 showUsage() {
     echoerr "USAGE:"
-    echoerr "    bkgpslog.sh [ options ]"
+    echoerr "    bkgpslog [ options ]"
     echoerr
     echoerr "OPTIONS:"
     echoerr "    -h, --help"
@@ -228,36 +228,33 @@ dateTimeShort(){
 main() {
     processArguments "$@" # Process arguments.
     if checkapp gpspipe && checkdir "$DIROUT"; then
-	# Determine output file paths
-	FILEOUT_BASENAME="$(dateTimeShort)".."$SCRIPT_HOSTNAME"_location
-	FILEOUT_NMEA="$FILEOUT_BASENAME".nmea ;
-	FILEOUT_GPX="$FILEOUT_BASENAME".gpx ;
-	FILEOUT_KML="$FILEOUT_BASENAME".kml ;
+
 
 	# Determine script lifespan (note: exit if <= 0 since 'timeout' runs forever if provided "0s".
 	#if ! scriptTTL="$(timeUntilMidnight)"; then yell "ERROR: timeUntilMidnight exit code $?"; exit 1; fi 
-	scriptTTL="60"; #DEBUG DEBUG DEBUG DEBUG	
+	scriptTTL="3600"; # DEBUG DEBUG DEBUG DEBUG
         
 	# Determine buffer lifespan
-	#bufferTTL="60";
-	bufferTTL="15"; #DEBUG DEBUG DEBUG DEBUG
+	bufferTTL="60";
 
 	# Record gps data until script lifespan ends
 	declare debugCounter; debugCounter="0"
 	while [[ "$SECONDS" -lt "$scriptTTL" ]]; do
 	    ((debugCounter++))
+      	    # Determine output file paths (time is start of buffer period)
+	    FILEOUT_BASENAME="$(dateTimeShort)--P$(bufferTTL)S..$SCRIPT_HOSTNAME_location" ;
+	    FILEOUT_NMEA="$FILEOUT_BASENAME".nmea ;
+	    FILEOUT_GPX="$FILEOUT_BASENAME".gpx ;
+	    FILEOUT_KML="$FILEOUT_BASENAME".kml ;
 	    # 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
-	    # Save processed buffer data
-	    echo "$buffer" >> "$DIROUT"/"$FILEOUT_NMEA""$debugCounter" # Save NMEA format
-	    echo "$buffer_GPX" >> "$DIROUT"/"$FILEOUT_GPX""$debugCounter" # Save GPX format
-	    echo "$buffer_GPX" >> "$DIROUT"/"$FILEOUT_KML""$debugCounter" # Save KML format
-	    vbm "DEBUG:Completed buffer session $debugCounter" 1>&2;
-	    # Reset buffer
-	    unset buffer
+	    # 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 and filenames
+	    unset buffer buffer_GPX buffer_KML FILEOUT_BASENAME FILEOUT_NMEA FILEOUT_GPX FILEOUT_KML;
 	done
     fi
 } # Main function.