Skip to content

feat(raw): Adding raw sentence #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions adafruit_gps.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ def __init__(self, uart, debug=False):
self.total_mess_num = None
self.mess_num = None
self.debug = debug
self.raw_sentence = None
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

call this _raw_sentence (private)


def update(self):
"""Check for updated data from the GPS module and process it
Expand Down Expand Up @@ -175,7 +176,12 @@ def datetime(self):
"""Return struct_time object to feed rtc.set_time_source() function"""
return self.timestamp_utc

def _parse_sentence(self):
@property
def raw_sentence(self):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename to nmea_sentence

"""Return raw_sentence which is the raw NMEA sentence read from the GPS"""
return self.raw_sentence

def _read_sentence(self):
# Parse any NMEA sentence that is available.
# pylint: disable=len-as-condition
# This needs to be refactored when it can be tested.
Expand All @@ -200,8 +206,23 @@ def _parse_sentence(self):
actual ^= ord(sentence[i])
if actual != expected:
return None # Failed to validate checksum.
# Remove checksum once validated.
sentence = sentence[:-3]

# copy the raw sentence
self.raw_sentence = sentence

return sentence
# At this point we don't have a valid sentence
return None

def _parse_sentence(self):
sentence = self._read_sentence()

# sentence is a valid NMEA with a valid checksum
if sentence is None:
return None

# Remove checksum once validated.
sentence = sentence[:-3]
# Parse out the type of sentence (first string after $ up to comma)
# and then grab the rest as data within the sentence.
delimiter = sentence.find(',')
Expand Down