Merge pull request #97 from casper-astro/casper-astro-soak-test

Casper astro soak test
casper-astro · Jul 18, 2019 · d779990 · d779990
2 parents f489c34 + 7ba79d1
commit d779990
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 9 deletions.
diff --git a/xps_library/adc083000_mask.m b/xps_library/adc083000_mask.m
@@ -237,16 +237,9 @@
             ds_factor = 8;
         end
 
-        % add signal convert block
-        reuse_block(cursys, [gateway_in_name, '_conv'], 'xps_library/ADCs/conv', ...
-            'Position', convert_pos, ...
-            'bit_width', num2str(sample_bit_width));
-
-
         add_line( cursys, [adc_sim_block, '/', num2str( mod(sim_port,port_mod_factor)+1 )], [gateway_in_name, '/1'] );
         sim_port = sim_port +1;
-        add_line( cursys, [gateway_in_name,'/1'], [gateway_in_name, '_conv/1']);
-        add_line( cursys, [gateway_in_name, '_conv/1'], [port, '/1']);
+        add_line( cursys, [gateway_in_name,'/1'], [port, '/1']);
     elseif regexp( port, '(adc\d+)_outofrange' ),
         toks = regexp( port, '(adc\d+)_(\w+)$', 'tokens');
         if clock_sync,

diff --git a/xps_library/adc_common.m b/xps_library/adc_common.m
@@ -192,7 +192,7 @@
 
         if ds == out-1,
           or_name = ['logical',num2str(d)];
-          reuse_block(blk, or_name, 'built-in/Logical Operator', ...
+          reuse_block(blk, or_name, 'simulink/Logic and Bit Operations/Logical Operator', ...
             'Inputs', num2str(out*2), 'Operator', 'OR', ...
             'Position', [xtick*7-15 ytick*(yoff+2)-15 xtick*7+15 ytick*(yoff+2)+15]);
           for ofn = 0:out-1

diff --git a/xps_library/xps_library.slx b/xps_library/xps_library.slx
diff --git a/xps_library/xps_models/ADCs/adc083000x2.slx b/xps_library/xps_models/ADCs/adc083000x2.slx
diff --git a/xps_library/xps_models/ADCs/conv.slx b/xps_library/xps_models/ADCs/conv.slx