From a1a8a420026f2669af6d4e45f115fa63a8e086fe Mon Sep 17 00:00:00 2001
From: Cristian Galperti <cristian.galperti@epfl.ch>
Date: Tue, 9 Apr 2019 17:09:13 +0200
Subject: [PATCH] F4E expcode and example added
F4E expcode and example added, passes the sl debug,
data actualiztion, simulation and codegen
to be tested
---
code/classes/SCDclass_expcodecontainer.m | 7 ++++---
code/functions/SCDconf_createexpcodes.m | 2 ++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/code/classes/SCDclass_expcodecontainer.m b/code/classes/SCDclass_expcodecontainer.m
index 9eaf831..90b686a 100644
--- a/code/classes/SCDclass_expcodecontainer.m
+++ b/code/classes/SCDclass_expcodecontainer.m
@@ -48,9 +48,10 @@ classdef SCDclass_expcodecontainer
for(ii=1:obj.numexpcodes)
presentcodes(ii)=obj.expcodes{ii}{1};
end
- insertpos=max(find(maincode>presentcodes));
+ insertpos=min(find(presentcodes>maincode));
- if(insertpos==obj.numexpcodes)
+ %if(insertpos==obj.numexpcodes)
+ if(isempty(insertpos))
obj.expcodes{end+1}=temp;
fprintf('Expcode %d inserted (pos %d)\n', maincode, obj.numexpcodes+1);
@@ -59,7 +60,7 @@ classdef SCDclass_expcodecontainer
obj.expcodes{jj+1}=obj.expcodes{jj};
end
obj.expcodes{insertpos}=temp;
- fprintf('Expcode %d inserted (pos %d)\n', expcode.maincode, insertpos);
+ fprintf('Expcode %d inserted (pos %d)\n', maincode, insertpos);
end
obj.numexpcodes=obj.numexpcodes+1;
diff --git a/code/functions/SCDconf_createexpcodes.m b/code/functions/SCDconf_createexpcodes.m
index 777fbc1..b8b0685 100644
--- a/code/functions/SCDconf_createexpcodes.m
+++ b/code/functions/SCDconf_createexpcodes.m
@@ -12,6 +12,8 @@ SCDexps=SCDclass_expcodecontainer;
SCDexps=SCDexps.insertexpcode(1, @(x) SCDexpcodeconf_template);
SCDexps=SCDexps.insertexpcode(1005, @(x) SCDexpcodeconf_tcvstandard02);
+SCDexps=SCDexps.insertexpcode(10 , @(x) SCDexpcodeconf_f4eexample);
+
assignin('base','SCDexps',SCDexps);
--
GitLab