X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.cpp;fp=src%2Fmain.cpp;h=9f7969f96a4c5530a6f9a0a3351924686e5afa5f;hb=afa9e975060169168853700c06736ab519e996ee;hp=ac7ce4bae129fd6698d316201979220ba89af2a2;hpb=f61a6cb23ab86da2b3d477276886f1e73ec5c88c;p=src%2Flow-level-can-generator.git diff --git a/src/main.cpp b/src/main.cpp index ac7ce4b..9f7969f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -151,7 +151,7 @@ std::ostream& operator<<(std::ostream& o, const generator& v) << v.line_prefix_ << "\t" << v.v_.bit_position() << ",// bit_position\n" << v.line_prefix_ << "\t" << v.v_.bit_size() << ",// bit_size\n" << v.line_prefix_ << "\t" << gen(v.v_.factor()) << ",// factor\n" - << v.line_prefix_ << "\t" << v.v_.offset() << ",// offset\n" + << v.line_prefix_ << "\t" << gen(v.v_.offset()) << ",// offset\n" << v.line_prefix_ << "\t" << "0,// min_value\n" << v.line_prefix_ << "\t" << "0,// max_value\n" << v.line_prefix_ << "\tfrequency_clock_t(" << gen(v.v_.max_frequency()) << "),// frequency\n" @@ -168,11 +168,11 @@ std::ostream& operator<<(std::ostream& o, const generator& v) }else{ multi_first = "false"; } - std::string multi = "std::make_pair(" + multi_first + "," + std::to_string(v.v_.multiplex().second) + ")"; + std::string multi = "std::make_pair(" + multi_first + ", " + std::to_string(v.v_.multiplex().second) + ")"; o << v.line_prefix_ << '\t' << multi << ",// multiplex\n" << v.line_prefix_ << '\t' << v.v_.is_big_endian() << ",// is_big_endian\n" << v.line_prefix_ << '\t' << v.v_.is_signed() << ",// is_signed\n" - << v.line_prefix_ << "\t" << gen(v.v_.unit()) << ",// unit\n" + << v.line_prefix_ << "\t" << gen(v.v_.unit()) << "// unit\n" << v.line_prefix_ << "})}"; return o; } @@ -200,7 +200,7 @@ std::ostream& operator<<(std::ostream& o, const generator& o << "frequency_clock_t(" << gen(v.v_.max_frequency()) << ")," << gen(v.v_.force_send_changed()) << ","; std::uint32_t index = 0; - o << "\t\t\t\t\t{ // beginning signals vector\n"; + o << "\n\t\t\t\t\t{ // beginning signals vector\n"; std::uint32_t signal_count = (uint32_t)v.v_.signals().size(); for(const openxc::signal& s : v.v_.signals()) {