gpsd_json: epe now in the JSON.

Odd that it was never there before...

1 files changed, 9 insertions, 9 deletions

diff --git a/test/daemon/gr601-w.log.chk b/test/daemon/gr601-w.log.chk
index e0090e0f..7a8e36bd 100644
--- a/test/daemon/gr601-w.log.chk
+++ b/test/daemon/gr601-w.log.chk
@@ -12,7 +12,7 @@ $GPGSV,3,2,11,09,27,201,17,11,25,054,14,17,55,292,28,20,30,116,14*75
 $GPGSV,3,3,11,24,05,327,,28,84,072,33,32,23,078,27*45

 {"class":"SKY","xdop":1.23,"ydop":1.18,"vdop":2.39,"tdop":1.69,"hdop":1.72,"gdop":3.39,"pdop":2.94,"satellites":[{"PRN":1,"el":48,"az":51,"ss":27,"used":true,"gnssid":0,"svid":1},{"PRN":4,"el":20,"az":215,"ss":13,"used":false,"gnssid":0,"svid":4},{"PRN":7,"el":6,"az":177,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":31,"az":196,"ss":19,"used":true,"gnssid":0,"svid":8},{"PRN":9,"el":27,"az":201,"ss":17,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":25,"az":54,"ss":14,"used":true,"gnssid":0,"svid":11},{"PRN":17,"el":55,"az":292,"ss":28,"used":true,"gnssid":0,"svid":17},{"PRN":20,"el":30,"az":116,"ss":14,"used":false,"gnssid":0,"svid":20},{"PRN":24,"el":5,"az":327,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":28,"el":84,"az":72,"ss":33,"used":true,"gnssid":0,"svid":28},{"PRN":32,"el":23,"az":78,"ss":27,"used":true,"gnssid":0,"svid":32}]}

 $GPGLL,4002.10513,N,07531.20562,W,143252.00,A,A*7B

-{"class":"TPV","mode":3,"time":"2013-10-24T14:32:52.000Z","ept":0.005,"lat":40.035085500,"lon":-75.520093667,"alt":183.800,"epx":18.521,"epy":17.648,"epv":54.970,"track":0.0000,"speed":0.008}

+{"class":"TPV","mode":3,"time":"2013-10-24T14:32:52.000Z","ept":0.005,"lat":40.035085500,"lon":-75.520093667,"alt":183.800,"epx":18.521,"epy":17.648,"epe":55.860,"epv":54.970,"track":0.0000,"speed":0.008}

 $GPRMC,143253.00,A,4002.10554,N,07531.20565,W,0.285,,241013,,,A*6D

 $GPVTG,,T,,M,0.285,N,0.528,K,A*23

 $GPGGA,143253.00,4002.10554,N,07531.20565,W,1,07,1.72,183.8,M,-34.4,M,,*64

@@ -22,7 +22,7 @@ $GPGSV,3,2,11,09,27,201,17,11,25,054,14,17,55,292,28,20,30,116,14*75
 $GPGSV,3,3,11,24,05,327,,28,84,072,33,32,23,078,27*45

 {"class":"SKY","xdop":1.23,"ydop":1.18,"vdop":2.39,"tdop":1.69,"hdop":1.72,"gdop":3.39,"pdop":2.94,"satellites":[{"PRN":1,"el":48,"az":51,"ss":27,"used":true,"gnssid":0,"svid":1},{"PRN":4,"el":20,"az":215,"ss":13,"used":false,"gnssid":0,"svid":4},{"PRN":7,"el":6,"az":177,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":31,"az":196,"ss":19,"used":true,"gnssid":0,"svid":8},{"PRN":9,"el":27,"az":201,"ss":17,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":25,"az":54,"ss":14,"used":true,"gnssid":0,"svid":11},{"PRN":17,"el":55,"az":292,"ss":28,"used":true,"gnssid":0,"svid":17},{"PRN":20,"el":30,"az":116,"ss":14,"used":false,"gnssid":0,"svid":20},{"PRN":24,"el":5,"az":327,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":28,"el":84,"az":72,"ss":33,"used":true,"gnssid":0,"svid":28},{"PRN":32,"el":23,"az":78,"ss":27,"used":true,"gnssid":0,"svid":32}]}

 $GPGLL,4002.10554,N,07531.20565,W,143253.00,A,A*7E

-{"class":"TPV","mode":3,"time":"2013-10-24T14:32:53.000Z","ept":0.005,"lat":40.035092333,"lon":-75.520094167,"alt":183.800,"epx":18.521,"epy":17.648,"epv":54.970,"track":0.0000,"speed":0.147,"climb":0.000,"eps":37.04,"epc":109.94}

+{"class":"TPV","mode":3,"time":"2013-10-24T14:32:53.000Z","ept":0.005,"lat":40.035092333,"lon":-75.520094167,"alt":183.800,"epx":18.521,"epy":17.648,"epe":55.860,"epv":54.970,"track":0.0000,"speed":0.147,"climb":0.000,"eps":37.04,"epc":109.94}

 $GPRMC,143254.00,A,4002.10571,N,07531.20555,W,0.420,,241013,,,A*67

 $GPVTG,,T,,M,0.420,N,0.778,K,A*2D

 $GPGGA,143254.00,4002.10571,N,07531.20555,W,1,07,1.72,183.8,M,-34.4,M,,*67

@@ -32,7 +32,7 @@ $GPGSV,3,2,11,09,27,201,18,11,25,054,12,17,55,292,28,20,30,116,14*7C
 $GPGSV,3,3,11,24,05,327,,28,84,072,33,32,23,078,27*45

 {"class":"SKY","xdop":1.23,"ydop":1.18,"vdop":2.39,"tdop":1.69,"hdop":1.72,"gdop":3.39,"pdop":2.94,"satellites":[{"PRN":1,"el":48,"az":51,"ss":27,"used":true,"gnssid":0,"svid":1},{"PRN":4,"el":20,"az":215,"ss":14,"used":false,"gnssid":0,"svid":4},{"PRN":7,"el":6,"az":177,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":31,"az":196,"ss":18,"used":true,"gnssid":0,"svid":8},{"PRN":9,"el":27,"az":201,"ss":18,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":25,"az":54,"ss":12,"used":true,"gnssid":0,"svid":11},{"PRN":17,"el":55,"az":292,"ss":28,"used":true,"gnssid":0,"svid":17},{"PRN":20,"el":30,"az":116,"ss":14,"used":false,"gnssid":0,"svid":20},{"PRN":24,"el":5,"az":327,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":28,"el":84,"az":72,"ss":33,"used":true,"gnssid":0,"svid":28},{"PRN":32,"el":23,"az":78,"ss":27,"used":true,"gnssid":0,"svid":32}]}

 $GPGLL,4002.10571,N,07531.20555,W,143254.00,A,A*7D

-{"class":"TPV","mode":3,"time":"2013-10-24T14:32:54.000Z","ept":0.005,"lat":40.035095167,"lon":-75.520092500,"alt":183.800,"epx":18.521,"epy":17.648,"epv":54.970,"track":0.0000,"speed":0.216,"climb":0.000,"eps":37.04,"epc":109.94}

+{"class":"TPV","mode":3,"time":"2013-10-24T14:32:54.000Z","ept":0.005,"lat":40.035095167,"lon":-75.520092500,"alt":183.800,"epx":18.521,"epy":17.648,"epe":55.860,"epv":54.970,"track":0.0000,"speed":0.216,"climb":0.000,"eps":37.04,"epc":109.94}

 $GPRMC,143255.00,A,4002.10556,N,07531.20541,W,0.260,,241013,,,A*64

 $GPVTG,,T,,M,0.260,N,0.482,K,A*29

 $GPGGA,143255.00,4002.10556,N,07531.20541,W,1,07,1.72,183.8,M,-34.4,M,,*66

@@ -42,7 +42,7 @@ $GPGSV,3,2,11,09,27,201,18,11,25,054,12,17,55,292,27,20,30,116,14*73
 $GPGSV,3,3,11,24,05,327,,28,84,072,33,32,23,078,27*45

 {"class":"SKY","xdop":1.23,"ydop":1.18,"vdop":2.39,"tdop":1.69,"hdop":1.72,"gdop":3.39,"pdop":2.94,"satellites":[{"PRN":1,"el":48,"az":51,"ss":27,"used":true,"gnssid":0,"svid":1},{"PRN":4,"el":20,"az":215,"ss":14,"used":false,"gnssid":0,"svid":4},{"PRN":7,"el":6,"az":177,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":31,"az":196,"ss":18,"used":true,"gnssid":0,"svid":8},{"PRN":9,"el":27,"az":201,"ss":18,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":25,"az":54,"ss":12,"used":true,"gnssid":0,"svid":11},{"PRN":17,"el":55,"az":292,"ss":27,"used":true,"gnssid":0,"svid":17},{"PRN":20,"el":30,"az":116,"ss":14,"used":false,"gnssid":0,"svid":20},{"PRN":24,"el":5,"az":327,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":28,"el":84,"az":72,"ss":33,"used":true,"gnssid":0,"svid":28},{"PRN":32,"el":23,"az":78,"ss":27,"used":true,"gnssid":0,"svid":32}]}

 $GPGLL,4002.10556,N,07531.20541,W,143255.00,A,A*7C

-{"class":"TPV","mode":3,"time":"2013-10-24T14:32:55.000Z","ept":0.005,"lat":40.035092667,"lon":-75.520090167,"alt":183.800,"epx":18.521,"epy":17.648,"epv":54.970,"track":0.0000,"speed":0.134,"climb":0.000,"eps":37.04,"epc":109.94}

+{"class":"TPV","mode":3,"time":"2013-10-24T14:32:55.000Z","ept":0.005,"lat":40.035092667,"lon":-75.520090167,"alt":183.800,"epx":18.521,"epy":17.648,"epe":55.860,"epv":54.970,"track":0.0000,"speed":0.134,"climb":0.000,"eps":37.04,"epc":109.94}

 $GPRMC,143256.00,A,4002.10529,N,07531.20534,W,0.034,,241013,,,A*6E

 $GPVTG,,T,,M,0.034,N,0.062,K,A*20

 $GPGGA,143256.00,4002.10529,N,07531.20534,W,1,07,1.72,183.7,M,-34.4,M,,*60

@@ -52,7 +52,7 @@ $GPGSV,3,2,11,09,27,201,18,11,25,054,14,17,55,292,28,20,30,116,13*7D
 $GPGSV,3,3,11,24,05,327,,28,84,072,33,32,23,078,27*45

 {"class":"SKY","xdop":1.23,"ydop":1.18,"vdop":2.39,"tdop":1.69,"hdop":1.72,"gdop":3.39,"pdop":2.94,"satellites":[{"PRN":1,"el":48,"az":51,"ss":27,"used":true,"gnssid":0,"svid":1},{"PRN":4,"el":20,"az":215,"ss":14,"used":false,"gnssid":0,"svid":4},{"PRN":7,"el":6,"az":177,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":31,"az":196,"ss":18,"used":true,"gnssid":0,"svid":8},{"PRN":9,"el":27,"az":201,"ss":18,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":25,"az":54,"ss":14,"used":true,"gnssid":0,"svid":11},{"PRN":17,"el":55,"az":292,"ss":28,"used":true,"gnssid":0,"svid":17},{"PRN":20,"el":30,"az":116,"ss":13,"used":false,"gnssid":0,"svid":20},{"PRN":24,"el":5,"az":327,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":28,"el":84,"az":72,"ss":33,"used":true,"gnssid":0,"svid":28},{"PRN":32,"el":23,"az":78,"ss":27,"used":true,"gnssid":0,"svid":32}]}

 $GPGLL,4002.10529,N,07531.20534,W,143256.00,A,A*75

-{"class":"TPV","mode":3,"time":"2013-10-24T14:32:56.000Z","ept":0.005,"lat":40.035088167,"lon":-75.520089000,"alt":183.700,"epx":18.521,"epy":17.648,"epv":54.970,"track":0.0000,"speed":0.017,"climb":-0.100,"eps":37.04,"epc":109.94}

+{"class":"TPV","mode":3,"time":"2013-10-24T14:32:56.000Z","ept":0.005,"lat":40.035088167,"lon":-75.520089000,"alt":183.700,"epx":18.521,"epy":17.648,"epe":55.860,"epv":54.970,"track":0.0000,"speed":0.017,"climb":-0.100,"eps":37.04,"epc":109.94}

 $GPRMC,143257.00,A,4002.10525,N,07531.20517,W,0.063,,241013,,,A*60

 $GPVTG,,T,,M,0.063,N,0.116,K,A*20

 $GPGGA,143257.00,4002.10525,N,07531.20517,W,1,07,1.72,183.6,M,-34.4,M,,*6D

@@ -62,7 +62,7 @@ $GPGSV,3,2,11,09,27,201,18,11,25,054,14,17,55,292,27,20,30,116,12*73
 $GPGSV,3,3,11,24,05,327,,28,84,072,33,32,23,078,27*45

 {"class":"SKY","xdop":1.23,"ydop":1.18,"vdop":2.39,"tdop":1.69,"hdop":1.72,"gdop":3.39,"pdop":2.94,"satellites":[{"PRN":1,"el":48,"az":51,"ss":27,"used":true,"gnssid":0,"svid":1},{"PRN":4,"el":20,"az":215,"ss":14,"used":false,"gnssid":0,"svid":4},{"PRN":7,"el":6,"az":177,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":31,"az":196,"ss":17,"used":true,"gnssid":0,"svid":8},{"PRN":9,"el":27,"az":201,"ss":18,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":25,"az":54,"ss":14,"used":true,"gnssid":0,"svid":11},{"PRN":17,"el":55,"az":292,"ss":27,"used":true,"gnssid":0,"svid":17},{"PRN":20,"el":30,"az":116,"ss":12,"used":false,"gnssid":0,"svid":20},{"PRN":24,"el":5,"az":327,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":28,"el":84,"az":72,"ss":33,"used":true,"gnssid":0,"svid":28},{"PRN":32,"el":23,"az":78,"ss":27,"used":true,"gnssid":0,"svid":32}]}

 $GPGLL,4002.10525,N,07531.20517,W,143257.00,A,A*79

-{"class":"TPV","mode":3,"time":"2013-10-24T14:32:57.000Z","ept":0.005,"lat":40.035087500,"lon":-75.520086167,"alt":183.600,"epx":18.521,"epy":17.648,"epv":54.970,"track":0.0000,"speed":0.032,"climb":-0.100,"eps":37.04,"epc":109.94}

+{"class":"TPV","mode":3,"time":"2013-10-24T14:32:57.000Z","ept":0.005,"lat":40.035087500,"lon":-75.520086167,"alt":183.600,"epx":18.521,"epy":17.648,"epe":55.860,"epv":54.970,"track":0.0000,"speed":0.032,"climb":-0.100,"eps":37.04,"epc":109.94}

 $GPRMC,143258.00,A,4002.10528,N,07531.20504,W,0.164,,241013,,,A*66

 $GPVTG,,T,,M,0.164,N,0.304,K,A*27

 $GPGGA,143258.00,4002.10528,N,07531.20504,W,1,07,1.72,183.5,M,-34.4,M,,*6E

@@ -72,7 +72,7 @@ $GPGSV,3,2,11,09,27,201,18,11,25,054,13,17,55,292,27,20,30,116,10*76
 $GPGSV,3,3,11,24,05,327,,28,84,072,33,32,23,078,26*44

 {"class":"SKY","xdop":1.23,"ydop":1.18,"vdop":2.39,"tdop":1.69,"hdop":1.72,"gdop":3.39,"pdop":2.94,"satellites":[{"PRN":1,"el":48,"az":51,"ss":27,"used":true,"gnssid":0,"svid":1},{"PRN":4,"el":20,"az":215,"ss":14,"used":false,"gnssid":0,"svid":4},{"PRN":7,"el":6,"az":177,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":31,"az":196,"ss":19,"used":true,"gnssid":0,"svid":8},{"PRN":9,"el":27,"az":201,"ss":18,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":25,"az":54,"ss":13,"used":true,"gnssid":0,"svid":11},{"PRN":17,"el":55,"az":292,"ss":27,"used":true,"gnssid":0,"svid":17},{"PRN":20,"el":30,"az":116,"ss":10,"used":false,"gnssid":0,"svid":20},{"PRN":24,"el":5,"az":327,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":28,"el":84,"az":72,"ss":33,"used":true,"gnssid":0,"svid":28},{"PRN":32,"el":23,"az":78,"ss":26,"used":true,"gnssid":0,"svid":32}]}

 $GPGLL,4002.10528,N,07531.20504,W,143258.00,A,A*79

-{"class":"TPV","mode":3,"time":"2013-10-24T14:32:58.000Z","ept":0.005,"lat":40.035088000,"lon":-75.520084000,"alt":183.500,"epx":18.521,"epy":17.648,"epv":54.970,"track":0.0000,"speed":0.084,"climb":-0.100,"eps":37.04,"epc":109.94}

+{"class":"TPV","mode":3,"time":"2013-10-24T14:32:58.000Z","ept":0.005,"lat":40.035088000,"lon":-75.520084000,"alt":183.500,"epx":18.521,"epy":17.648,"epe":55.860,"epv":54.970,"track":0.0000,"speed":0.084,"climb":-0.100,"eps":37.04,"epc":109.94}

 $GPRMC,143259.00,A,4002.10536,N,07531.20515,W,0.237,,241013,,,A*6D

 $GPVTG,,T,,M,0.237,N,0.440,K,A*25

 $GPGGA,143259.00,4002.10536,N,07531.20515,W,1,07,1.72,183.4,M,-34.4,M,,*61

@@ -82,7 +82,7 @@ $GPGSV,3,2,11,09,27,201,18,11,25,054,13,17,55,292,27,20,30,116,13*75
 $GPGSV,3,3,11,24,05,327,,28,84,072,33,32,23,078,26*44

 {"class":"SKY","xdop":1.23,"ydop":1.18,"vdop":2.38,"tdop":1.69,"hdop":1.72,"gdop":3.39,"pdop":2.94,"satellites":[{"PRN":1,"el":48,"az":51,"ss":27,"used":true,"gnssid":0,"svid":1},{"PRN":4,"el":20,"az":215,"ss":13,"used":false,"gnssid":0,"svid":4},{"PRN":7,"el":6,"az":177,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":31,"az":196,"ss":19,"used":true,"gnssid":0,"svid":8},{"PRN":9,"el":27,"az":201,"ss":18,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":25,"az":54,"ss":13,"used":true,"gnssid":0,"svid":11},{"PRN":17,"el":55,"az":292,"ss":27,"used":true,"gnssid":0,"svid":17},{"PRN":20,"el":30,"az":116,"ss":13,"used":false,"gnssid":0,"svid":20},{"PRN":24,"el":5,"az":327,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":28,"el":84,"az":72,"ss":33,"used":true,"gnssid":0,"svid":28},{"PRN":32,"el":23,"az":78,"ss":26,"used":true,"gnssid":0,"svid":32}]}

 $GPGLL,4002.10536,N,07531.20515,W,143259.00,A,A*77

-{"class":"TPV","mode":3,"time":"2013-10-24T14:32:59.000Z","ept":0.005,"lat":40.035089333,"lon":-75.520085833,"alt":183.400,"epx":18.521,"epy":17.648,"epv":54.970,"track":0.0000,"speed":0.122,"climb":-0.100,"eps":37.04,"epc":109.94}

+{"class":"TPV","mode":3,"time":"2013-10-24T14:32:59.000Z","ept":0.005,"lat":40.035089333,"lon":-75.520085833,"alt":183.400,"epx":18.521,"epy":17.648,"epe":55.860,"epv":54.970,"track":0.0000,"speed":0.122,"climb":-0.100,"eps":37.04,"epc":109.94}

 $GPRMC,143300.00,A,4002.10504,N,07531.20524,W,0.188,,241013,,,A*64

 $GPVTG,,T,,M,0.188,N,0.348,K,A*2D

 $GPGGA,143300.00,4002.10504,N,07531.20524,W,1,07,1.72,183.3,M,-34.4,M,,*68

@@ -92,4 +92,4 @@ $GPGSV,3,2,11,09,27,201,18,11,25,054,13,17,55,292,27,20,30,116,13*75
 $GPGSV,3,3,11,24,05,327,,28,84,072,33,32,23,078,26*44

 {"class":"SKY","xdop":1.23,"ydop":1.18,"vdop":2.38,"tdop":1.69,"hdop":1.72,"gdop":3.39,"pdop":2.94,"satellites":[{"PRN":1,"el":48,"az":51,"ss":27,"used":true,"gnssid":0,"svid":1},{"PRN":4,"el":20,"az":215,"ss":14,"used":false,"gnssid":0,"svid":4},{"PRN":7,"el":6,"az":177,"ss":0,"used":false,"gnssid":0,"svid":7},{"PRN":8,"el":31,"az":196,"ss":19,"used":true,"gnssid":0,"svid":8},{"PRN":9,"el":27,"az":201,"ss":18,"used":true,"gnssid":0,"svid":9},{"PRN":11,"el":25,"az":54,"ss":13,"used":true,"gnssid":0,"svid":11},{"PRN":17,"el":55,"az":292,"ss":27,"used":true,"gnssid":0,"svid":17},{"PRN":20,"el":30,"az":116,"ss":13,"used":false,"gnssid":0,"svid":20},{"PRN":24,"el":5,"az":327,"ss":0,"used":false,"gnssid":0,"svid":24},{"PRN":28,"el":84,"az":72,"ss":33,"used":true,"gnssid":0,"svid":28},{"PRN":32,"el":23,"az":78,"ss":26,"used":true,"gnssid":0,"svid":32}]}

 $GPGLL,4002.10504,N,07531.20524,W,143300.00,A,A*79

-{"class":"TPV","mode":3,"time":"2013-10-24T14:33:00.000Z","ept":0.005,"lat":40.035084000,"lon":-75.520087333,"alt":183.300,"epx":18.521,"epy":17.648,"epv":54.740,"track":0.0000,"speed":0.097,"climb":-0.100,"eps":37.04,"epc":109.71}

+{"class":"TPV","mode":3,"time":"2013-10-24T14:33:00.000Z","ept":0.005,"lat":40.035084000,"lon":-75.520087333,"alt":183.300,"epx":18.521,"epy":17.648,"epe":55.860,"epv":54.740,"track":0.0000,"speed":0.097,"climb":-0.100,"eps":37.04,"epc":109.71}