]> rtime.felk.cvut.cz Git - pes-rpp/rpp-simulink.git/commitdiff
GIO: Offer only pins that are configured as GPIO
authorMichal Sojka <sojkam1@fel.cvut.cz>
Sun, 4 Oct 2015 14:35:12 +0000 (16:35 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Sun, 4 Oct 2015 14:35:12 +0000 (16:35 +0200)
rpp/blocks/rpp_update_blocks_for_target.m
rpp/lib

index 44897e73373ab9342f1a98d185226d3e097be354..e7a154d9d00c3a7dde0acfa10e635cd1e08814e3 100644 (file)
@@ -14,7 +14,9 @@ function update_gio_names(lib)
     p = Simulink.Mask.get(block);
     param = p.getParameter('pin');
     gio_names_txt = fullfile(getpref('rpp', 'RppLibRoot'), 'build', 'gio_names.txt');
-    param.TypeOptions = [{'---'}; textread(gio_names_txt, '%s')];
+    [names,conf]=textread(gio_names_txt, '%s %s');
+    gio_names = names(cellfun(@(x) ~isempty(x), strfind(conf, 'FNC_GPIO')));
+    param.TypeOptions = [{'---'}; gio_names];
     set_param(block_lib, 'Lock', 'on');
     save_system(block_lib);
     close_system(block_lib);
diff --git a/rpp/lib b/rpp/lib
index 9775079b2b35eb40cf4808b185631e786c2bc1d8..2f0308e1b610e6039677031bdb86e0bb378dd43e 160000 (submodule)
--- a/rpp/lib
+++ b/rpp/lib
@@ -1 +1 @@
-Subproject commit 9775079b2b35eb40cf4808b185631e786c2bc1d8
+Subproject commit 2f0308e1b610e6039677031bdb86e0bb378dd43e