due to the error in 19caeec the assumption in the test was wrong. It has to be changed

Author: Murmele

src/message.cpp

@@ -27,7 +27,45 @@ namespace libdbc {
             } else {
                 const auto& signal = m_signals.at(bs.index);
                 if (signal.is_bigendian) {
-
+                    switch (bs.size) {
+                        case 1:
+                        v = static_cast<double>(bitstream_reader_read_bit(&reader)); break;
+                    case 8:
+                        if (signal.is_signed)
+                            v = static_cast<double>(static_cast<int8_t>(bitstream_reader_read_u8(&reader)));
+                        else
+                            v = static_cast<double>(bitstream_reader_read_u8(&reader));
+                        break;
+                    case 16:
+                        if (signal.is_signed)
+                            v = static_cast<double>(static_cast<int16_t>(bitstream_reader_read_u16(&reader)));
+                        else
+                            v = static_cast<double>(bitstream_reader_read_u16(&reader));
+                        break;
+                    case 32:
+                        if (signal.is_signed)
+                            v = static_cast<double>(static_cast<int32_t>(bitstream_reader_read_u32(&reader)));
+                        else
+                            v = static_cast<double>(bitstream_reader_read_u32(&reader));
+                        break;
+                    case 64:
+                        if (signal.is_signed)
+                            v = static_cast<double>(static_cast<int64_t>(bitstream_reader_read_u64(&reader)));
+                        else
+                            v = static_cast<double>(bitstream_reader_read_u64(&reader));
+                        break;
+                    default: {
+                        // TODO: possible to implement bigendian and sign?
+                        uint64_t value = 0;
+                        for (uint32_t i=0; i < bs.size; i++) {
+                            value |= bitstream_reader_read_bit(&reader) << i;
+                        }
+                        v = static_cast<double>(value);
+                        break;
+                    }
+                    }
+                } else {
+                    // little endian
                     switch (bs.size) {
                         case 1: v = static_cast<double>(bitstream_reader_read_bit(&reader)); break;
                     case 8: v = static_cast<double>(bitstream_reader_read_u8(&reader)); break;
@@ -76,45 +114,6 @@ namespace libdbc {
                         break;
                     }
                     }
-                } else {
-                    // little endian
-                    switch (bs.size) {
-                        case 1:
-                        v = static_cast<double>(bitstream_reader_read_bit(&reader)); break;
-                    case 8:
-                        if (signal.is_signed)
-                            v = static_cast<double>(static_cast<int8_t>(bitstream_reader_read_u8(&reader)));
-                        else
-                            v = static_cast<double>(bitstream_reader_read_u8(&reader));
-                        break;
-                    case 16:
-                        if (signal.is_signed)
-                            v = static_cast<double>(static_cast<int16_t>(bitstream_reader_read_u16(&reader)));
-                        else
-                            v = static_cast<double>(bitstream_reader_read_u16(&reader));
-                        break;
-                    case 32:
-                        if (signal.is_signed)
-                            v = static_cast<double>(static_cast<int32_t>(bitstream_reader_read_u32(&reader)));
-                        else
-                            v = static_cast<double>(bitstream_reader_read_u32(&reader));
-                        break;
-                    case 64:
-                        if (signal.is_signed)
-                            v = static_cast<double>(static_cast<int64_t>(bitstream_reader_read_u64(&reader)));
-                        else
-                            v = static_cast<double>(bitstream_reader_read_u64(&reader));
-                        break;
-                    default: {
-                        // TODO: possible to implement bigendian and sign?
-                        uint64_t value = 0;
-                        for (uint32_t i=0; i < bs.size; i++) {
-                            value |= bitstream_reader_read_bit(&reader) << i;
-                        }
-                        v = static_cast<double>(value);
-                        break;
-                    }
-                    }
                 }
 
                 values.push_back(v * signal.factor + signal.offset);

test/test_dbc.cpp

@@ -174,7 +174,7 @@ TEST_CASE("Parse Message little endian") {
     libdbc::DbcParser p(true);
     p.parse_file(filename);
 
-    std::vector<uint8_t> data{0x27, 0x08, 0x22, 0xa3, 0x1f, 0xe5, 0x14, 0x45}; // little endian
+    std::vector<uint8_t> data{0x08, 0x27, 0xa3, 0x22, 0xe5, 0x1f, 0x45, 0x14}; // little endian
     std::vector<double> result_values;
     REQUIRE(p.parseMessage(0x21d, data, result_values) == true);
     REQUIRE(result_values.size() == 4);
@@ -201,7 +201,7 @@ TEST_CASE("Parse Message big endian") {
     libdbc::DbcParser p(true);
     p.parse_file(filename);
 
-    std::vector<uint8_t> data{0x08, 0x27, 0xa3, 0x22, 0xe5, 0x1f, 0x45, 0x14}; // big endian
+    std::vector<uint8_t> data{0x27, 0x08, 0x22, 0xa3, 0x1f, 0xe5, 0x14, 0x45}; // big endian
     std::vector<double> result_values;
     REQUIRE(p.parseMessage(0x21d, data, result_values) == true);
     REQUIRE(result_values.size() == 4);