Fixed a bug about the old OS library path in the repository. And more OCD stuffs.

diff --git a/rpp/rpp/rpp.tlc b/rpp/rpp/rpp.tlc
index dd216be8312862e2743d62fd11b7b115f2c1cdf3..f995e689b087e21f8c0369cf2d6d4f20fc03ed69 100644 (file)
--- a/rpp/rpp/rpp.tlc
+++ b/rpp/rpp/rpp.tlc
@@ -44,29 +44,29 @@
 
 /%
   BEGIN_RTW_OPTIONS
-  rtwoptions(1).prompt         = 'RPP Options';
-  rtwoptions(1).type           = 'Category';
-  rtwoptions(1).enable         = 'on';
-  rtwoptions(1).default        = 1;   % number of items under this category
-                                      % excluding this one.
-  rtwoptions(1).popupstrings  = '';
-  rtwoptions(1).tlcvariable   = '';
-  rtwoptions(1).tooltip       = '';
-  rtwoptions(1).callback      = '';
-  rtwoptions(1).makevariable  = '';
+  rtwoptions(1).prompt          = 'RPP Options';
+  rtwoptions(1).type            = 'Category';
+  rtwoptions(1).enable          = 'on';
+  rtwoptions(1).default         = 1;   % number of items under this category
+                                       % excluding this one.
+  rtwoptions(1).popupstrings    = '';
+  rtwoptions(1).tlcvariable     = '';
+  rtwoptions(1).tooltip         = '';
+  rtwoptions(1).callback        = '';
+  rtwoptions(1).makevariable    = '';
 
-  rtwoptions(2).prompt         = 'Download compiled binary to RPP';
-  rtwoptions(2).type           = 'Checkbox';
-  rtwoptions(2).default        = 'off';
-  rtwoptions(2).tlcvariable    = '';
-  rtwoptions(2).makevariable   = 'RPP_DOWNLOAD';
-  rtwoptions(2).tooltip        = ['Download compiled binary to RPP'];
-  rtwoptions(2).callback       = '';
+  rtwoptions(2).prompt          = 'Download compiled binary to RPP';
+  rtwoptions(2).type            = 'Checkbox';
+  rtwoptions(2).default         = 'off';
+  rtwoptions(2).tlcvariable     = '';
+  rtwoptions(2).makevariable    = 'RPP_DOWNLOAD';
+  rtwoptions(2).tooltip         = ['Download compiled binary to RPP'];
+  rtwoptions(2).callback        = '';
 
   % Configure code generation settings
   rtwgensettings.BuildDirSuffix = '_rpp';
-  rtwgensettings.Version = '1';
-  rtwgensettings.DerivedFrom = 'ert.tlc';
+  rtwgensettings.Version        = '1';
+  rtwgensettings.DerivedFrom    = 'ert.tlc';
   rtwgensettings.SelectCallback = 'rpp_select_callback_handler(hDlg, hSrc)';
 
   END_RTW_OPTIONS

diff --git a/rpp/rpp/rpp_download.m b/rpp/rpp/rpp_download.m
index 37520970aecb78ee06fff16a61a49db2ec8eac86..4c367f007f81b8aee7c0e84001e7c07aec87c6ed 100644 (file)
--- a/rpp/rpp/rpp_download.m
+++ b/rpp/rpp/rpp_download.m
@@ -25,10 +25,6 @@
 %     Readme file in <cssroot>/ccs_base/scripting/examples/loadti/readme.txt
 
 
-% FIXME: Adapt file
-
-
-
 function rpp_download(modelName, buildDirectory)
 
     CCSRoot    = getpref('rpp', 'CCSRoot');

diff --git a/rpp/rpp/rpp_lib_support.m b/rpp/rpp/rpp_lib_support.m
index 164060b271d9d6683a61ce1997816a06de40e391..417719f1318c7ad97181b18b800b412c48c8c86a 100644 (file)
--- a/rpp/rpp/rpp_lib_support.m
+++ b/rpp/rpp/rpp_lib_support.m
@@ -18,12 +18,12 @@
 %
 % File : rpp_lib_support.m
 % Abstract:
-%     Support for RPP library and operating system setup.
+%     Simulink support for RPP library and operating system setup.
 %
 % References:
 %     rtw_ug.pdf p. 1058
 %     rtw_ref.pdf p. 56
-%     <RppRoot>/rpp/lib/os/README.txt
+%     Readme file in <RppRoot>/rpp/lib/os/README.txt
 
 
 function rpp_lib_support(modelName, buildInfo)
@@ -45,18 +45,17 @@ function rpp_freertos_support(modelName, buildInfo)
                'timers.c'   };
 
     % Get working directories
-    rppLibRoot = getpref('rpp', 'RppLibRoot');
-    rppLibRoot = fullfile(rppLibRoot, 'tmp'); % FIXME: Remove this line when library is modularized.
+    osLibRoot = fullfile(getpref('rpp', 'RppLibRoot'), 'os');
     % TODO: get suffix from rpp.tlc BuildDirSuffix
     modelRoot = Simulink.fileGenControl('getConfig').CodeGenFolder;
     outputFolder = fullfile(modelRoot, [modelName, '_rpp']);
 
     % Add sources to compilation
-    buildInfo.addSourceFiles(source, rppLibRoot);
+    buildInfo.addSourceFiles(source, osLibRoot);
 
     % Copy dependecy sources
     for i = sources
-        copyfile(fullfile(rppLibRoot  , i{1}), ...
+        copyfile(fullfile(osLibRoot   , i{1}), ...
                  fullfile(outputFolder, i{1}));
     end
 

diff --git a/rpp/rpp/rpp_select_callback_handler.m b/rpp/rpp/rpp_select_callback_handler.m
index 89323a1e5b0b94ce7c6f94972a7e647a3765816d..aec07b3638703d7738943b3116c9694a08f61253 100644 (file)
--- a/rpp/rpp/rpp_select_callback_handler.m
+++ b/rpp/rpp/rpp_select_callback_handler.m
@@ -54,7 +54,8 @@ function rpp_select_callback_handler(hDlg, hSrc)
     % Set the TargetLibSuffix
     slConfigUISetVal(hDlg, hSrc, 'TargetLibSuffix', '.a');
 
-    % Configure PostCodeGen Command to execute (library code inclusion for compilation)
+    % Configure PostCodeGen Command to execute
+    % (library code inclusion for compilation)
     slConfigUISetVal(hDlg, hSrc, 'PostCodeGenCommand', ...
         'rpp_lib_support(modelName, buildInfo)');
 

diff --git a/rpp/rpp/rpp_setup.m b/rpp/rpp/rpp_setup.m
index 2ea66f1a9c8d89f80b9cc3219a68a5be41b10309..35b7f672e152319b578d60362b5179dc09c084e3 100644 (file)
--- a/rpp/rpp/rpp_setup.m
+++ b/rpp/rpp/rpp_setup.m
@@ -29,7 +29,6 @@
 %     rtw_ug.pdf p. 1137
 
 
-% Install target on user's environment
 function rpp_setup()
 
     % Get current target path in user's filesystem