diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2019-06-26 15:51:19 +0200 |
---|---|---|
committer | Romain Forlot <romain.forlot@iot.bzh> | 2019-06-26 18:04:58 +0200 |
commit | 2f60d294b3fa4e243fa67a738f9b82a0b428a7fc (patch) | |
tree | ed6b50772964ce360eb2a0ebeadac29a8fb9ed2c /low-can-binding/can/can-signals.cpp | |
parent | d2180abe18533be7cbe68971a6767e5c2a0ecf6d (diff) |
Rename some of the classes removing can- prefix
This commit renames files and classes :
- can_message_definition_t -> message_definition_t
- can_message_set_t -> message_set_t
- can_signals_t -> signals_t
This prepares the implementation of j1939 protocol.
Bug-AGL: SPEC-2386
Change-Id: Ie3ee4f25c236c861b92eb12a56fa03a5a9afffbb
Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh>
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding/can/can-signals.cpp')
-rw-r--r-- | low-can-binding/can/can-signals.cpp | 182 |
1 files changed, 0 insertions, 182 deletions
diff --git a/low-can-binding/can/can-signals.cpp b/low-can-binding/can/can-signals.cpp deleted file mode 100644 index 76a9665f..00000000 --- a/low-can-binding/can/can-signals.cpp +++ /dev/null @@ -1,182 +0,0 @@ -/* - * Copyright (C) 2015, 2016 "IoT.bzh" - * Author "Romain Forlot" <romain.forlot@iot.bzh> - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include <fnmatch.h> - -#include "can-signals.hpp" - -#include "../binding/application.hpp" -#include "../utils/signals.hpp" -#include "can-decoder.hpp" -#include "message/can-message.hpp" -#include "can-bus.hpp" -#include "../diagnostic/diagnostic-message.hpp" -#include "canutil/write.h" - -std::string can_signal_t::prefix_ = "messages"; - -can_signal_t::can_signal_t( - std::string generic_name, - uint8_t bit_position, - uint8_t bit_size, - float factor, - float offset, - float min_value, - float max_value, - frequency_clock_t frequency, - bool send_same, - bool force_send_changed, - std::map<uint8_t, std::string> states, - bool writable, - signal_decoder decoder, - signal_encoder encoder, - bool received) - : parent_{nullptr}, - generic_name_{ generic_name } - , bit_position_{ bit_position } - , bit_size_{ bit_size } - , factor_{ factor } - , offset_{ offset } - , min_value_{min_value} - , max_value_{max_value} - , frequency_{frequency} - , send_same_{send_same} - , force_send_changed_{force_send_changed} - , states_{states} - , writable_{writable} - , decoder_{decoder} - , encoder_{encoder} - , received_{received} - , last_value_{.0f} -{} - -can_message_definition_t* can_signal_t::get_message() const -{ - return parent_; -} - -const std::string can_signal_t::get_generic_name() const -{ - return generic_name_; -} - -const std::string can_signal_t::get_name() const -{ - return prefix_ + "." + generic_name_; -} - -uint8_t can_signal_t::get_bit_position() const -{ - return bit_position_; -} - -uint8_t can_signal_t::get_bit_size() const -{ - return bit_size_; -} - -float can_signal_t::get_factor() const -{ - return factor_; -} - -float can_signal_t::get_offset() const -{ - return offset_; -} - -frequency_clock_t& can_signal_t::get_frequency() -{ - return frequency_; -} - -bool can_signal_t::get_send_same() const -{ - return send_same_; -} - -const std::string can_signal_t::get_states(uint8_t value) -{ - if ( states_.count(value) > 0 ) - return states_[value]; - return std::string(); -} - -uint64_t can_signal_t::get_states(const std::string& value) const -{ - uint64_t ret = -1; - for( const auto& state: states_) - { - if(state.second == value) - { - ret = (uint64_t)state.first; - break; - } - } - return ret; -} - -bool can_signal_t::get_writable() const -{ - return writable_; -} - -signal_decoder& can_signal_t::get_decoder() -{ - return decoder_; -} - -signal_encoder& can_signal_t::get_encoder() -{ - return encoder_; -} - -bool can_signal_t::get_received() const -{ - return received_; -} - -float can_signal_t::get_last_value() const -{ - return last_value_; -} - -std::pair<float, uint64_t> can_signal_t::get_last_value_with_timestamp() const -{ - return std::make_pair(last_value_, frequency_.get_last_tick()); -} - -void can_signal_t::set_parent(can_message_definition_t* parent) -{ - parent_ = parent; -} - -void can_signal_t::set_received(bool r) -{ - received_ = r; -} - -void can_signal_t::set_last_value(float val) -{ - last_value_ = val; -} - -void can_signal_t::set_timestamp(uint64_t timestamp) -{ - frequency_.tick(timestamp); -} - |