summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-08 21:58:46 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 17:10:40 +0100
commit6546d8b0438b7f483b43ed35c957c979723305bf (patch)
treefc8559954e2f514f40cad0a63234406fa040de71
parent470ed5b5265183f87a1676e101fa192df6f0cf2a (diff)
Clean old C struct, now as C++ class
Change-Id: Iba4c4a47b140c53d766c348064857069feefdb19 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat
-rw-r--r--src/can/can-message.cpp16
-rw-r--r--src/can/can-message.hpp53
2 files changed, 22 insertions, 47 deletions
diff --git a/src/can/can-message.cpp b/src/can/can-message.cpp
index eec19d9b..5409373c 100644
--- a/src/can/can-message.cpp
+++ b/src/can/can-message.cpp
@@ -245,3 +245,19 @@ canfd_frame can_message_t::convert_to_canfd_frame()
return frame;
}
+
+/********************************************************************************
+*
+* can_message_definition_t method implementation
+*
+*********************************************************************************/
+
+can_message_definition_t::can_message_definition_t()
+ : last_value_(CAN_MESSAGE_SIZE)
+{}
+
+uint32_t get_id() const
+{
+ return id_;
+}
+}
diff --git a/src/can/can-message.hpp b/src/can/can-message.hpp
index 5d45b98d..a4581261 100644
--- a/src/can/can-message.hpp
+++ b/src/can/can-message.hpp
@@ -37,18 +37,6 @@ class enum CanMessageFormat {
ERROR, /*!< ERROR - ERROR code used at initialization to signify that it isn't usable'*/
};
-/*************************
- * old CanMessage struct *
- *************************
-struct CanMessage {
- uint32_t id;
- CanMessageFormat format;
- uint8_t data[CAN_MESSAGE_SIZE];
- uint8_t length;
-};
-typedef struct CanMessage CanMessage;
-*/
-
/**
* @class can_message_t
*
@@ -85,27 +73,12 @@ class can_message_t {
};
/**
- * @struct CanMessageDefinition
+ * @class can_message_definition_t
*
* @brief The definition of a CAN message. This includes a lot of metadata, so
* to save memory this struct should not be used for storing incoming and
* outgoing CAN messages.
*/
-struct CanMessageDefinition {
- //can_bus_dev_t bus; /*!< bus - A pointer to the bus this message is on. */
- uint32_t id; /*!< id - The ID of the message.*/
- CanMessageFormat format; /*!< format - the format of the message's ID.*/
- FrequencyClock frequencyClock; /*!< clock - an optional frequency clock to control the output of this
- * message, if sent raw, or simply to mark the max frequency for custom
- * handlers to retriec++ if ? syntaxve.*/
- bool forceSendChanged; /*!< forceSendChanged - If true, regardless of the frequency, it will send CAN
- * message if it has changed when using raw passthrough.*/
- uint8_t lastValue[CAN_MESSAGE_SIZE]; /*!< lastValue - The last received value of the message. Defaults to undefined.
- * This is required for the forceSendChanged functionality, as the stack
- * needs to compare an incoming CAN message with the previous frame.*/
-};
-typedef struct CanMessageDefinition CanMessageDefinition;
-
class can_message_definition_t
{
private:
@@ -113,36 +86,25 @@ class can_message_definition_t
uint32_t id_; /*!< id_ - The ID of the message.*/
CanMessageFormat format_; /*!< format_ - the format of the message's ID.*/
FrequencyClock clock_; /*!< clock_ - an optional frequency clock to control the output of this
- * message, if sent raw, or simply to mark the max frequency for custom
- * handlers to retriec++ if ? syntaxve.*/
+ * message, if sent raw, or simply to mark the max frequency for custom
+ * handlers to retrieve.*/
bool force_send_changed_; /*!< force_send_changed_ - If true, regardless of the frequency, it will send CAN
* message if it has changed when using raw passthrough.*/
- uint8_t last_value_[CAN_MESSAGE_SIZE]; /*!< last_value_ - The last received value of the message. Defaults to undefined.
+ std::vector<uint8_t> last_value_; /*!< last_value_ - The last received value of the message. Defaults to undefined.
* This is required for the forceSendChanged functionality, as the stack
* needs to compare an incoming CAN message with the previous frame.*/
public:
+ can_message_definition_t();
uint32_t get_id() const;
};
/**
- * @struct CanMessageSet
+ * @class can_message_set_t
*
* @brief A parent wrapper for a particular set of CAN messages and associated
* CAN buses(e.g. a vehicle or program).
*/
- typedef struct {
- uint8_t index; /*!<index - A numerical ID for the message set, ideally the index in an array
- * for fast lookup*/
- const std::string name; /*!< name - The name of the message set.*/
- uint8_t busCount; /*!< busCount - The number of CAN buses defined for this message set.*/
- unsigned short messageCount; /*!< messageCount - The number of CAN messages (across all buses) defined for
- * this message set.*/
- unsigned short signalCount; /*!< signalCount - The number of CAN signals (across all messages) defined for
- * this message set.*/
- unsigned short commandCount; /*!< commandCount - The number of CanCommmands defined for this message set.*/
-} CanMessageSet;
-
class can_message_set_t
{
private:
@@ -158,9 +120,6 @@ class can_message_set_t
unsigned short obd2_signal_count_; /*!< obd2_signal_count_ - The number of obd2 signals defined for this message set.*/
};
-/** Public: Return the currently active CAN configuration. */
-CanMessageSet* getActiveMessageSet();
-
/** Public: Retrive a list of all possible CAN configurations.
*
* Returns a pointer to an array of all configurations.
.sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ } 
/*
 * 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 "configuration.hpp"

#include "utils/signals.hpp"
#include "utils/openxc-utils.hpp"

/// @brief Return singleton instance of configuration object.
configuration_t& configuration_t::instance()
{
	static configuration_t config;
	return config;
}

can_bus_t& configuration_t::get_can_bus_manager()
{
	return can_bus_manager_;
}

const std::map<std::string, std::shared_ptr<can_bus_dev_t>>& configuration_t::get_can_bus_devices()
{
	return can_bus_manager_.get_can_devices();
}

diagnostic_manager_t& configuration_t::get_diagnostic_manager()
{
	return diagnostic_manager_;
}

uint8_t configuration_t::get_active_message_set() const
{
	return active_message_set_;
}

const std::vector<can_message_set_t>& configuration_t::get_can_message_set()
{
	return can_message_set_;
}

std::vector<can_signal_t>& configuration_t::get_can_signals()
{
	return can_signals_[active_message_set_];
}

std::vector<diagnostic_message_t>& configuration_t::get_diagnostic_messages()
{
	return diagnostic_messages_[active_message_set_];
}

const std::vector<can_message_definition_t>& configuration_t::get_can_message_definition()
{
	return can_message_definition_[active_message_set_];
}

const can_message_definition_t& configuration_t::get_can_message_definition(std::uint8_t message_set_id, std::uint8_t message_id)
{
	return can_message_definition_[message_set_id][message_id];
}

uint32_t configuration_t::get_signal_id(diagnostic_message_t& sig) const
{
	return sig.get_pid();
}

uint32_t configuration_t::get_signal_id(can_signal_t& sig) const
{
	return sig.get_message().get_id();
}

void configuration_t::set_active_message_set(uint8_t id)
{
	active_message_set_ = id;
}

/// @brief return diagnostic messages name found searching through diagnostic messages list.
///
/// @param[in] key - can contain numeric or string value in order to search against
///   can signals or obd2 signals name.
/// @param[out] found_signals - Vector of signals name found.
///
void configuration_t::find_diagnostic_messages(const openxc_DynamicField &key, std::vector<diagnostic_message_t*>& found_signals)
{
	switch(key.type)
	{
		case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
				lookup_signals_by_name(key.string_value, diagnostic_messages_[active_message_set_], found_signals);
			break;
		case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
				lookup_signals_by_id(key.numeric_value, diagnostic_messages_[active_message_set_], found_signals);
			break;
		default:
			ERROR(binder_interface, "find_diagnostic_messages: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
			break;
	}
	DEBUG(binder_interface, "find_diagnostic_messages: Found %d signal(s)", (int)found_signals.size());
}

diagnostic_message_t* configuration_t::get_diagnostic_message(std::string message_name) const
{
	std::vector<diagnostic_message_t*> found;
	configuration_t::instance().find_diagnostic_messages(build_DynamicField(message_name), found);
	if(! found.empty())
		return found.front();
	return nullptr;
}

DiagnosticRequest* configuration_t::get_request_from_diagnostic_message(diagnostic_message_t* diag_msg) const
{
	return new DiagnosticRequest(diag_msg->build_diagnostic_request());
}

DiagnosticRequest* configuration_t::get_request_from_diagnostic_message(std::string message_name) const
{
	diagnostic_message_t* diag_msg = get_diagnostic_message(message_name);
	if( diag_msg != nullptr)
		return new DiagnosticRequest(diag_msg->build_diagnostic_request());
	return nullptr;
}

/// @brief return signals name found searching through CAN signals list.
///
/// @param[in] key - can contain numeric or string value in order to search against
///   can signals or obd2 signals name.
/// @param[out] found_signals - provided vector to fill with pointer to matched signals.
///
void configuration_t::find_can_signals(const openxc_DynamicField& key, std::vector<can_signal_t*>& found_signals)
{
	switch(key.type)
	{
		case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
			lookup_signals_by_name(std::string(key.string_value), can_signals_[active_message_set_], found_signals);
			break;
		case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
			lookup_signals_by_id(key.numeric_value, can_signals_[active_message_set_], found_signals);
			break;
		default:
			ERROR(binder_interface, "find_can_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
			break;
	}
	DEBUG(binder_interface, "find_can_signals: Found %d signal(s)", (int)found_signals.size());
}