Skip to content

Fix DSDL Compiler Dynamic Array Encoding/Decoding Issues #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pavel-kirienko merged 3 commits into from
May 8, 2019
Merged

Fix DSDL Compiler Dynamic Array Encoding/Decoding Issues #119

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd35340
Fixed issue with decoding dynamic arrays
davidlenfesty May 7, 2019
00f0426
Changed comment in template to maybe match functionality better.
davidlenfesty May 7, 2019
152d5fb
Fixed theoretical encoding issue
davidlenfesty May 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dsdl_compiler/libcanard_dsdl_compiler/code_type_template.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* @param msg_buf: pointer to msg storage
* @param offset: bit offset to msg storage
* @param root_item: for detecting if TAO should be used
* @retval returns offset
* @retval returns new offset
*/
uint32_t ${type_name}_encode_internal(${type_name}* source,
void* msg_buf,
Expand Down Expand Up @@ -96,7 +96,7 @@ uint32_t ${type_name}_encode_internal(${type_name}* source,
for (c = 0; c < source->${'%s' % ((f.name + '.len'))}; c++)
{
%if f.cpp_type_category == t.CATEGORY_COMPOUND:
offset += ${f.cpp_type}_encode_internal((void*)&source->${'%s' % ((f.name + '.data'))}[c], msg_buf, offset, 0);
offset = ${f.cpp_type}_encode_internal((void*)&source->${'%s' % ((f.name + '.data'))}[c], msg_buf, offset, 0);
%else
canardEncodeScalar(msg_buf,
offset,
Expand Down Expand Up @@ -180,7 +180,7 @@ uint32_t ${type_name}_encode(${type_name}* source, void* msg_buf)
* ${type_name} dyn memory will point to dyn_arr_buf memory.
* NULL will ignore dynamic arrays decoding.
* @param offset: Call with 0, bit offset to msg storage
* @retval offset or ERROR value if < 0
* @retval new offset or ERROR value if < 0
*/
int32_t ${type_name}_decode_internal(
const CanardRxTransfer* transfer,
Expand Down Expand Up @@ -279,7 +279,7 @@ int32_t ${type_name}_decode_internal(
for (c = 0; c < dest->${'%s' % ((f.name + '.len'))}; c++)
{
%if f.cpp_type_category == t.CATEGORY_COMPOUND:
offset += ${f.cpp_type}_decode_internal(transfer,
offset = ${f.cpp_type}_decode_internal(transfer,
0,
(void*)&dest->${'%s' % ((f.name + '.data'))}[c],
dyn_arr_buf,
Expand Down