gps.h: remove wrong SBAS_PRN()

This macro was wrong, and causing valid sats to not be included in
the COP calculations.

1 files changed, 6 insertions, 6 deletions

diff --git a/test/daemon/ublox-aek-4t.log.chk b/test/daemon/ublox-aek-4t.log.chk
index c69c3128..6bf61cf2 100644
--- a/test/daemon/ublox-aek-4t.log.chk
+++ b/test/daemon/ublox-aek-4t.log.chk
@@ -5,25 +5,25 @@ $GPGSA,A,3,,,,,,,,,,,,,,,*1C
 {"class":"TPV","status":2,"mode":3,"time":"2007-12-23T23:11:18.999Z","ept":0.005,"lat":20.629282026,"lon":-87.068075525,"alt":75.777,"track":0.0000,"speed":0.000,"climb":0.000,"eps":0.17,"ecefx":305449.31,"ecefy":-5963890.99,"ecefz":2233051.73,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":0.00,"ecefpAcc":2.80,"ecefvAcc":0.17}

 $GPGSV,2,1,08,15,67,141,32,02,21,089,31,30,21,234,50,05,18,217,40*7C

 $GPGSV,2,2,08,12,16,201,41,18,25,255,41,135,33,251,45,06,54,308,24*40

-{"class":"SKY","xdop":0.79,"ydop":1.64,"vdop":2.00,"tdop":1.33,"hdop":1.67,"gdop":2.92,"pdop":2.60,"satellites":[{"PRN":15,"el":67,"az":141,"ss":32,"used":true,"gnssid":0,"svid":15},{"PRN":2,"el":21,"az":89,"ss":31,"used":true,"gnssid":0,"svid":2},{"PRN":30,"el":21,"az":234,"ss":50,"used":true,"gnssid":0,"svid":30},{"PRN":5,"el":18,"az":217,"ss":40,"used":true,"gnssid":0,"svid":5},{"PRN":12,"el":16,"az":201,"ss":41,"used":true,"gnssid":0,"svid":12},{"PRN":18,"el":25,"az":255,"ss":41,"used":true,"gnssid":0,"svid":18},{"PRN":135,"el":33,"az":251,"ss":45,"used":true},{"PRN":6,"el":54,"az":308,"ss":24,"used":false,"gnssid":0,"svid":6}]}

+{"class":"SKY","xdop":0.69,"ydop":1.52,"vdop":2.00,"tdop":1.33,"hdop":1.67,"gdop":2.92,"pdop":2.60,"satellites":[{"PRN":15,"el":67,"az":141,"ss":32,"used":true,"gnssid":0,"svid":15},{"PRN":2,"el":21,"az":89,"ss":31,"used":true,"gnssid":0,"svid":2},{"PRN":30,"el":21,"az":234,"ss":50,"used":true,"gnssid":0,"svid":30},{"PRN":5,"el":18,"az":217,"ss":40,"used":true,"gnssid":0,"svid":5},{"PRN":12,"el":16,"az":201,"ss":41,"used":true,"gnssid":0,"svid":12},{"PRN":18,"el":25,"az":255,"ss":41,"used":true,"gnssid":0,"svid":18},{"PRN":135,"el":33,"az":251,"ss":45,"used":true},{"PRN":6,"el":54,"az":308,"ss":24,"used":false,"gnssid":0,"svid":6}]}

 $GPZDA,231125.00,23,12,2007,00,00*67

 $GPGGA,231124,2037.7569,N,08704.0845,W,2,07,1.67,75.76,M,-13.865,M,,*4D

 $GPRMC,231124,A,2037.7569,N,08704.0845,W,0.0000,0.000,231207,,*34

 $GPGSA,A,3,15,2,30,5,12,18,135,,,,,,2.6,1.7,2.0*0F

-{"class":"TPV","status":2,"mode":3,"time":"2007-12-23T23:11:24.999Z","ept":0.005,"lat":20.629281973,"lon":-87.068075520,"alt":75.764,"epx":2.973,"epy":6.138,"epv":11.500,"track":0.0000,"speed":0.000,"climb":0.000,"eps":0.17,"epc":4.60,"ecefx":305449.31,"ecefy":-5963890.98,"ecefz":2233051.72,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":0.00,"ecefpAcc":2.80,"ecefvAcc":0.17}

+{"class":"TPV","status":2,"mode":3,"time":"2007-12-23T23:11:24.999Z","ept":0.005,"lat":20.629281973,"lon":-87.068075520,"alt":75.764,"epx":2.588,"epy":5.690,"epv":11.500,"track":0.0000,"speed":0.000,"climb":0.000,"eps":0.17,"epc":4.60,"ecefx":305449.31,"ecefy":-5963890.98,"ecefz":2233051.72,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":0.00,"ecefpAcc":2.80,"ecefvAcc":0.17}

 $GPGSV,2,1,08,15,67,141,32,02,21,089,32,30,21,234,50,05,18,217,40*7F

 $GPGSV,2,2,08,12,16,201,41,18,25,255,41,135,33,251,45,06,54,308,25*41

-{"class":"SKY","xdop":0.79,"ydop":1.64,"vdop":1.99,"tdop":1.33,"hdop":1.67,"gdop":2.92,"pdop":2.60,"satellites":[{"PRN":15,"el":67,"az":141,"ss":32,"used":true,"gnssid":0,"svid":15},{"PRN":2,"el":21,"az":89,"ss":32,"used":true,"gnssid":0,"svid":2},{"PRN":30,"el":21,"az":234,"ss":50,"used":true,"gnssid":0,"svid":30},{"PRN":5,"el":18,"az":217,"ss":40,"used":true,"gnssid":0,"svid":5},{"PRN":12,"el":16,"az":201,"ss":41,"used":true,"gnssid":0,"svid":12},{"PRN":18,"el":25,"az":255,"ss":41,"used":true,"gnssid":0,"svid":18},{"PRN":135,"el":33,"az":251,"ss":45,"used":true},{"PRN":6,"el":54,"az":308,"ss":25,"used":false,"gnssid":0,"svid":6}]}

+{"class":"SKY","xdop":0.69,"ydop":1.52,"vdop":1.99,"tdop":1.33,"hdop":1.67,"gdop":2.92,"pdop":2.60,"satellites":[{"PRN":15,"el":67,"az":141,"ss":32,"used":true,"gnssid":0,"svid":15},{"PRN":2,"el":21,"az":89,"ss":32,"used":true,"gnssid":0,"svid":2},{"PRN":30,"el":21,"az":234,"ss":50,"used":true,"gnssid":0,"svid":30},{"PRN":5,"el":18,"az":217,"ss":40,"used":true,"gnssid":0,"svid":5},{"PRN":12,"el":16,"az":201,"ss":41,"used":true,"gnssid":0,"svid":12},{"PRN":18,"el":25,"az":255,"ss":41,"used":true,"gnssid":0,"svid":18},{"PRN":135,"el":33,"az":251,"ss":45,"used":true},{"PRN":6,"el":54,"az":308,"ss":25,"used":false,"gnssid":0,"svid":6}]}

 $GPZDA,231126.00,23,12,2007,00,00*64

 $GPGGA,231125,2037.7569,N,08704.0845,W,2,07,1.67,75.76,M,-13.865,M,,*4C

 $GPRMC,231125,A,2037.7569,N,08704.0845,W,0.0000,0.000,231207,,*35

 $GPGSA,A,3,15,2,30,5,12,18,135,,,,,,2.6,1.7,2.0*0F

-{"class":"TPV","status":2,"mode":3,"time":"2007-12-23T23:11:25.999Z","ept":0.005,"lat":20.629281802,"lon":-87.068075424,"alt":75.757,"epx":2.973,"epy":6.138,"epv":11.500,"track":0.0000,"speed":0.000,"climb":0.000,"eps":0.17,"epc":4.60,"ecefx":305449.32,"ecefy":-5963890.98,"ecefz":2233051.70,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":0.00,"ecefpAcc":2.80,"ecefvAcc":0.17}

+{"class":"TPV","status":2,"mode":3,"time":"2007-12-23T23:11:25.999Z","ept":0.005,"lat":20.629281802,"lon":-87.068075424,"alt":75.757,"epx":2.588,"epy":5.690,"epv":11.500,"track":0.0000,"speed":0.000,"climb":0.000,"eps":0.17,"epc":4.60,"ecefx":305449.32,"ecefy":-5963890.98,"ecefz":2233051.70,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":0.00,"ecefpAcc":2.80,"ecefvAcc":0.17}

 $GPGSV,2,1,08,15,67,141,33,02,21,089,33,30,21,234,50,05,18,217,40*7F

 $GPGSV,2,2,08,12,16,201,41,18,25,255,41,135,33,251,45,06,54,308,24*40

-{"class":"SKY","xdop":0.79,"ydop":1.64,"vdop":1.99,"tdop":1.33,"hdop":1.67,"gdop":2.92,"pdop":2.60,"satellites":[{"PRN":15,"el":67,"az":141,"ss":33,"used":true,"gnssid":0,"svid":15},{"PRN":2,"el":21,"az":89,"ss":33,"used":true,"gnssid":0,"svid":2},{"PRN":30,"el":21,"az":234,"ss":50,"used":true,"gnssid":0,"svid":30},{"PRN":5,"el":18,"az":217,"ss":40,"used":true,"gnssid":0,"svid":5},{"PRN":12,"el":16,"az":201,"ss":41,"used":true,"gnssid":0,"svid":12},{"PRN":18,"el":25,"az":255,"ss":41,"used":true,"gnssid":0,"svid":18},{"PRN":135,"el":33,"az":251,"ss":45,"used":true},{"PRN":6,"el":54,"az":308,"ss":24,"used":false,"gnssid":0,"svid":6}]}

+{"class":"SKY","xdop":0.69,"ydop":1.52,"vdop":1.99,"tdop":1.33,"hdop":1.67,"gdop":2.92,"pdop":2.60,"satellites":[{"PRN":15,"el":67,"az":141,"ss":33,"used":true,"gnssid":0,"svid":15},{"PRN":2,"el":21,"az":89,"ss":33,"used":true,"gnssid":0,"svid":2},{"PRN":30,"el":21,"az":234,"ss":50,"used":true,"gnssid":0,"svid":30},{"PRN":5,"el":18,"az":217,"ss":40,"used":true,"gnssid":0,"svid":5},{"PRN":12,"el":16,"az":201,"ss":41,"used":true,"gnssid":0,"svid":12},{"PRN":18,"el":25,"az":255,"ss":41,"used":true,"gnssid":0,"svid":18},{"PRN":135,"el":33,"az":251,"ss":45,"used":true},{"PRN":6,"el":54,"az":308,"ss":24,"used":false,"gnssid":0,"svid":6}]}

 $GPZDA,231127.00,23,12,2007,00,00*65

 $GPGGA,231126,2037.7569,N,08704.0845,W,2,07,1.67,75.75,M,-13.865,M,,*4C

 $GPRMC,231126,A,2037.7569,N,08704.0845,W,0.0000,0.000,231207,,*36

 $GPGSA,A,3,15,2,30,5,12,18,135,,,,,,2.6,1.7,2.0*0F

-{"class":"TPV","status":2,"mode":3,"time":"2007-12-23T23:11:26.999Z","ept":0.005,"lat":20.629281718,"lon":-87.068075424,"alt":75.754,"epx":2.973,"epy":6.138,"epv":11.500,"track":0.0000,"speed":0.000,"climb":0.000,"eps":0.17,"epc":4.60,"ecefx":305449.32,"ecefy":-5963890.98,"ecefz":2233051.69,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":0.00,"ecefpAcc":2.80,"ecefvAcc":0.17}

+{"class":"TPV","status":2,"mode":3,"time":"2007-12-23T23:11:26.999Z","ept":0.005,"lat":20.629281718,"lon":-87.068075424,"alt":75.754,"epx":2.588,"epy":5.690,"epv":11.500,"track":0.0000,"speed":0.000,"climb":0.000,"eps":0.17,"epc":4.60,"ecefx":305449.32,"ecefy":-5963890.98,"ecefz":2233051.69,"ecefvx":0.00,"ecefvy":0.00,"ecefvz":0.00,"ecefpAcc":2.80,"ecefvAcc":0.17}