Code Review
/
apps
/
agl-service-can-low-level.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
socket-bcm: Format, simplification of open socket
[apps/agl-service-can-low-level.git]
/
low-can-binding
/
utils
/
converter.cpp
diff --git
a/low-can-binding/utils/converter.cpp
b/low-can-binding/utils/converter.cpp
index
fad1775
..
6392fbd
100644
(file)
--- a/
low-can-binding/utils/converter.cpp
+++ b/
low-can-binding/utils/converter.cpp
@@
-32,7
+32,7
@@
std::string converter_t::to_hex(const uint8_t data[], const size_t length)
std::stringstream stream;
stream << std::hex << std::setfill('0');
for(int i = 0; i < length; i++)
std::stringstream stream;
stream << std::hex << std::setfill('0');
for(int i = 0; i < length; i++)
- stream << std::hex << ((int) data[i]);
+ stream << std::
setfill('0') << std::setw(2) << std::
hex << ((int) data[i]);
return stream.str();
}
return stream.str();
}
@@
-58,27
+58,31
@@
void converter_t::signal_to_bits_bytes(unsigned int bit_position, unsigned int b
/**
/**
- * @brief This is to use when you have a big endian CAN frame layout.
- *
It converts the bit position so it matches with little endiant CAN frame layout.
+ * @brief This is to use when you have a big endian CAN frame layout.
+ * It converts the bit position so it matches with little endiant CAN frame layout.
*
* @param bit_position Original bit position.
* @param bit_size Size of the data.
*
* @param bit_position Original bit position.
* @param bit_size Size of the data.
- * @return uint32_t New
little endian
bit position.
+ * @return uint32_t New bit position.
*/
*/
-uint32_t converter_t::bit_position_swap(u
int32_t bit_position,uint32_
t bit_size)
+uint32_t converter_t::bit_position_swap(u
nsigned int msg_length, unsigned int bit_position, unsigned in
t bit_size)
{
{
- uint32_t start_byte_position = (uint32_t)(bit_position/8);
- uint32_t bit_size_rest = bit_size;
+ return msg_length - bit_position - bit_size;
+ /*
+ unsigned int start_byte_position = (unsigned int)(bit_position/8);
+ unsigned int bit_size_rest = bit_size;
- if((int)(bit_size-(8 + start_byte_position
*8-bit_position%8))>
0)
+ if((int)(bit_size-(8 + start_byte_position
* 8 - bit_position % 8)) >
0)
{
AFB_ERROR("Error: bit_position and bit_size getting out of range");
return bit_position;
}
{
AFB_ERROR("Error: bit_position and bit_size getting out of range");
return bit_position;
}
- if(bit_size<=8 && ((bit_position+bit_size)%8==bit_size || (bit_position+bit_size)%8==0))
+ if(bit_size <= 8 &&
+ ((bit_position+bit_size) % 8 == bit_size ||
+ (bit_position+bit_size)%8==0))
{
{
- return (u
int32_
t)(start_byte_position*8 + (8-bit_size));
+ return (u
nsigned in
t)(start_byte_position*8 + (8-bit_size));
}
else
{
}
else
{
@@
-88,7
+92,7
@@
uint32_t converter_t::bit_position_swap(uint32_t bit_position,uint32_t bit_size)
start_byte_position--;
bit_position = start_byte_position*8;
} while (bit_size_rest>8);
start_byte_position--;
bit_position = start_byte_position*8;
} while (bit_size_rest>8);
- return (u
int32_
t)(start_byte_position*8 + (8-bit_size_rest));
+ return (u
nsigned in
t)(start_byte_position*8 + (8-bit_size_rest));
}
}
-
+ */
}
}