Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

SCDDS-core
- Activity
- Members
- Releases
- Model registry
- Contributor analytics
- Model experiments

Snippets Groups Projects

58f89737

Commit 58f89737 authored 5 years ago by Federico Felici

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into feature/add-meq

We like the Simulink 3-way merge. Thank you.

parents fa0149b0 ba233a61

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

code/classes/SCDclass_expcode.m 17 additions, 0 deletions

code/classes/SCDclass_expcode.m
code/classes/SCDclass_task.m 48 additions, 2 deletions

code/classes/SCDclass_task.m
code/classes/SCDclass_taskcontainer.m 50 additions, 1 deletion

code/classes/SCDclass_taskcontainer.m
code/classes/SCDclass_taskmdscheckbusnames.m 47 additions, 13 deletions

code/classes/SCDclass_taskmdscheckbusnames.m
code/classes/SCDclass_taskmdsloadprevADC.m 6 additions, 0 deletions

code/classes/SCDclass_taskmdsloadprevADC.m
test/simulink_codegen_tests/export_shrlib_def_scd.tlc 1 addition, 0 deletions

test/simulink_codegen_tests/export_shrlib_def_scd.tlc
tests/test_expcodes.m 10 additions, 2 deletions

tests/test_expcodes.m

with 179 additions and 18 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment