Skip to content

Commit 4a7a210

Browse files
committed
debugging for android tutorial
1 parent c4fb167 commit 4a7a210

4 files changed

Lines changed: 456 additions & 32 deletions

File tree

gnss_lib_py/parsers/android.py

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,9 @@ def __init__(self, input_path,
7070
"adr_valid" : True,
7171
"adr_uncertainty" : 15.
7272
},
73-
remove_rx_b_from_pr = True,
73+
remove_rx_b_from_pr = False,
7474
verbose=False):
75-
"""Android GNSSStatus file parser.
7675

77-
78-
79-
"""
8076
self.verbose = verbose
8177
self.filter_measurements = filter_measurements
8278
self.measurement_filters = measurement_filters
@@ -311,7 +307,7 @@ def filter_raw_measurements(self,t_rx_secs):
311307
self.measurement_filters["bias_uncertainty"],"geq")))
312308
filter_idxs.update(bias_uncertainty_filter)
313309
if self.verbose:
314-
print("bias_uncertainty_filter removed",
310+
print("bias_uncertainty removed",
315311
len(bias_uncertainty_filter))
316312

317313
# arrival time is negative or unrealistically large
@@ -321,7 +317,7 @@ def filter_raw_measurements(self,t_rx_secs):
321317
arrival_time_filter.update(list(set(np.argwhere(t_rx_secs<0)[:,0])))
322318
filter_idxs.update(arrival_time_filter)
323319
if self.verbose:
324-
print("arrival_time_filter removed",
320+
print("arrival_time removed",
325321
len(arrival_time_filter))
326322

327323
# unknown constellations
@@ -330,7 +326,7 @@ def filter_raw_measurements(self,t_rx_secs):
330326
constellation_filter = set(np.atleast_1d(self.argwhere("gnss_id","unknown")))
331327
filter_idxs.update(constellation_filter)
332328
if self.verbose:
333-
print("constellation_filter removed",
329+
print("unknown_constellations removed",
334330
len(constellation_filter))
335331

336332
# TimeNanos is empty
@@ -339,7 +335,7 @@ def filter_raw_measurements(self,t_rx_secs):
339335
time_nanos_filter = set(np.atleast_1d(self.argwhere("TimeNanos",np.nan)))
340336
filter_idxs.update(time_nanos_filter)
341337
if self.verbose:
342-
print("time_nanos_filter removed",
338+
print("time_valid removed",
343339
len(time_nanos_filter))
344340

345341
# state is not STATE_TOW_DECODED.
@@ -350,15 +346,15 @@ def filter_raw_measurements(self,t_rx_secs):
350346
state_tow_decoded))[:,0]))
351347
filter_idxs.update(state_filter)
352348
if self.verbose:
353-
print("state_filter removed",len(state_filter))
349+
print("state_decoded removed",len(state_filter))
354350

355351
# ReceivedSvTimeUncertaintyNanos is too large
356352
if "sv_time_uncertainty" in self.measurement_filters:
357353
received_uncertainty_filter = set(np.atleast_1d(self.argwhere("ReceivedSvTimeUncertaintyNanos",
358354
self.measurement_filters["sv_time_uncertainty"],"geq")))
359355
filter_idxs.update(received_uncertainty_filter)
360356
if self.verbose:
361-
print("received_uncertainty_filter removed",
357+
print("sv_time_uncertainty removed",
362358
len(received_uncertainty_filter))
363359

364360
# AdrState violates condition
@@ -376,15 +372,15 @@ def filter_raw_measurements(self,t_rx_secs):
376372
adr_reset),adr_slip))[:,0]))
377373
filter_idxs.update(adr_state_filter)
378374
if self.verbose:
379-
print("adr_state_filter removed",len(adr_state_filter))
375+
print("adr_valid removed",len(adr_state_filter))
380376

381377
# adr_uncertainty is too large
382378
if "adr_uncertainty" in self.measurement_filters:
383379
adr_uncertainty_filter = set(np.atleast_1d(self.argwhere("accumulated_delta_range_sigma_m",
384380
self.measurement_filters["adr_uncertainty"],"geq")))
385381
filter_idxs.update(adr_uncertainty_filter)
386382
if self.verbose:
387-
print("adr_uncertainty_filter removed",
383+
print("adr_uncertainty removed",
388384
len(adr_uncertainty_filter))
389385

390386
# removed filtered measurements

gnss_lib_py/parsers/nmea.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,17 @@ def __init__(self, input_path, msg_types=None,
151151
.fillna(method='ffill')\
152152
.astype(float)
153153
pd_df["num_sats"] = pd_df["num_sats"].fillna(value=0).astype('int64')
154+
pd_df = pd_df.fillna(value=np.nan).replace("",np.nan)
155+
convert_dict={
156+
'num_sats' : np.int64,
157+
'gps_qual' : np.int64,
158+
'gps_millis' : np.float64,
159+
'geo_sep' : np.float64,
160+
'horizontal_dil' : np.float64,
161+
'spd_over_grnd' : np.float64,
162+
'true_course' : np.float64,
163+
}
164+
pd_df = pd_df.astype(convert_dict)
154165
super().__init__(pandas_df=pd_df)
155166
if include_ecef:
156167
self.include_ecef()

0 commit comments

Comments
 (0)