GREIS: Add gnssid:svid to skyview.

The GREIS->gnssid:svid looks different than the u-blox->gnssid:svid.

1 files changed, 10 insertions, 10 deletions

diff --git a/test/daemon/greis-test2.log.chk b/test/daemon/greis-test2.log.chk
index cd74dfbd..965bf1e8 100644
--- a/test/daemon/greis-test2.log.chk
+++ b/test/daemon/greis-test2.log.chk
@@ -3,40 +3,40 @@
 $GPGSV,2,1,07,01,-91,000,00,02,20,100,20,03,30,180,30,04,40,150,40*50
 $GPGSV,2,2,07,05,90,000,90,06,-91,-01,255,00,00,000,00*46
 {"class":"TPV","mode":3,"time":"2018-05-15T22:02:18.000Z","ept":0.005,"lat":44.068812095,"lon":-121.313997737,"alt":2000020.152,"track":10.1606,"speed":0.000,"climb":-3389.549,"ecefx":-3132489.00,"ecefy":-5149205.00,"ecefz":5804632.00,"ecefvx":9400.00,"ecefvy":10001.00,"ecefvz":9000.00,"ecefpAcc":50.00,"ecefvAcc":30.00}
-{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true},{"PRN":2,"el":20,"az":100,"ss":20,"used":true},{"PRN":3,"el":30,"az":180,"ss":30,"used":true},{"PRN":4,"el":40,"az":150,"ss":40,"used":true},{"PRN":5,"el":90,"az":0,"ss":90,"used":false},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true}]}
+{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true,"gnssid":0,"svid":1},{"PRN":2,"el":20,"az":100,"ss":20,"used":true,"gnssid":0,"svid":2},{"PRN":3,"el":30,"az":180,"ss":30,"used":true,"gnssid":0,"svid":3},{"PRN":4,"el":40,"az":150,"ss":40,"used":true,"gnssid":0,"svid":4},{"PRN":5,"el":90,"az":0,"ss":90,"used":false,"gnssid":0,"svid":5},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true,"gnssid":0,"svid":6}]}
 $GPGSV,2,1,07,01,-91,000,00,02,20,100,20,03,30,180,30,04,40,150,40*50
 $GPGSV,2,2,07,05,90,000,90,06,-91,-01,255,00,00,000,00*46
 {"class":"TPV","mode":3,"time":"2018-05-15T22:02:19.000Z","ept":0.005,"lat":44.068812095,"lon":-121.313997737,"alt":2000020.152,"track":10.1606,"speed":0.000,"climb":-3389.549,"ecefx":-3132489.00,"ecefy":-5149205.00,"ecefz":5804632.00,"ecefvx":9400.00,"ecefvy":10001.00,"ecefvz":9000.00,"ecefpAcc":50.00,"ecefvAcc":30.00}
-{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true},{"PRN":2,"el":20,"az":100,"ss":20,"used":true},{"PRN":3,"el":30,"az":180,"ss":30,"used":true},{"PRN":4,"el":40,"az":150,"ss":40,"used":true},{"PRN":5,"el":90,"az":0,"ss":90,"used":false},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true}]}
+{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true,"gnssid":0,"svid":1},{"PRN":2,"el":20,"az":100,"ss":20,"used":true,"gnssid":0,"svid":2},{"PRN":3,"el":30,"az":180,"ss":30,"used":true,"gnssid":0,"svid":3},{"PRN":4,"el":40,"az":150,"ss":40,"used":true,"gnssid":0,"svid":4},{"PRN":5,"el":90,"az":0,"ss":90,"used":false,"gnssid":0,"svid":5},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true,"gnssid":0,"svid":6}]}
 $GPGSV,2,1,07,01,-91,000,00,02,20,100,20,03,30,180,30,04,40,150,40*50
 $GPGSV,2,2,07,05,90,000,90,06,-91,-01,255,00,00,000,00*46
 {"class":"TPV","mode":3,"time":"2018-05-15T22:02:20.000Z","ept":0.005,"lat":44.068812095,"lon":-121.313997737,"alt":2000020.152,"track":10.1606,"speed":0.000,"climb":-3389.549,"ecefx":-3132489.00,"ecefy":-5149205.00,"ecefz":5804632.00,"ecefvx":9400.00,"ecefvy":10001.00,"ecefvz":9000.00,"ecefpAcc":50.00,"ecefvAcc":30.00}
