Skip to content

Workaround for Holley DTZ541 - #76

Merged
andig merged 4 commits into
volkszaehler:masterfrom
hacki11:holley-dtz541-workaround
Oct 31, 2019
Merged

Workaround for Holley DTZ541#76
andig merged 4 commits into
volkszaehler:masterfrom
hacki11:holley-dtz541-workaround

Conversation

@hacki11

@hacki11 hacki11 commented Sep 22, 2019

Copy link
Copy Markdown
  • handling incorrect sml_time object
  • support crc-16/kermit algorithm

- handling incorrect sml_time object
- support crc-16/kermit algorithm

@mbehr1 mbehr1 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see comments. mem leak introduced.

Comment thread sml/src/sml_time.c Outdated

@mbehr1 mbehr1 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks ok for me.

Comment thread sml/src/sml_time.c Outdated
@hacki11

hacki11 commented Oct 8, 2019

Copy link
Copy Markdown
Author

Fixed review findings

@hacki11

hacki11 commented Oct 29, 2019

Copy link
Copy Markdown
Author

If there aren’t any more findings a merge would be nice

@andig

andig commented Oct 29, 2019

Copy link
Copy Markdown

Out of curiosity- why the unrelated whitespace change? Does that make anything more consistent?

@hacki11

hacki11 commented Oct 30, 2019

Copy link
Copy Markdown
Author

Seems that was my auto formatting of clion. Perhaps tab replacement with whitespaces and indentation fixes. Can revert that changes if you want.

@andig

andig commented Oct 30, 2019

Copy link
Copy Markdown

Please revert unwanted changes and check style- this repo is typically using tabs, you have spaces apparently. Reformatting the entire codebase would be a different issue.

@hacki11

hacki11 commented Oct 30, 2019

Copy link
Copy Markdown
Author

fixed

Comment thread sml/src/sml_time.c
if (sml_buf_get_next_length(buf) != 2) {
buf->error = 1;
goto error;
}

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hier stimmt noch die Einrückung nicht?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doch, der Block gehört nun in den else Zweig

@andig
andig merged commit 36fc784 into volkszaehler:master Oct 31, 2019
@andig

andig commented Oct 31, 2019

Copy link
Copy Markdown

Fixes #75

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants