std::ostream& operator<<(std::ostream& o, const generator<openxc::message_set>& v)\r
{\r
o << v.line_prefix_\r
- << "{std::make_shared<can_message_set_t>(can_message_set_t{"\r
+ << "{std::make_shared<message_set_t>(message_set_t{"\r
<< "0,"\r
<< gen(v.v_.name()) << ",\n"\r
- << "\t\t\t{ // beginning can_message_definition_ vector\n"\r
+ << "\t\t\t{ // beginning message_definition_ vector\n"\r
<< gen(v.v_.messages(), "\t\t\t")\r
- << "\n\t\t}, // end can_message_definition vector\n"\r
+ << "\n\t\t}, // end message_definition vector\n"\r
<< "\t\t\t{ // beginning diagnostic_messages_ vector\n"\r
<< gen(v.v_.diagnostic_messages(),"\t\t\t") << "\n"\r
<< "\t\t\t} // end diagnostic_messages_ vector\n"\r
- << "\t\t})} // end can_message_set entry\n";\r
+ << "\t\t})} // end message_set entry\n";\r
return o;\r
}\r
\r
template <>\r
std::ostream& operator<<(std::ostream& o, const generator<openxc::signal>& v)\r
{\r
- o << v.line_prefix_ << "{std::make_shared<can_signal_t> (can_signal_t{\n"\r
- << v.line_prefix_ << "\t" << gen(v.v_.generic_name()) << ",\n"\r
- << v.line_prefix_ << "\t" << v.v_.bit_position() << ",\n"\r
- << v.line_prefix_ << "\t" << v.v_.bit_size() << ",\n"\r
- << v.line_prefix_ << "\t" << gen(v.v_.factor()) << ",\n"\r
- << v.line_prefix_ << "\t" << v.v_.offset() << ",\n"\r
- << v.line_prefix_ << "\t" << "0,\n"\r
- << v.line_prefix_ << "\t" << "0,\n"\r
- << v.line_prefix_ << "\tfrequency_clock_t(" << gen(v.v_.max_frequency()) << "),\n"\r
- << v.line_prefix_ << "\t" << gen(v.v_.send_same()) << ",\n"\r
- << v.line_prefix_ << "\t" << gen(v.v_.force_send_changed()) << ",\n"\r
- << gen(v.v_.states(), v.line_prefix_ + '\t') << ",\n"\r
- << v.line_prefix_ << '\t' << gen(v.v_.writable()) << ",\n"\r
- << v.line_prefix_ << '\t' << (v.v_.decoder().size() ? v.v_.decoder() : v.v_.states().size() ? "decoder_t::decode_state" : "nullptr") << ",\n"\r
- << v.line_prefix_ << '\t' << (v.v_.encoder().size() ? v.v_.encoder() : "nullptr") << ",\n"\r
- << v.line_prefix_ << '\t' << "false\n"\r
+ o << v.line_prefix_ << "{std::make_shared<signal_t> (signal_t{\n"\r
+ << v.line_prefix_ << "\t" << gen(v.v_.generic_name()) << ",// generic_name\n"\r
+ << v.line_prefix_ << "\t" << v.v_.bit_position() << ",// bit_position\n"\r
+ << v.line_prefix_ << "\t" << v.v_.bit_size() << ",// bit_size\n"\r
+ << v.line_prefix_ << "\t" << gen(v.v_.factor()) << ",// factor\n"\r
+ << v.line_prefix_ << "\t" << v.v_.offset() << ",// offset\n"\r
+ << v.line_prefix_ << "\t" << "0,// min_value\n"\r
+ << v.line_prefix_ << "\t" << "0,// max_value\n"\r
+ << v.line_prefix_ << "\tfrequency_clock_t(" << gen(v.v_.max_frequency()) << "),// frequency\n"\r
+ << v.line_prefix_ << "\t" << gen(v.v_.send_same()) << ",// send_same\n"\r
+ << v.line_prefix_ << "\t" << gen(v.v_.force_send_changed()) << ",// force_send_changed\n"\r
+ << gen(v.v_.states(), v.line_prefix_ + '\t') << ",// states\n"\r
+ << v.line_prefix_ << '\t' << gen(v.v_.writable()) << ",// writable\n"\r
+ << v.line_prefix_ << '\t' << (v.v_.decoder().size() ? v.v_.decoder() : v.v_.states().size() ? "decoder_t::decode_state" : "nullptr") << ",// decoder\n"\r
+ << v.line_prefix_ << '\t' << (v.v_.encoder().size() ? v.v_.encoder() : "nullptr") << ",// encoder\n"\r
+ << v.line_prefix_ << '\t' << "false,// received\n";\r
+ std::string multi_first = "";\r
+ if(v.v_.multiplex().first){\r
+ multi_first = "true";\r
+ }else{\r
+ multi_first = "false";\r
+ }\r
+ std::string multi = "std::make_pair<bool, int>(" + multi_first + "," + std::to_string(v.v_.multiplex().second) + ")";\r
+ o << v.line_prefix_ << '\t' << multi << ",// multiplex\n"\r
+ << v.line_prefix_ << '\t' << v.v_.is_big_endian() << ",// is_big_endian\n"\r
+ << v.line_prefix_ << '\t' << v.v_.is_signed() << ",// is_signed\n"\r
+ << v.line_prefix_ << "\t" << gen(v.v_.unit()) << ",// unit\n"\r
<< v.line_prefix_ << "})}";\r
return o;\r
}\r
std::ostream& operator<<(std::ostream& o, const generator<openxc::can_message>& v)\r
{\r
o << v.line_prefix_\r
- << "{std::make_shared<can_message_definition_t>(can_message_definition_t{"\r
+ << "{std::make_shared<message_definition_t>(message_definition_t{"\r
<< gen(v.v_.bus()) << ","\r
<< v.v_.id() << ","\r
- << v.v_.is_fd() << ","\r
- << "can_message_format_t::STANDARD,"\r
- << "frequency_clock_t(" << gen(v.v_.max_frequency()) << "),"\r
- << gen(v.v_.force_send_changed()) << ",\n";\r
+ << "\"" << v.v_.name() << "\","\r
+ << v.v_.length() << ","\r
+ << gen(v.v_.is_fd()) << ",";\r
+ if(v.v_.is_j1939()){\r
+ o << "message_format_t::J1939,";\r
+ }\r
+ else if(v.v_.is_extended())\r
+ {\r
+ o << "message_format_t::EXTENDED,";\r
+ }\r
+ else{\r
+ o << "message_format_t::STANDARD,";\r
+ }\r
+ o << "frequency_clock_t(" << gen(v.v_.max_frequency()) << "),"\r
+ << gen(v.v_.force_send_changed()) << ",";\r
std::uint32_t index = 0;\r
- o << "\t\t\t\t\t{ // beginning can_signals vector\n";\r
+ o << "\t\t\t\t\t{ // beginning signals vector\n";\r
std::uint32_t signal_count = (uint32_t)v.v_.signals().size();\r
for(const openxc::signal& s : v.v_.signals())\r
{\r
--signal_count;\r
o << '\n';\r
}\r
- o << "\t\t\t\t\t} // end can_signals vector\n"\r
- << "\t\t\t\t})} // end can_message_definition entry\n";\r
+ o << "\t\t\t\t\t} // end signals vector\n"\r
+ << "\t\t\t\t})} // end message_definition entry\n";\r
return o;\r
}\r
\r
\r
out << "application_t::application_t()\n"\r
<< " : can_bus_manager_{utils::config_parser_t{\"/etc/dev-mapping.conf\"}}\n"\r
- << " , can_message_set_{\n"\r
+ << " , message_set_{\n"\r
<< gen(message_set, "\t\t")\r
- << "\t} // end can_message_set vector\n"\r
+ << "\t} // end message_set vector\n"\r
<< "{\n"\r
- << " for(auto& cms: can_message_set_)\n"\r
+ << " for(std::shared_ptr<message_set_t> cms: message_set_)\n"\r
<< " {\n"\r
- << " std::vector<std::shared_ptr<can_message_definition_t> >& can_messages_definition = cms->get_can_message_definition();\n"\r
- << " for(auto& cmd : can_messages_definition)\n"\r
+ << " std::vector<std::shared_ptr<message_definition_t>> messages_definition = cms->get_messages_definition();\n"\r
+ << " for(std::shared_ptr<message_definition_t> cmd : messages_definition)\n"\r
<< " {\n"\r
- << " cmd->set_parent(cms.get());\n"\r
- << " std::vector<std::shared_ptr<can_signal_t> >& can_signals = cmd->get_can_signals();\n"\r
- << " for(auto& sig: can_signals)\n"\r
+ << " cmd->set_parent(cms);\n"\r
+ << " std::vector<std::shared_ptr<signal_t>> signals = cmd->get_signals();\n"\r
+ << " for(std::shared_ptr<signal_t> sig: signals)\n"\r
<< " {\n"\r
- << " sig->set_parent(cmd.get());\n"\r
+ << " sig->set_parent(cmd);\n"\r
<< " }\n"\r
<< " }\n\n"\r
- << " std::vector<std::shared_ptr<diagnostic_message_t> >& diagnostic_messages = cms->get_diagnostic_messages();\n"\r
- << " for(auto& dm : diagnostic_messages)\n"\r
+ << " std::vector<std::shared_ptr<diagnostic_message_t>> diagnostic_messages = cms->get_diagnostic_messages();\n"\r
+ << " for(std::shared_ptr<diagnostic_message_t> dm : diagnostic_messages)\n"\r
<< " {\n"\r
- << " dm->set_parent(cms.get());\n"\r
+ << " dm->set_parent(cms);\n"\r
<< " }\n"\r
<< " }\n"\r
<< " }\n\n"\r
Code Review / src / low-level-can-generator.git / blobdiff