diff options
Diffstat (limited to 'src/diagnostic')
| -rw-r--r-- | src/diagnostic/diagnostic-message.cpp | 10 | ||||
| -rw-r--r-- | src/diagnostic/diagnostic-message.hpp | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/diagnostic/diagnostic-message.cpp b/src/diagnostic/diagnostic-message.cpp index c9035eb..8b2273e 100644 --- a/src/diagnostic/diagnostic-message.cpp +++ b/src/diagnostic/diagnostic-message.cpp @@ -33,6 +33,8 @@ const char *UNIT_NAMES[10] = { "NM" }; +std::string obd2_signal_t::prefix_ = "diagnostic_messages."; + obd2_signal_t::obd2_signal_t(uint8_t pid, const char* generic_name, const int min, const int max, enum UNIT unit, int frequency, bool supported) : pid_{pid}, generic_name_{generic_name}, min_{min}, max_{max}, unit_{unit}, frequency_{frequency}, supported_{supported} { @@ -53,7 +55,7 @@ const std::string obd2_signal_t::get_name() const return prefix_ + "." + generic_name_; } -const std::string& obd2_signal_t::get_prefix() const +const std::string& obd2_signal_t::get_prefix() { return prefix_; } @@ -63,7 +65,7 @@ int obd2_signal_t::get_frequency() const return frequency_; } -void obd2_signal_t::set_prefix(std::string val) +void obd2_signal_t::set_prefix(const std::string& val) { prefix_ = val; } @@ -144,9 +146,9 @@ bool obd2_signal_t::is_obd2_request(DiagnosticRequest* request) * * @return true if name began with obd2 else false. */ -bool obd2_signal_t::is_obd2_signal(const char *name) +bool obd2_signal_t::is_obd2_signal(const std::string& name) { - if(fnmatch("obd2.*", name, FNM_CASEFOLD) == 0) + if(name.find_first_of(prefix_.c_str(), 0, prefix_.size())) return true; return false; } diff --git a/src/diagnostic/diagnostic-message.hpp b/src/diagnostic/diagnostic-message.hpp index 02c6a9f..ec4521f 100644 --- a/src/diagnostic/diagnostic-message.hpp +++ b/src/diagnostic/diagnostic-message.hpp @@ -46,7 +46,7 @@ class obd2_signal_t { private: uint8_t pid_; /*!< pid - The 1 byte PID.*/ std::string generic_name_; /*!< generic_name_ - A human readable name to use for this PID when published.*/ - std::string prefix_ = "diagnostic_messages."; /*!< prefix_ - generic_name_ will be prefixed with it. It has to reflect the used protocol. + static std::string prefix_; /*!< prefix_ - generic_name_ will be prefixed with it. It has to reflect the used protocol. * which make easier to sort message when the come in.*/ int min_; /*!< min_ - Minimum value that can take this pid */ int max_; /*!< max_ - Maximum value that can take this pid */ @@ -61,16 +61,16 @@ class obd2_signal_t { uint32_t get_pid(); const std::string& get_generic_name() const; const std::string get_name() const; - const std::string& get_prefix() const; + static const std::string& get_prefix(); int get_frequency() const; - void set_prefix(std::string val); + static void set_prefix(const std::string& val); const DiagnosticRequest build_diagnostic_request(); bool is_obd2_response(can_message_t can_message); bool is_obd2_request(DiagnosticRequest *request); - bool is_obd2_signal(const char *name); + static bool is_obd2_signal(const std::string& name); static float decode_obd2_response(const DiagnosticResponse* response, float parsedPayload); };
\ No newline at end of file |