* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#include <map>
-#include "obd2-signals.hpp"
+#include "diagnostic-message.hpp"
-#include "signals.hpp"
+#include "../configuration.hpp"
+#include "../utils/signals.hpp"
const char *UNIT_NAMES[10] = {
"POURCENT",
"NM"
};
-/*
-* Pre-defined OBD-II PIDs to query for if supported by the vehicle.
-*/
- std::vector<obd2_signals_t> OBD2_PIDS = {
- { 0x04, "obd2.engine.load", 0, 100, POURCENT, 5, false},
- { 0x05, "obd2.engine.coolant.temperature", -40, 215, DEGREES_CELSIUS, 1, false},
- { 0x0a, "obd2.fuel.pressure", 0, 765, KPA, 1, false},
- { 0x0b, "obd2.intake.manifold.pressure", 0, 255, KPA, 1, false},
- { 0x0c, "obd2.engine.speed", 0, 16383, RPM, 5, false},
- { 0x0d, "obd2.vehicle.speed", 0, 255, KM_H, 5, false},
- { 0x0f, "obd2.intake.air.temperature", -40, 215, DEGREES_CELSIUS, 1, false},
- { 0x10, "obd2.mass.airflow", 0, 655, GRAMS_SEC, 5, false},
- { 0x11, "obd2.throttle.position", 0, 100, POURCENT, 5, false},
- { 0x1f, "obd2.running.time", 0, 65535, SECONDS, 1, false},
- { 0x2d, "obd2.EGR.error", -100, 99, POURCENT, 0, false},
- { 0x2f, "obd2.fuel.level", 0, 100, POURCENT, 1, false},
- { 0x33, "obd2.barometric.pressure", 0, 255, KPA, 1, false},
- { 0x4c, "obd2.commanded.throttle.position", 0, 100, POURCENT, 1, false},
- { 0x52, "obd2.ethanol.fuel.percentage", 0, 100, POURCENT, 1, false},
- { 0x5a, "obd2.accelerator.pedal.position", 0, 100, POURCENT, 5, false},
- { 0x5b, "obd2.hybrid.battery-pack.remaining.life", 0, 100, POURCENT, 5, false},
- { 0x5c, "obd2.engine.oil.temperature",-40, 210, DEGREES_CELSIUS, 1, false},
- { 0x63, "obd2.engine.torque", 0, 65535, NM, 1, false}
-};
+diagnostic_message_t::diagnostic_message_t(uint8_t pid, const std::string generic_name, const int min,
+ const int max, enum UNIT unit, float frequency, DiagnosticResponseDecoder decoder,
+ DiagnosticResponseCallback callback, bool supported)
+ : pid_{pid}, generic_name_{generic_name}, min_{min}, max_{max}, unit_{unit},
+ frequency_{frequency}, decoder_{decoder}, callback_{callback}, supported_{supported}
+{}
-obd2_signals_t::obd2_signals_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}
+uint32_t diagnostic_message_t::get_pid()
{
+ return (uint32_t)pid_;
}
-void obd2_signals_t::init_diagnostic_shims(can_bus_dev_t& can_bus_dev)
+const std::string& diagnostic_message_t::get_generic_name() const
{
- DiagnosticShims shims_ = diagnostic_init_shims(shims_logger, can_bus_dev.send_can_message, NULL);
-
- int n_pids_, i_;
-
- n_pids_ = size(Obd2Pid);
- for(i_=0; i_<=n_pids_; i_++)
- {
- }
+ return generic_name_;
}
-/**
- * @fn std::vector<std::string> find_signals(const openxc_DynamicField &key)
- * @brief return signals name found searching through CAN_signals and OBD2 pid
- *
- * @param[in] const openxc_DynamicField : can contain numeric or string value in order to search against
- * can signals or obd2 signals name.
- *
- * @return std::vector<std::string> Vector of signals name found.
- */
-void obd2_signals_t::find_obd2_signals(const openxc_DynamicField &key, std::vector<Obd2Pid*>& found_signals)
+const std::string diagnostic_message_t::get_name() const
{
- switch(key.type)
- {
- case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
- lookup_signals_by_name(key.string_value, get_obd2_signals(), found_signals);
- break;
- case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
- lookup_signals_by_id(key.numeric_value, get_obd2_signals(), found_signals);
- break;
- default:
- ERROR(binder_interface, "find_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
- break;
- }
- DEBUG(binder_interface, "Found %d signal(s)", (int)found_signals.size());
+ return active_diagnostic_request_t::get_prefix() + "." + generic_name_;
}
-std::vector<Obd2Pid>& get_obd2_signals()
+float diagnostic_message_t::get_frequency() const
{
- return OBD2_PIDS;
+ return frequency_;
}
-uint32_t get_signal_id(const Obd2Pid& sig)
+DiagnosticResponseDecoder diagnostic_message_t::get_decoder() const
{
- return (uint32_t)sig.pid;
+ return decoder_;
}
-
-void shims_logger(const char* m, const struct afb_binding_interface *interface)
+DiagnosticResponseCallback diagnostic_message_t::get_callback() const
{
- DEBUG(interface, "%s", m);
+ return callback_;
}
-void shims_timer()
+bool diagnostic_message_t::get_supported() const
{
+ return supported_;
}
-bool obd2_signals_t::is_obd2_response(can_message_t can_message)
+void diagnostic_message_t::set_supported(bool value)
{
- if(can_message.get_id() >= 0x7E8 && can_message.get_id() <= 0x7EF)
- {
- openxc_VehicleMessage message = {0};
- message.has_type = true;
- message.type = openxc_VehicleMessage_Type_DIAGNOSTIC;
- message.has_diagnostic_response = true;
- message.diagnostic_response = {0};
- message.diagnostic_response.has_bus = true;
- message.diagnostic_response.bus = bus->address;
- message.diagnostic_response.has_message_id = true;
- //7DF should respond with a random message id between 7e8 and 7ef
- //7E0 through 7E7 should respond with a id that is 8 higher (7E0->7E8)
- if(can_message.get_id() == 0x7DF)
- {
- message.diagnostic_response.message_id = rand()%(0x7EF-0x7E8 + 1) + 0x7E8;
- }
- else if(commandRequest->message_id >= 0x7E0 && commandRequest->message_id <= 0x7E7)
- {
- message.diagnostic_response.message_id = commandRequest->message_id + 8;
- }
- message.diagnostic_response.has_mode = true;
- message.diagnostic_response.mode = commandRequest->mode;
- if(commandRequest->has_pid)
- {
- message.diagnostic_response.has_pid = true;
- message.diagnostic_response.pid = commandRequest->pid;
- }
- message.diagnostic_response.has_value = true;
- message.diagnostic_response.value = rand() % 100;
- pipeline::publish(&message, &getConfiguration()->pipeline);
- }
- else //If it's outside the range, the command_request will return false
- {
- debug("Sent message ID is outside the valid range for emulator (7DF to 7E7)");
- status=false;
-};
-
-void obd2_signals_t::add_request(int pid)
-{
- DiagnosticRequest request = {
- arbitration_id: OBD2_FUNCTIONAL_BROADCAST_ID,
- mode: 0x1, has_true, pid};
+ supported_ = value;
}
-/**
-* @brief Check if a request is an OBD-II PID request.
-*
-* @return true if the request is a mode 1 request and it has a 1 byte PID.
-*/
-bool obd2_signals_t::is_obd2_request(DiagnosticRequest* request)
+///
+/// @brief Build a DiagnosticRequest struct to be passed
+/// to diagnostic manager instance.
+///
+const DiagnosticRequest diagnostic_message_t::build_diagnostic_request()
{
- return request->mode == 0x1 && request->has_pid && request->pid < 0xff;
+ return {/*arbitration_id: */OBD2_FUNCTIONAL_BROADCAST_ID,
+ /*mode: */0x1,
+ /*has_pid: */true,
+ /*pid: */pid_,
+ /*pid_length: */0,
+ /*payload[]: */{0},
+ /*payload_length: */0,
+ /*no_frame_padding: */false,
+ /*DiagnosticRequestType: */DiagnosticRequestType::DIAGNOSTIC_REQUEST_TYPE_PID };
}
-/**
-* @brief Check if requested signal name is an obd2 pid
-*
-* @return true if name began with obd2 else false.
-*/
-bool obd2_signals_t::is_obd2_signal(const char *name)
+///
+/// @brief Check if a request is an OBD-II PID request.
+///
+/// @return true if the request is a mode 1 request and it has a 1 byte PID.
+///
+bool diagnostic_message_t::is_obd2_request(const DiagnosticRequest* request)
{
- if(fnmatch("obd2.*", name, FNM_CASEFOLD) == 0)
- return true;
- return false;
+ return request->mode == 0x1 && request->has_pid && request->pid < 0xff;
}
-
-/**
-* @brief Decode the payload of an OBD-II PID.
-*
-* This function matches the type signature for a DiagnosticResponseDecoder, so
-* it can be used as the decoder for a DiagnosticRequest. It returns the decoded
-* value of the PID, using the standard formulas (see
-* http://en.wikipedia.org/wiki/OBD-II_PIDs#Mode_01).
-*
-* @param[in] DiagnosticResponse response - the received DiagnosticResponse (the data is in response.payload,
-* a byte array). This is most often used when the byte order is
-* signiticant, i.e. with many OBD-II PID formulas.
-* @param[in] float parsed_payload - the entire payload of the response parsed as an int.
-*/
-float obd2_signals_t::decode_obd2_response(const DiagnosticResponse* response, float parsedPayload)
-{
- return diagnostic_decode_obd2_pid(response);
-}
\ No newline at end of file
Code Review / apps / agl-service-can-low-level.git / blobdiff