-{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true},{"PRN":2,"el":20,"az":100,"ss":20,"used":true},{"PRN":3,"el":30,"az":180,"ss":30,"used":true},{"PRN":4,"el":40,"az":150,"ss":40,"used":true},{"PRN":5,"el":90,"az":0,"ss":90,"used":false},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true}]}
+{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true,"gnssid":0,"svid":1},{"PRN":2,"el":20,"az":100,"ss":20,"used":true,"gnssid":0,"svid":2},{"PRN":3,"el":30,"az":180,"ss":30,"used":true,"gnssid":0,"svid":3},{"PRN":4,"el":40,"az":150,"ss":40,"used":true,"gnssid":0,"svid":4},{"PRN":5,"el":90,"az":0,"ss":90,"used":false,"gnssid":0,"svid":5},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true,"gnssid":0,"svid":6}]}
 $GPGSV,2,1,07,01,-91,000,00,02,20,100,20,03,30,180,30,04,40,150,40*50
 $GPGSV,2,2,07,05,90,000,90,06,-91,-01,255,00,00,000,00*46
 {"class":"TPV","mode":3,"time":"2018-05-15T22:02:21.000Z","ept":0.005,"lat":44.068812095,"lon":-121.313997737,"alt":2000020.152,"track":10.1606,"speed":0.000,"climb":-3389.549,"ecefx":-3132489.00,"ecefy":-5149205.00,"ecefz":5804632.00,"ecefvx":9400.00,"ecefvy":10001.00,"ecefvz":9000.00,"ecefpAcc":50.00,"ecefvAcc":30.00}
-{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true},{"PRN":2,"el":20,"az":100,"ss":20,"used":true},{"PRN":3,"el":30,"az":180,"ss":30,"used":true},{"PRN":4,"el":40,"az":150,"ss":40,"used":true},{"PRN":5,"el":90,"az":0,"ss":90,"used":false},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true}]}
+{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true,"gnssid":0,"svid":1},{"PRN":2,"el":20,"az":100,"ss":20,"used":true,"gnssid":0,"svid":2},{"PRN":3,"el":30,"az":180,"ss":30,"used":true,"gnssid":0,"svid":3},{"PRN":4,"el":40,"az":150,"ss":40,"used":true,"gnssid":0,"svid":4},{"PRN":5,"el":90,"az":0,"ss":90,"used":false,"gnssid":0,"svid":5},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true,"gnssid":0,"svid":6}]}
 $GPGSV,2,1,07,01,-91,000,00,02,20,100,20,03,30,180,30,04,40,150,40*50
 $GPGSV,2,2,07,05,90,000,90,06,-91,-01,255,00,00,000,00*46
 {"class":"TPV","mode":3,"time":"2018-05-15T22:02:22.000Z","ept":0.005,"lat":44.068812095,"lon":-121.313997737,"alt":2000020.152,"track":10.1606,"speed":0.000,"climb":-3389.549,"ecefx":-3132489.00,"ecefy":-5149205.00,"ecefz":5804632.00,"ecefvx":9400.00,"ecefvy":10001.00,"ecefvz":9000.00,"ecefpAcc":50.00,"ecefvAcc":30.00}
