diff options
author | Eric S. Raymond <esr@thyrsus.com> | 2010-04-11 10:28:15 -0400 |
---|---|---|
committer | Eric S. Raymond <esr@thyrsus.com> | 2010-04-11 10:28:15 -0400 |
commit | a3a772ecd97b005178a4c618d1707919d894f28c (patch) | |
tree | ec24176269628ec1e8178edc6123471563e71bcd | |
parent | eecdccfee641d13424deebc6524c9e0ae5c1030d (diff) | |
download | gpsd-a3a772ecd97b005178a4c618d1707919d894f28c.tar.gz |
Shorten some names for concision, and make C names match JSON names.
All regression tests pass.
-rw-r--r-- | driver_nmea.c | 36 | ||||
-rw-r--r-- | gps.h | 18 | ||||
-rw-r--r-- | gpsd_json.c | 38 | ||||
-rw-r--r-- | libgps_json.c | 18 | ||||
-rw-r--r-- | test/daemon/tnt-revolution.log.chk | 100 |
5 files changed, 105 insertions, 105 deletions
diff --git a/driver_nmea.c b/driver_nmea.c index bd7acd23..33a49ee8 100644 --- a/driver_nmea.c +++ b/driver_nmea.c @@ -694,14 +694,14 @@ static gps_mask_t processTNTHTM(int c UNUSED, char *field[], struct gps_device_t session->gpsdata.attitude.yaw = NAN; session->gpsdata.attitude.yaw_st = '\0'; session->gpsdata.attitude.dip = atof(field[7]); - session->gpsdata.attitude.magnetic_length = NAN; - session->gpsdata.attitude.magnetic_field_x = atof(field[8]); - session->gpsdata.attitude.magnetic_field_y = NAN; - session->gpsdata.attitude.magnetic_field_z = NAN; - session->gpsdata.attitude.acceleration_length = NAN; - session->gpsdata.attitude.acceleration_x = NAN; - session->gpsdata.attitude.acceleration_y = NAN; - session->gpsdata.attitude.acceleration_z = NAN; + session->gpsdata.attitude.mag_len = NAN; + session->gpsdata.attitude.mag_x = atof(field[8]); + session->gpsdata.attitude.mag_y = NAN; + session->gpsdata.attitude.mag_z = NAN; + session->gpsdata.attitude.acc_len = NAN; + session->gpsdata.attitude.acc_x = NAN; + session->gpsdata.attitude.acc_y = NAN; + session->gpsdata.attitude.acc_z = NAN; session->gpsdata.attitude.gyro_x = NAN; session->gpsdata.attitude.gyro_y = NAN; mask |= (ATT_IS); @@ -725,7 +725,7 @@ static gps_mask_t processOHPR(int c UNUSED, char *field[], struct gps_device_t * 1. Azimuth 2. Pitch Angle 3. Roll Angle - 4. Sensor temperature, degrees centigrade + 4. Sensor temp, degrees centigrade 5. Depth (feet) 6. Magnetic Vector Length 7-9. 3 axis Magnetic Field readings x,y,z @@ -749,16 +749,16 @@ static gps_mask_t processOHPR(int c UNUSED, char *field[], struct gps_device_t * session->gpsdata.attitude.yaw = '\0'; session->gpsdata.attitude.yaw_st = '\0'; session->gpsdata.attitude.dip = NAN; - session->gpsdata.attitude.temperature = atof(field[4]); + session->gpsdata.attitude.temp = atof(field[4]); session->gpsdata.attitude.depth = atof(field[5]) / METERS_TO_FEET; - session->gpsdata.attitude.magnetic_length = atof(field[6]); - session->gpsdata.attitude.magnetic_field_x = atof(field[7]); - session->gpsdata.attitude.magnetic_field_y = atof(field[8]); - session->gpsdata.attitude.magnetic_field_z = atof(field[9]); - session->gpsdata.attitude.acceleration_length = atof(field[10]); - session->gpsdata.attitude.acceleration_x = atof(field[11]); - session->gpsdata.attitude.acceleration_y = atof(field[12]); - session->gpsdata.attitude.acceleration_z = atof(field[13]); + session->gpsdata.attitude.mag_len = atof(field[6]); + session->gpsdata.attitude.mag_x = atof(field[7]); + session->gpsdata.attitude.mag_y = atof(field[8]); + session->gpsdata.attitude.mag_z = atof(field[9]); + session->gpsdata.attitude.acc_len = atof(field[10]); + session->gpsdata.attitude.acc_x = atof(field[11]); + session->gpsdata.attitude.acc_y = atof(field[12]); + session->gpsdata.attitude.acc_z = atof(field[13]); session->gpsdata.attitude.gyro_x = atof(field[15]); session->gpsdata.attitude.gyro_y = atof(field[16]); mask |= (ALTITUDE_IS); @@ -834,17 +834,17 @@ struct attitude_t { double roll; double yaw; double dip; - double magnetic_length; /* unitvector sqrt(x^2 + y^2 +z^2) */ - double magnetic_field_x; - double magnetic_field_y; - double magnetic_field_z; - double acceleration_length; /* unitvector sqrt(x^2 + y^2 +z^2) */ - double acceleration_x; - double acceleration_y; - double acceleration_z; + double mag_len; /* unitvector sqrt(x^2 + y^2 +z^2) */ + double mag_x; + double mag_y; + double mag_z; + double acc_len; /* unitvector sqrt(x^2 + y^2 +z^2) */ + double acc_x; + double acc_y; + double acc_z; double gyro_x; double gyro_y; - double temperature; + double temp; double depth; /* compass status -- TrueNorth (and any similar) devices only */ char mag_st; diff --git a/gpsd_json.c b/gpsd_json.c index cd148be1..4fc59435 100644 --- a/gpsd_json.c +++ b/gpsd_json.c @@ -1421,47 +1421,47 @@ void json_att_dump(const struct gps_data_t *gpsdata, "\"dip\":%.3f,", gpsdata->attitude.dip); - if (isnan(gpsdata->attitude.magnetic_length)==0) + if (isnan(gpsdata->attitude.mag_len)==0) (void)snprintf(reply+strlen(reply), replylen-strlen(reply), "\"mag_len\":%.3f,", - gpsdata->attitude.magnetic_length); - if (isnan(gpsdata->attitude.magnetic_field_x)==0) + gpsdata->attitude.mag_len); + if (isnan(gpsdata->attitude.mag_x)==0) (void)snprintf(reply+strlen(reply), replylen-strlen(reply), "\"mag_x\":%.3f,", - gpsdata->attitude.magnetic_field_x); - if (isnan(gpsdata->attitude.magnetic_field_y)==0) + gpsdata->attitude.mag_x); + if (isnan(gpsdata->attitude.mag_y)==0) (void)snprintf(reply+strlen(reply), replylen-strlen(reply), "\"mag_y\":%.3f,", - gpsdata->attitude.magnetic_field_y); - if (isnan(gpsdata->attitude.magnetic_field_z)==0) + gpsdata->attitude.mag_y); + if (isnan(gpsdata->attitude.mag_z)==0) (void)snprintf(reply+strlen(reply), replylen-strlen(reply), "\"mag_z\":%.3f,", - gpsdata->attitude.magnetic_field_z); + gpsdata->attitude.mag_z); - if (isnan(gpsdata->attitude.acceleration_length)==0) + if (isnan(gpsdata->attitude.acc_len)==0) (void)snprintf(reply+strlen(reply), replylen-strlen(reply), "\"acc_len\":%.3f,", - gpsdata->attitude.acceleration_length); - if (isnan(gpsdata->attitude.acceleration_x)==0) + gpsdata->attitude.acc_len); + if (isnan(gpsdata->attitude.acc_x)==0) (void)snprintf(reply+strlen(reply), replylen-strlen(reply), "\"acc_x\":%.3f,", - gpsdata->attitude.acceleration_x); - if (isnan(gpsdata->attitude.acceleration_y)==0) + gpsdata->attitude.acc_x); + if (isnan(gpsdata->attitude.acc_y)==0) (void)snprintf(reply+strlen(reply), replylen-strlen(reply), "\"acc_y\":%.3f,", - gpsdata->attitude.acceleration_y); - if (isnan(gpsdata->attitude.acceleration_z)==0) + gpsdata->attitude.acc_y); + if (isnan(gpsdata->attitude.acc_z)==0) (void)snprintf(reply+strlen(reply), replylen-strlen(reply), "\"acc_z\":%.3f,", - gpsdata->attitude.acceleration_z); + gpsdata->attitude.acc_z); if (isnan(gpsdata->attitude.gyro_x)==0) (void)snprintf(reply+strlen(reply), @@ -1474,11 +1474,11 @@ void json_att_dump(const struct gps_data_t *gpsdata, "\"gyro_y\":%.3f,", gpsdata->attitude.gyro_y); - if (isnan(gpsdata->attitude.temperature)==0) + if (isnan(gpsdata->attitude.temp)==0) (void)snprintf(reply+strlen(reply), replylen-strlen(reply), - "\"temperature\":%.3f,", - gpsdata->attitude.temperature); + "\"temp\":%.3f,", + gpsdata->attitude.temp); if (isnan(gpsdata->attitude.depth)==0) (void)snprintf(reply+strlen(reply), replylen-strlen(reply), diff --git a/libgps_json.c b/libgps_json.c index 7227fc91..2d8a8b38 100644 --- a/libgps_json.c +++ b/libgps_json.c @@ -202,28 +202,28 @@ static int json_att_read(const char *buf, .dflt.real = NAN}, {"yaw_st", t_character, .addr.character = &gpsdata->attitude.yaw_st}, - {"mag_len", t_real, .addr.real = &gpsdata->attitude.magnetic_length, + {"mag_len", t_real, .addr.real = &gpsdata->attitude.mag_len, .dflt.real = NAN}, - {"mag_x", t_real, .addr.real = &gpsdata->attitude.magnetic_field_x, + {"mag_x", t_real, .addr.real = &gpsdata->attitude.mag_x, .dflt.real = NAN}, - {"mag_y", t_real, .addr.real = &gpsdata->attitude.magnetic_field_y, + {"mag_y", t_real, .addr.real = &gpsdata->attitude.mag_y, .dflt.real = NAN}, - {"mag_z", t_real, .addr.real = &gpsdata->attitude.magnetic_field_z, + {"mag_z", t_real, .addr.real = &gpsdata->attitude.mag_z, .dflt.real = NAN}, - {"acc_len", t_real, .addr.real = &gpsdata->attitude.acceleration_length, + {"acc_len", t_real, .addr.real = &gpsdata->attitude.acc_len, .dflt.real = NAN}, - {"acc_x", t_real, .addr.real = &gpsdata->attitude.acceleration_x, + {"acc_x", t_real, .addr.real = &gpsdata->attitude.acc_x, .dflt.real = NAN}, - {"acc_y", t_real, .addr.real = &gpsdata->attitude.acceleration_y, + {"acc_y", t_real, .addr.real = &gpsdata->attitude.acc_y, .dflt.real = NAN}, - {"acc_z", t_real, .addr.real = &gpsdata->attitude.acceleration_z, + {"acc_z", t_real, .addr.real = &gpsdata->attitude.acc_z, .dflt.real = NAN}, {"gyro_x", t_real, .addr.real = &gpsdata->attitude.gyro_x, .dflt.real = NAN}, {"gyro_y", t_real, .addr.real = &gpsdata->attitude.gyro_y, .dflt.real = NAN}, - {"temperature", t_real, .addr.real = &gpsdata->attitude.temperature, + {"temp", t_real, .addr.real = &gpsdata->attitude.temp, .dflt.real = NAN}, {"depth", t_real, .addr.real = &gpsdata->attitude.depth, .dflt.real = NAN}, diff --git a/test/daemon/tnt-revolution.log.chk b/test/daemon/tnt-revolution.log.chk index 8d93c44c..5f0c15fb 100644 --- a/test/daemon/tnt-revolution.log.chk +++ b/test/daemon/tnt-revolution.log.chk @@ -1,100 +1,100 @@ $PTNTHTM,14223,N,169,N,-43,N,13641,2454*15 -{"class":"ATT","tag":"PTNTHTM","heading":14223.00,"mag_st":"N","pitch":169.00,"pitch_st":"N","roll":-43.00,"roll_st":"N","dip":13641.000,"mag_x":2454.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14223.00,"mag_st":"N","pitch":169.00,"pitch_st":"N","roll":-43.00,"roll_st":"N","dip":13641.000,"mag_x":2454.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14091,N,171,N,-43,N,13599,2454*11 -{"class":"ATT","tag":"PTNTHTM","heading":14091.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-43.00,"roll_st":"N","dip":13599.000,"mag_x":2454.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14091.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-43.00,"roll_st":"N","dip":13599.000,"mag_x":2454.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14287,N,172,N,-39,N,13652,2452*18 -{"class":"ATT","tag":"PTNTHTM","heading":14287.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-39.00,"roll_st":"N","dip":13652.000,"mag_x":2452.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14287.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-39.00,"roll_st":"N","dip":13652.000,"mag_x":2452.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14150,N,171,N,-40,N,13605,2452*1E -{"class":"ATT","tag":"PTNTHTM","heading":14150.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13605.000,"mag_x":2452.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14150.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13605.000,"mag_x":2452.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14199,N,171,N,-40,N,13614,2452*1B -{"class":"ATT","tag":"PTNTHTM","heading":14199.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13614.000,"mag_x":2452.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14199.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13614.000,"mag_x":2452.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14168,N,171,N,-37,N,13615,2451*17 -{"class":"ATT","tag":"PTNTHTM","heading":14168.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-37.00,"roll_st":"N","dip":13615.000,"mag_x":2451.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14168.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-37.00,"roll_st":"N","dip":13615.000,"mag_x":2451.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14359,N,172,N,-33,N,13647,2450*16 -{"class":"ATT","tag":"PTNTHTM","heading":14359.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-33.00,"roll_st":"N","dip":13647.000,"mag_x":2450.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14359.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-33.00,"roll_st":"N","dip":13647.000,"mag_x":2450.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14243,N,172,N,-33,N,13608,2450*17 -{"class":"ATT","tag":"PTNTHTM","heading":14243.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-33.00,"roll_st":"N","dip":13608.000,"mag_x":2450.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14243.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-33.00,"roll_st":"N","dip":13608.000,"mag_x":2450.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14340,N,176,N,-37,N,13616,2451*1B -{"class":"ATT","tag":"PTNTHTM","heading":14340.00,"mag_st":"N","pitch":176.00,"pitch_st":"N","roll":-37.00,"roll_st":"N","dip":13616.000,"mag_x":2451.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14340.00,"mag_st":"N","pitch":176.00,"pitch_st":"N","roll":-37.00,"roll_st":"N","dip":13616.000,"mag_x":2451.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14230,N,175,N,-37,N,13597,2451*14 -{"class":"ATT","tag":"PTNTHTM","heading":14230.00,"mag_st":"N","pitch":175.00,"pitch_st":"N","roll":-37.00,"roll_st":"N","dip":13597.000,"mag_x":2451.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14230.00,"mag_st":"N","pitch":175.00,"pitch_st":"N","roll":-37.00,"roll_st":"N","dip":13597.000,"mag_x":2451.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14224,N,178,N,-42,N,13599,2452*13 -{"class":"ATT","tag":"PTNTHTM","heading":14224.00,"mag_st":"N","pitch":178.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13599.000,"mag_x":2452.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14224.00,"mag_st":"N","pitch":178.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13599.000,"mag_x":2452.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14156,N,179,N,-42,N,13600,2452*17 -{"class":"ATT","tag":"PTNTHTM","heading":14156.00,"mag_st":"N","pitch":179.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13600.000,"mag_x":2452.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14156.00,"mag_st":"N","pitch":179.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13600.000,"mag_x":2452.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14157,N,175,N,-42,N,13585,2454*12 -{"class":"ATT","tag":"PTNTHTM","heading":14157.00,"mag_st":"N","pitch":175.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13585.000,"mag_x":2454.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14157.00,"mag_st":"N","pitch":175.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13585.000,"mag_x":2454.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14159,N,175,N,-42,N,13598,2454*10 -{"class":"ATT","tag":"PTNTHTM","heading":14159.00,"mag_st":"N","pitch":175.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13598.000,"mag_x":2454.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14159.00,"mag_st":"N","pitch":175.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13598.000,"mag_x":2454.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14159,N,170,N,-40,N,13569,2455*18 -{"class":"ATT","tag":"PTNTHTM","heading":14159.00,"mag_st":"N","pitch":170.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13569.000,"mag_x":2455.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14159.00,"mag_st":"N","pitch":170.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13569.000,"mag_x":2455.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14199,N,170,N,-40,N,13610,2454*18 -{"class":"ATT","tag":"PTNTHTM","heading":14199.00,"mag_st":"N","pitch":170.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13610.000,"mag_x":2454.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14199.00,"mag_st":"N","pitch":170.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13610.000,"mag_x":2454.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14094,N,167,N,-40,N,13571,2455*17 -{"class":"ATT","tag":"PTNTHTM","heading":14094.00,"mag_st":"N","pitch":167.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13571.000,"mag_x":2455.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14094.00,"mag_st":"N","pitch":167.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13571.000,"mag_x":2455.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14185,N,167,N,-43,N,13626,2454*15 -{"class":"ATT","tag":"PTNTHTM","heading":14185.00,"mag_st":"N","pitch":167.00,"pitch_st":"N","roll":-43.00,"roll_st":"N","dip":13626.000,"mag_x":2454.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14185.00,"mag_st":"N","pitch":167.00,"pitch_st":"N","roll":-43.00,"roll_st":"N","dip":13626.000,"mag_x":2454.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14043,N,169,N,-42,N,13592,2454*1D -{"class":"ATT","tag":"PTNTHTM","heading":14043.00,"mag_st":"N","pitch":169.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13592.000,"mag_x":2454.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14043.00,"mag_st":"N","pitch":169.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13592.000,"mag_x":2454.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14236,N,169,N,-45,N,13644,2453*15 -{"class":"ATT","tag":"PTNTHTM","heading":14236.00,"mag_st":"N","pitch":169.00,"pitch_st":"N","roll":-45.00,"roll_st":"N","dip":13644.000,"mag_x":2453.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14236.00,"mag_st":"N","pitch":169.00,"pitch_st":"N","roll":-45.00,"roll_st":"N","dip":13644.000,"mag_x":2453.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14061,N,172,N,-45,N,13599,2452*1D -{"class":"ATT","tag":"PTNTHTM","heading":14061.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-45.00,"roll_st":"N","dip":13599.000,"mag_x":2452.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14061.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-45.00,"roll_st":"N","dip":13599.000,"mag_x":2452.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14299,N,171,N,-42,N,13652,2450*1A -{"class":"ATT","tag":"PTNTHTM","heading":14299.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13652.000,"mag_x":2450.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14299.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13652.000,"mag_x":2450.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14149,N,170,N,-43,N,13605,2450*16 -{"class":"ATT","tag":"PTNTHTM","heading":14149.00,"mag_st":"N","pitch":170.00,"pitch_st":"N","roll":-43.00,"roll_st":"N","dip":13605.000,"mag_x":2450.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14149.00,"mag_st":"N","pitch":170.00,"pitch_st":"N","roll":-43.00,"roll_st":"N","dip":13605.000,"mag_x":2450.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14243,N,170,N,-39,N,13622,2450*17 -{"class":"ATT","tag":"PTNTHTM","heading":14243.00,"mag_st":"N","pitch":170.00,"pitch_st":"N","roll":-39.00,"roll_st":"N","dip":13622.000,"mag_x":2450.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14243.00,"mag_st":"N","pitch":170.00,"pitch_st":"N","roll":-39.00,"roll_st":"N","dip":13622.000,"mag_x":2450.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14155,N,172,N,-35,N,13611,2449*15 -{"class":"ATT","tag":"PTNTHTM","heading":14155.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-35.00,"roll_st":"N","dip":13611.000,"mag_x":2449.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14155.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-35.00,"roll_st":"N","dip":13611.000,"mag_x":2449.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14330,N,172,N,-32,N,13647,2448*11 -{"class":"ATT","tag":"PTNTHTM","heading":14330.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-32.00,"roll_st":"N","dip":13647.000,"mag_x":2448.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14330.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-32.00,"roll_st":"N","dip":13647.000,"mag_x":2448.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14239,N,171,N,-33,N,13612,2448*1B -{"class":"ATT","tag":"PTNTHTM","heading":14239.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-33.00,"roll_st":"N","dip":13612.000,"mag_x":2448.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14239.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-33.00,"roll_st":"N","dip":13612.000,"mag_x":2448.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14182,N,174,N,-34,N,13581,2449*12 -{"class":"ATT","tag":"PTNTHTM","heading":14182.00,"mag_st":"N","pitch":174.00,"pitch_st":"N","roll":-34.00,"roll_st":"N","dip":13581.000,"mag_x":2449.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14182.00,"mag_st":"N","pitch":174.00,"pitch_st":"N","roll":-34.00,"roll_st":"N","dip":13581.000,"mag_x":2449.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14256,N,174,N,-37,N,13602,2449*13 -{"class":"ATT","tag":"PTNTHTM","heading":14256.00,"mag_st":"N","pitch":174.00,"pitch_st":"N","roll":-37.00,"roll_st":"N","dip":13602.000,"mag_x":2449.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14256.00,"mag_st":"N","pitch":174.00,"pitch_st":"N","roll":-37.00,"roll_st":"N","dip":13602.000,"mag_x":2449.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14139,N,178,N,-38,N,13568,2450*1D -{"class":"ATT","tag":"PTNTHTM","heading":14139.00,"mag_st":"N","pitch":178.00,"pitch_st":"N","roll":-38.00,"roll_st":"N","dip":13568.000,"mag_x":2450.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14139.00,"mag_st":"N","pitch":178.00,"pitch_st":"N","roll":-38.00,"roll_st":"N","dip":13568.000,"mag_x":2450.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14193,N,177,N,-40,N,13604,2450*14 -{"class":"ATT","tag":"PTNTHTM","heading":14193.00,"mag_st":"N","pitch":177.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13604.000,"mag_x":2450.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14193.00,"mag_st":"N","pitch":177.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13604.000,"mag_x":2450.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14186,N,174,N,-42,N,13590,2451*1E -{"class":"ATT","tag":"PTNTHTM","heading":14186.00,"mag_st":"N","pitch":174.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13590.000,"mag_x":2451.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14186.00,"mag_st":"N","pitch":174.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13590.000,"mag_x":2451.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14174,N,174,N,-40,N,13602,2451*19 -{"class":"ATT","tag":"PTNTHTM","heading":14174.00,"mag_st":"N","pitch":174.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13602.000,"mag_x":2451.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14174.00,"mag_st":"N","pitch":174.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13602.000,"mag_x":2451.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14094,N,172,N,-40,N,13570,2452*15 -{"class":"ATT","tag":"PTNTHTM","heading":14094.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13570.000,"mag_x":2452.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14094.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13570.000,"mag_x":2452.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14232,N,169,N,-42,N,13609,2452*1E -{"class":"ATT","tag":"PTNTHTM","heading":14232.00,"mag_st":"N","pitch":169.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13609.000,"mag_x":2452.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14232.00,"mag_st":"N","pitch":169.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13609.000,"mag_x":2452.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14134,N,165,N,-42,N,13570,2452*1A -{"class":"ATT","tag":"PTNTHTM","heading":14134.00,"mag_st":"N","pitch":165.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13570.000,"mag_x":2452.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14134.00,"mag_st":"N","pitch":165.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13570.000,"mag_x":2452.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14225,N,165,N,-43,N,13632,2452*1D -{"class":"ATT","tag":"PTNTHTM","heading":14225.00,"mag_st":"N","pitch":165.00,"pitch_st":"N","roll":-43.00,"roll_st":"N","dip":13632.000,"mag_x":2452.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14225.00,"mag_st":"N","pitch":165.00,"pitch_st":"N","roll":-43.00,"roll_st":"N","dip":13632.000,"mag_x":2452.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14042,N,169,N,-43,N,13588,2451*13 -{"class":"ATT","tag":"PTNTHTM","heading":14042.00,"mag_st":"N","pitch":169.00,"pitch_st":"N","roll":-43.00,"roll_st":"N","dip":13588.000,"mag_x":2451.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14042.00,"mag_st":"N","pitch":169.00,"pitch_st":"N","roll":-43.00,"roll_st":"N","dip":13588.000,"mag_x":2451.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14222,N,170,N,-45,N,13646,2451*18 -{"class":"ATT","tag":"PTNTHTM","heading":14222.00,"mag_st":"N","pitch":170.00,"pitch_st":"N","roll":-45.00,"roll_st":"N","dip":13646.000,"mag_x":2451.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14222.00,"mag_st":"N","pitch":170.00,"pitch_st":"N","roll":-45.00,"roll_st":"N","dip":13646.000,"mag_x":2451.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14174,N,170,N,-45,N,13640,2450*1F -{"class":"ATT","tag":"PTNTHTM","heading":14174.00,"mag_st":"N","pitch":170.00,"pitch_st":"N","roll":-45.00,"roll_st":"N","dip":13640.000,"mag_x":2450.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14174.00,"mag_st":"N","pitch":170.00,"pitch_st":"N","roll":-45.00,"roll_st":"N","dip":13640.000,"mag_x":2450.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14264,N,170,N,-42,N,13636,2449*13 -{"class":"ATT","tag":"PTNTHTM","heading":14264.00,"mag_st":"N","pitch":170.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13636.000,"mag_x":2449.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14264.00,"mag_st":"N","pitch":170.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13636.000,"mag_x":2449.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14132,N,171,N,-42,N,13604,2448*12 -{"class":"ATT","tag":"PTNTHTM","heading":14132.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13604.000,"mag_x":2448.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14132.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-42.00,"roll_st":"N","dip":13604.000,"mag_x":2448.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14265,N,171,N,-38,N,13629,2448*11 -{"class":"ATT","tag":"PTNTHTM","heading":14265.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-38.00,"roll_st":"N","dip":13629.000,"mag_x":2448.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14265.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-38.00,"roll_st":"N","dip":13629.000,"mag_x":2448.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14145,N,171,N,-38,N,13612,2447*17 -{"class":"ATT","tag":"PTNTHTM","heading":14145.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-38.00,"roll_st":"N","dip":13612.000,"mag_x":2447.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14145.00,"mag_st":"N","pitch":171.00,"pitch_st":"N","roll":-38.00,"roll_st":"N","dip":13612.000,"mag_x":2447.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14198,N,172,N,-38,N,13614,2447*12 -{"class":"ATT","tag":"PTNTHTM","heading":14198.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-38.00,"roll_st":"N","dip":13614.000,"mag_x":2447.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14198.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-38.00,"roll_st":"N","dip":13614.000,"mag_x":2447.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14184,N,172,N,-35,N,13612,2446*15 -{"class":"ATT","tag":"PTNTHTM","heading":14184.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-35.00,"roll_st":"N","dip":13612.000,"mag_x":2446.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14184.00,"mag_st":"N","pitch":172.00,"pitch_st":"N","roll":-35.00,"roll_st":"N","dip":13612.000,"mag_x":2446.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14187,N,174,N,-35,N,13589,2447*10 -{"class":"ATT","tag":"PTNTHTM","heading":14187.00,"mag_st":"N","pitch":174.00,"pitch_st":"N","roll":-35.00,"roll_st":"N","dip":13589.000,"mag_x":2447.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14187.00,"mag_st":"N","pitch":174.00,"pitch_st":"N","roll":-35.00,"roll_st":"N","dip":13589.000,"mag_x":2447.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14257,N,174,N,-35,N,13603,2447*1F -{"class":"ATT","tag":"PTNTHTM","heading":14257.00,"mag_st":"N","pitch":174.00,"pitch_st":"N","roll":-35.00,"roll_st":"N","dip":13603.000,"mag_x":2447.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14257.00,"mag_st":"N","pitch":174.00,"pitch_st":"N","roll":-35.00,"roll_st":"N","dip":13603.000,"mag_x":2447.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14161,N,178,N,-37,N,13575,2448*1A -{"class":"ATT","tag":"PTNTHTM","heading":14161.00,"mag_st":"N","pitch":178.00,"pitch_st":"N","roll":-37.00,"roll_st":"N","dip":13575.000,"mag_x":2448.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14161.00,"mag_st":"N","pitch":178.00,"pitch_st":"N","roll":-37.00,"roll_st":"N","dip":13575.000,"mag_x":2448.000,"temp":0.000,"depth":0.000}
$PTNTHTM,14302,N,177,N,-40,N,13608,2448*1B -{"class":"ATT","tag":"PTNTHTM","heading":14302.00,"mag_st":"N","pitch":177.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13608.000,"mag_x":2448.000,"temperature":0.000,"depth":0.000}
+{"class":"ATT","tag":"PTNTHTM","heading":14302.00,"mag_st":"N","pitch":177.00,"pitch_st":"N","roll":-40.00,"roll_st":"N","dip":13608.000,"mag_x":2448.000,"temp":0.000,"depth":0.000}
|