From: Michal Sojka Date: Sun, 4 Oct 2015 14:35:12 +0000 (+0200) Subject: GIO: Offer only pins that are configured as GPIO X-Git-Tag: eaton-0.7~10 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/jenkicar/rpp-simulink.git/commitdiff_plain/5cefa4c528a88dda4e77ba02c57e8e383afb8724 GIO: Offer only pins that are configured as GPIO --- diff --git a/rpp/blocks/rpp_update_blocks_for_target.m b/rpp/blocks/rpp_update_blocks_for_target.m index 44897e7..e7a154d 100644 --- a/rpp/blocks/rpp_update_blocks_for_target.m +++ b/rpp/blocks/rpp_update_blocks_for_target.m @@ -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 9775079..2f0308e 160000 --- a/rpp/lib +++ b/rpp/lib @@ -1 +1 @@ -Subproject commit 9775079b2b35eb40cf4808b185631e786c2bc1d8 +Subproject commit 2f0308e1b610e6039677031bdb86e0bb378dd43e