diff options
| author | ckgt <ckarlsson25@gmail.com> | 2018-03-22 12:49:44 -0400 |
|---|---|---|
| committer | ckgt <ckarlsson25@gmail.com> | 2018-03-22 12:49:44 -0400 |
| commit | 02b193294d7e1ba6a49fe5bfb48487a046741942 (patch) | |
| tree | 5bfa0a848e4130a01419e1592ceac74c83843d1f /src | |
| parent | 57146643a54214878f0ecfc1c20fb883d9053536 (diff) | |
Cleaned up some comments, somehow missed a boolean not.
Diffstat (limited to 'src')
| -rw-r--r-- | src/NMEAParser.cpp | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/src/NMEAParser.cpp b/src/NMEAParser.cpp index 4364718..9e2a370 100644 --- a/src/NMEAParser.cpp +++ b/src/NMEAParser.cpp @@ -38,15 +38,22 @@ std::string NMEAParseError::what(){ - // --------- NMEA SENTENCE -------------- +// --------- NMEA SENTENCE -------------- + +NMEASentence::NMEASentence() +: isvalid(false) +, checksumIsCalculated(false) +, calculatedChecksum(0) +, parsedChecksum(0) +{ } -NMEASentence::NMEASentence() : isvalid(false), checksumIsCalculated(false), calculatedChecksum(0), parsedChecksum(0) -{} NMEASentence::~NMEASentence() -{} +{ } + bool NMEASentence::valid() const { return isvalid; } + bool NMEASentence::checksumOK() const { return (checksumIsCalculated) && @@ -97,27 +104,22 @@ void trim(string& str){ } - // --------- NMEA PARSER -------------- +// --------- NMEA PARSER -------------- NMEAParser::NMEAParser() - : log(false), maxbuffersize(NMEA_PARSER_MAX_BUFFER_SIZE), fillingbuffer(false) -{ - +: log(false) +, maxbuffersize(NMEA_PARSER_MAX_BUFFER_SIZE) +, fillingbuffer(false) +{ } -} - -NMEAParser::~NMEAParser() { - // TODO Auto-generated destructor stub -} +NMEAParser::~NMEAParser() +{ } void NMEAParser::setSentenceHandler(std::string cmdKey, std::function<void(const NMEASentence&)> handler){ eventTable.erase(cmdKey); - - //std::pair<string, function<void(NMEASentence)>> entry(cmdKey, handler); - //eventTable.insert(entry); eventTable.insert({ cmdKey, handler }); } string NMEAParser::getRegisteredSentenceHandlersCSV() @@ -128,9 +130,9 @@ string NMEAParser::getRegisteredSentenceHandlersCSV() ostringstream ss; for( auto it = eventTable.begin(); it != eventTable.end(); it++){ - ss << it->first; + ss << it->first << ","; - if( it->second ){ + if( ! it->second ){ ss << "(not callable)"; } } |
