Skip to content

Commit ce107e5

Browse files
authored
Export WholeBodyToolbox.slx as a 2016B SLX file (#221)
* Export WholeBodyToolbox.slx as a 2016B SLX file Furthermore, modify the matlab/export_library.m file to export that file as 2016B. Fix #219
1 parent 4dea554 commit ce107e5

File tree

5 files changed

+106
-114
lines changed

5 files changed

+106
-114
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@ The format of this document is based on [Keep a Changelog](https://keepachangelo
55

66
## [Unreleased]
77

8-
## [5.4.1] - 2021-05-xx
8+
## [5.4.1] - 2021-05-28
9+
10+
### Changed
11+
- The `WBToolboxLibrary.slx` file is now encoded in R2016b slx format, so at least MATLAB R2016b is required to use it.
912

1013
### Fixed
1114
- Fixed bug that caused Simulink models that used OSQP block to hang indefinitely in "Initializing" or "Compiling" phase (https://github.com/robotology/wb-toolbox/pull/220).
1215
- Disable verbose output option in OSQP block (https://github.com/robotology/wb-toolbox/pull/220).
16+
- Fixed problem introduced in 5.4.0 that prevented the `WholeBodyToolbox` library to appear correctly in the Simulink library browser on some MATLAB versions and on some Operating Systems (spotted on MATLAB R2020b with Ubuntu 20.04) (https://github.com/robotology/wb-toolbox/issues/219, https://github.com/robotology/wb-toolbox/pull/220).
1317

1418
## [5.4.0] - 2021-05-24
1519

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# GNU Lesser General Public License v2.1 or any later version.
44

55
cmake_minimum_required(VERSION 3.5)
6-
project(WB-Toolbox LANGUAGES CXX VERSION 5.4.0)
6+
project(WB-Toolbox LANGUAGES CXX VERSION 5.4.1)
77

88
if(WBT_BUILD_DOCS)
99
add_subdirectory(doc)

matlab/export_library.m

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
% This software may be modified and distributed under the terms of the
33
% GNU Lesser General Public License v2.1 or any later version.
44

5-
fprintf('\nWhole Body toolbox exporting library to multiple versions\n');
6-
7-
if (verLessThan('matlab', '8.4'))
8-
error('This script should be launched with a MATLAB version >= than 2014b');
9-
quit;
10-
end
5+
fprintf('\nWhole Body toolbox exporting library to old Simulink version\n');
116

127
addpath(genpath('library'));
138
libraryName = 'WBToolboxLibrary_repository';
@@ -26,8 +21,8 @@
2621

2722
% Export the library. It must be in slx otherwise it will not show up in
2823
% the Simulink Library browser.
29-
fprintf('\nExporting for 2014b\n');
30-
save_system(libraryName, 'WBToolboxLibrary', 'ExportToVersion', 'R2014B_SLX');
24+
fprintf('\nExporting for 2016b\n');
25+
save_system(libraryName, 'WBToolboxLibrary', 'ExportToVersion', 'R2016B_SLX');
3126
movefile('WBToolboxLibrary.slx', 'library/exported/WBToolboxLibrary.slx');
3227

3328
% Unload the library

0 commit comments

Comments
 (0)