-{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true},{"PRN":2,"el":20,"az":100,"ss":20,"used":true},{"PRN":3,"el":30,"az":180,"ss":30,"used":true},{"PRN":4,"el":40,"az":150,"ss":40,"used":true},{"PRN":5,"el":90,"az":0,"ss":90,"used":false},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true}]}
+{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true,"gnssid":0,"svid":1},{"PRN":2,"el":20,"az":100,"ss":20,"used":true,"gnssid":0,"svid":2},{"PRN":3,"el":30,"az":180,"ss":30,"used":true,"gnssid":0,"svid":3},{"PRN":4,"el":40,"az":150,"ss":40,"used":true,"gnssid":0,"svid":4},{"PRN":5,"el":90,"az":0,"ss":90,"used":false,"gnssid":0,"svid":5},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true,"gnssid":0,"svid":6}]}
 $GPGSV,2,1,07,01,-91,000,00,02,20,100,20,03,30,180,30,04,40,150,40*50
 $GPGSV,2,2,07,05,90,000,90,06,-91,-01,255,00,00,000,00*46
 {"class":"TPV","mode":3,"time":"2018-05-15T22:02:23.000Z","ept":0.005,"lat":44.068812095,"lon":-121.313997737,"alt":2000020.152,"track":10.1606,"speed":0.000,"climb":-3389.549,"ecefx":-3132489.00,"ecefy":-5149205.00,"ecefz":5804632.00,"ecefvx":9400.00,"ecefvy":10001.00,"ecefvz":9000.00,"ecefpAcc":50.00,"ecefvAcc":30.00}
-{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true},{"PRN":2,"el":20,"az":100,"ss":20,"used":true},{"PRN":3,"el":30,"az":180,"ss":30,"used":true},{"PRN":4,"el":40,"az":150,"ss":40,"used":true},{"PRN":5,"el":90,"az":0,"ss":90,"used":false},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true}]}
+{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true,"gnssid":0,"svid":1},{"PRN":2,"el":20,"az":100,"ss":20,"used":true,"gnssid":0,"svid":2},{"PRN":3,"el":30,"az":180,"ss":30,"used":true,"gnssid":0,"svid":3},{"PRN":4,"el":40,"az":150,"ss":40,"used":true,"gnssid":0,"svid":4},{"PRN":5,"el":90,"az":0,"ss":90,"used":false,"gnssid":0,"svid":5},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true,"gnssid":0,"svid":6}]}
 $GPGSV,2,1,07,01,-91,000,00,02,20,100,20,03,30,180,30,04,40,150,40*50
 $GPGSV,2,2,07,05,90,000,90,06,-91,-01,255,00,00,000,00*46
 {"class":"TPV","mode":3,"time":"2018-05-15T22:02:24.000Z","ept":0.005,"lat":44.068812095,"lon":-121.313997737,"alt":2000020.152,"track":10.1606,"speed":0.000,"climb":-3389.549,"ecefx":-3132489.00,"ecefy":-5149205.00,"ecefz":5804632.00,"ecefvx":9400.00,"ecefvy":10001.00,"ecefvz":9000.00,"ecefpAcc":50.00,"ecefvAcc":30.00}
-{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true},{"PRN":2,"el":20,"az":100,"ss":20,"used":true},{"PRN":3,"el":30,"az":180,"ss":30,"used":true},{"PRN":4,"el":40,"az":150,"ss":40,"used":true},{"PRN":5,"el":90,"az":0,"ss":90,"used":false},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true}]}
+{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true,"gnssid":0,"svid":1},{"PRN":2,"el":20,"az":100,"ss":20,"used":true,"gnssid":0,"svid":2},{"PRN":3,"el":30,"az":180,"ss":30,"used":true,"gnssid":0,"svid":3},{"PRN":4,"el":40,"az":150,"ss":40,"used":true,"gnssid":0,"svid":4},{"PRN":5,"el":90,"az":0,"ss":90,"used":false,"gnssid":0,"svid":5},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true,"gnssid":0,"svid":6}]}
 $GPGSV,2,1,07,01,-91,000,00,02,20,100,20,03,30,180,30,04,40,150,40*50
 $GPGSV,2,2,07,05,90,000,90,06,-91,-01,255,00,00,000,00*46
 {"class":"TPV","mode":3,"time":"2018-05-15T22:02:25.000Z","ept":0.005,"lat":44.068812095,"lon":-121.313997737,"alt":2000020.152,"track":10.1606,"speed":0.000,"climb":-3389.549,"ecefx":-3132489.00,"ecefy":-5149205.00,"ecefz":5804632.00,"ecefvx":9400.00,"ecefvy":10001.00,"ecefvz":9000.00,"ecefpAcc":50.00,"ecefvAcc":30.00}
-{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true},{"PRN":2,"el":20,"az":100,"ss":20,"used":true},{"PRN":3,"el":30,"az":180,"ss":30,"used":true},{"PRN":4,"el":40,"az":150,"ss":40,"used":true},{"PRN":5,"el":90,"az":0,"ss":90,"used":false},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true}]}
+{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true,"gnssid":0,"svid":1},{"PRN":2,"el":20,"az":100,"ss":20,"used":true,"gnssid":0,"svid":2},{"PRN":3,"el":30,"az":180,"ss":30,"used":true,"gnssid":0,"svid":3},{"PRN":4,"el":40,"az":150,"ss":40,"used":true,"gnssid":0,"svid":4},{"PRN":5,"el":90,"az":0,"ss":90,"used":false,"gnssid":0,"svid":5},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true,"gnssid":0,"svid":6}]}
 $GPGSV,2,1,07,01,-91,000,00,02,20,100,20,03,30,180,30,04,40,150,40*50
 $GPGSV,2,2,07,05,90,000,90,06,-91,-01,255,00,00,000,00*46
 {"class":"TPV","mode":3,"time":"2018-05-15T22:02:26.000Z","ept":0.005,"lat":44.068812095,"lon":-121.313997737,"alt":2000020.152,"track":10.1606,"speed":0.000,"climb":-3389.549,"ecefx":-3132489.00,"ecefy":-5149205.00,"ecefz":5804632.00,"ecefvx":9400.00,"ecefvy":10001.00,"ecefvz":9000.00,"ecefpAcc":50.00,"ecefvAcc":30.00}
-{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true},{"PRN":2,"el":20,"az":100,"ss":20,"used":true},{"PRN":3,"el":30,"az":180,"ss":30,"used":true},{"PRN":4,"el":40,"az":150,"ss":40,"used":true},{"PRN":5,"el":90,"az":0,"ss":90,"used":false},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true}]}
+{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true,"gnssid":0,"svid":1},{"PRN":2,"el":20,"az":100,"ss":20,"used":true,"gnssid":0,"svid":2},{"PRN":3,"el":30,"az":180,"ss":30,"used":true,"gnssid":0,"svid":3},{"PRN":4,"el":40,"az":150,"ss":40,"used":true,"gnssid":0,"svid":4},{"PRN":5,"el":90,"az":0,"ss":90,"used":false,"gnssid":0,"svid":5},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true,"gnssid":0,"svid":6}]}
 $GPGSV,2,1,07,01,-91,000,00,02,20,100,20,03,30,180,30,04,40,150,40*50
 $GPGSV,2,2,07,05,90,000,90,06,-91,-01,255,00,00,000,00*46
 {"class":"TPV","mode":3,"time":"2018-05-15T22:02:27.000Z","ept":0.005,"lat":44.068812095,"lon":-121.313997737,"alt":2000020.152,"track":10.1606,"speed":0.000,"climb":-3389.549,"ecefx":-3132489.00,"ecefy":-5149205.00,"ecefz":5804632.00,"ecefvx":9400.00,"ecefvy":10001.00,"ecefvz":9000.00,"ecefpAcc":50.00,"ecefvAcc":30.00}
-{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true},{"PRN":2,"el":20,"az":100,"ss":20,"used":true},{"PRN":3,"el":30,"az":180,"ss":30,"used":true},{"PRN":4,"el":40,"az":150,"ss":40,"used":true},{"PRN":5,"el":90,"az":0,"ss":90,"used":false},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true}]}
+{"class":"SKY","satellites":[{"PRN":1,"el":-91,"az":0,"ss":0,"used":true,"gnssid":0,"svid":1},{"PRN":2,"el":20,"az":100,"ss":20,"used":true,"gnssid":0,"svid":2},{"PRN":3,"el":30,"az":180,"ss":30,"used":true,"gnssid":0,"svid":3},{"PRN":4,"el":40,"az":150,"ss":40,"used":true,"gnssid":0,"svid":4},{"PRN":5,"el":90,"az":0,"ss":90,"used":false,"gnssid":0,"svid":5},{"PRN":6,"el":-91,"az":-1,"ss":255,"used":true,"gnssid":0,"svid":6}]}