Skip to content

Commit

Permalink
mutual exclusive
Browse files Browse the repository at this point in the history
  • Loading branch information
@Linestro
Linestro committed Feb 27, 2019
1 parent 8a7cf67 commit 1a3eea6
Show file tree
Hide file tree
Showing 57 changed files with 2,240 additions and 2,221 deletions.
4 changes: 1 addition & 3 deletions OSC136H.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,6 @@ function MatTrigger(this, cus_time)
% end

this.WriteToWireIn(hex2dec('00'), 0, 16, 1);
% pause(0.1);
this.WriteToWireIn(hex2dec('00'), 0, 16, 0);

if cont == 0
Expand Down Expand Up @@ -361,8 +360,7 @@ function MatTrigger(this, cus_time)
success_ret = calllib('okFrontPanel', 'okFrontPanel_WriteToPipeIn', this.dev, hex2dec('80'), 2 * SIZE, data_out);
fprintf('Success %d \n', success_ret);

this.WriteToWireIn(hex2dec('00'), 0, 16, 2); % switch to pipe mode
pause(0.1);
this.WriteToWireIn(hex2dec('00'), 0, 16, 2 ^ (channel + 1)); % switch to pipe mode
this.WriteToWireIn(hex2dec('01'), 0, 16, 1); % switch to write mode

persistent buf pv;
Expand Down
Binary file modified OSC1_LITE_Control.bit
View file
Binary file not shown.
14 changes: 7 additions & 7 deletions project_LITE/project_LITE/17.cache/wt/gui_resources.wdf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version:1
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:626173656469616c6f675f63616e63656c:3630:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:626173656469616c6f675f6f6b:3735:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:626173656469616c6f675f63616e63656c:3631:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:626173656469616c6f675f6f6b:3736:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:636d646d73676469616c6f675f6d65737361676573:31:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:636d646d73676469616c6f675f6f6b:3138:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:636d646d73676469616c6f675f6f70656e5f6d657373616765735f76696577:32:00:00
Expand All @@ -16,13 +16,13 @@ version:1
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:6578707265706f72747472656570616e656c5f6578705f7265706f72745f747265655f7461626c65:32:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:65787072756e7472656570616e656c5f6578705f72756e5f747265655f7461626c65:3133:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:6578706c6f72656168656164766965775f6c61756e63685f73656c65637465645f72756e73:31:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:66696c6573657470616e656c5f66696c655f7365745f70616e656c5f74726565:333238:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:666c6f776e6176696761746f727472656570616e656c5f666c6f775f6e6176696761746f725f74726565:313232:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:67657474696e6773746172746564766965775f6f70656e5f70726f6a656374:34:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:66696c6573657470616e656c5f66696c655f7365745f70616e656c5f74726565:333336:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:666c6f776e6176696761746f727472656570616e656c5f666c6f775f6e6176696761746f725f74726565:313234:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:67657474696e6773746172746564766965775f6f70656e5f70726f6a656374:35:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:6861636763697073796d626f6c5f73686f775f64697361626c65645f706f727473:34:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:686163676374616262656470616e655f7461626265645f70616e65:33:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:68636f6465656469746f725f636c6f7365:35:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:68636f6465656469746f725f7365617263685f746578745f636f6d626f5f626f78:3135:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:68636f6465656469746f725f7365617263685f746578745f636f6d626f5f626f78:3136:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:6d61696e6d656e756d67725f65646974:34:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:6d61696e6d656e756d67725f66696c65:38:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:6d61696e6d656e756d67725f666c6f77:32:00:00
Expand Down Expand Up @@ -74,4 +74,4 @@ version:1
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:73796e7468657469636167657474696e6773746172746564766965775f726563656e745f70726f6a65637473:3133:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:74636c636f6e736f6c65766965775f74636c5f636f6e736f6c655f636f64655f656469746f72:32:00:00
70726f6a656374:76697661646f5f75736167655c6775695f7265736f7572636573:746f756368706f696e747375727665796469616c6f675f6e6f:31:00:00
eof:829617556
eof:488329369
6 changes: 3 additions & 3 deletions project_LITE/project_LITE/17.cache/wt/java_command_handlers.wdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ version:1
70726f6a656374:76697661646f5f75736167655c6a6176615f636f6d6d616e645f68616e646c657273:6e657769706c6f636174696f6e68616e646c6572:31:00:00
70726f6a656374:76697661646f5f75736167655c6a6176615f636f6d6d616e645f68616e646c657273:6e657770726f6a656374:31:00:00
70726f6a656374:76697661646f5f75736167655c6a6176615f636f6d6d616e645f68616e646c657273:6f70656e69707861637466696c65:31:00:00
70726f6a656374:76697661646f5f75736167655c6a6176615f636f6d6d616e645f68616e646c657273:6f70656e70726f6a656374:39:00:00
70726f6a656374:76697661646f5f75736167655c6a6176615f636f6d6d616e645f68616e646c657273:6f70656e70726f6a656374:3130:00:00
70726f6a656374:76697661646f5f75736167655c6a6176615f636f6d6d616e645f68616e646c657273:7265637573746f6d697a65636f7265:35:00:00
70726f6a656374:76697661646f5f75736167655c6a6176615f636f6d6d616e645f68616e646c657273:72756e62697467656e:3638:00:00
70726f6a656374:76697661646f5f75736167655c6a6176615f636f6d6d616e645f68616e646c657273:72756e62697467656e:3639:00:00
70726f6a656374:76697661646f5f75736167655c6a6176615f636f6d6d616e645f68616e646c657273:72756e696d706c656d656e746174696f6e:31:00:00
70726f6a656374:76697661646f5f75736167655c6a6176615f636f6d6d616e645f68616e646c657273:72756e6e6f697365616e616c79736973:31:00:00
70726f6a656374:76697661646f5f75736167655c6a6176615f636f6d6d616e645f68616e646c657273:7361766566696c6570726f787968616e646c6572:36:00:00
Expand All @@ -23,4 +23,4 @@ version:1
70726f6a656374:76697661646f5f75736167655c6a6176615f636f6d6d616e645f68616e646c657273:757064617465736f7572636566696c6573:33:00:00
70726f6a656374:76697661646f5f75736167655c6a6176615f636f6d6d616e645f68616e646c657273:766965777461736b696d706c656d656e746174696f6e:33:00:00
70726f6a656374:76697661646f5f75736167655c6a6176615f636f6d6d616e645f68616e646c657273:766965777461736b73796e746865736973:31:00:00
eof:1854075131
eof:2885758028
4 changes: 2 additions & 2 deletions project_LITE/project_LITE/17.cache/wt/project.wpc
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version:1
57656254616c6b5472616e736d697373696f6e417474656d70746564:50
6d6f64655f636f756e7465727c4755494d6f6465:26
57656254616c6b5472616e736d697373696f6e417474656d70746564:51
6d6f64655f636f756e7465727c4755494d6f6465:27
eof:
8 changes: 4 additions & 4 deletions project_LITE/project_LITE/17.cache/wt/synthesis.wdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ version:1
73796e746865736973:73796e7468657369735c636f6d6d616e645f6c696e655f6f7074696f6e73:2d617373657274:64656661756c743a3a5b6e6f745f7370656369666965645d:00:00
73796e746865736973:73796e7468657369735c636f6d6d616e645f6c696e655f6f7074696f6e73:2d6e6f5f74696d696e675f64726976656e:64656661756c743a3a5b6e6f745f7370656369666965645d:00:00
73796e746865736973:73796e7468657369735c636f6d6d616e645f6c696e655f6f7074696f6e73:2d73666375:64656661756c743a3a5b6e6f745f7370656369666965645d:00:00
73796e746865736973:73796e7468657369735c7573616765:656c6170736564:30303a30313a323573:00:00
73796e746865736973:73796e7468657369735c7573616765:6d656d6f72795f7065616b:3732352e3037384d42:00:00
73796e746865736973:73796e7468657369735c7573616765:6d656d6f72795f6761696e:3434362e3032334d42:00:00
eof:3244180142
73796e746865736973:73796e7468657369735c7573616765:656c6170736564:30303a30313a323273:00:00
73796e746865736973:73796e7468657369735c7573616765:6d656d6f72795f7065616b:3732352e3430324d42:00:00
73796e746865736973:73796e7468657369735c7573616765:6d656d6f72795f6761696e:3434362e3636304d42:00:00
eof:252226903
20 changes: 10 additions & 10 deletions project_LITE/project_LITE/17.cache/wt/webtalk_pa.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<!--The data in this file is primarily intended for consumption by Xilinx tools.
The structure and the elements are likely to change over the next few releases.
This means code written to parse this file will need to be revisited each subsequent release.-->
<application name="pa" timeStamp="Thu Feb 14 21:40:15 2019">
<application name="pa" timeStamp="Tue Feb 26 23:47:11 2019">
<section name="Project Information" visible="false">
<property name="ProjectID" value="d39f2f6586ee4369a3412fd6b6d0f6bc" type="ProjectID"/>
<property name="ProjectIteration" value="68" type="ProjectIteration"/>
<property name="ProjectIteration" value="69" type="ProjectIteration"/>
</section>
<section name="PlanAhead Usage" visible="true">
<item name="Project Data">
Expand All @@ -26,9 +26,9 @@ This means code written to parse this file will need to be revisited each subseq
<property name="NewIPLocationHandler" value="1" type="JavaHandler"/>
<property name="NewProject" value="1" type="JavaHandler"/>
<property name="OpenIPXACTFile" value="1" type="JavaHandler"/>
<property name="OpenProject" value="9" type="JavaHandler"/>
<property name="OpenProject" value="10" type="JavaHandler"/>
<property name="RecustomizeCore" value="5" type="JavaHandler"/>
<property name="RunBitgen" value="68" type="JavaHandler"/>
<property name="RunBitgen" value="69" type="JavaHandler"/>
<property name="RunImplementation" value="1" type="JavaHandler"/>
<property name="RunNoiseAnalysis" value="1" type="JavaHandler"/>
<property name="SaveFileProxyHandler" value="6" type="JavaHandler"/>
Expand All @@ -43,8 +43,8 @@ This means code written to parse this file will need to be revisited each subseq
<property name="ViewTaskSynthesis" value="1" type="JavaHandler"/>
</item>
<item name="Gui Resources Info">
<property name="BaseDialog_CANCEL" value="60" type="GuiResourceData"/>
<property name="BaseDialog_OK" value="75" type="GuiResourceData"/>
<property name="BaseDialog_CANCEL" value="61" type="GuiResourceData"/>
<property name="BaseDialog_OK" value="76" type="GuiResourceData"/>
<property name="CmdMsgDialog_MESSAGES" value="1" type="GuiResourceData"/>
<property name="CmdMsgDialog_OK" value="18" type="GuiResourceData"/>
<property name="CmdMsgDialog_OPEN_MESSAGES_VIEW" value="2" type="GuiResourceData"/>
Expand All @@ -60,13 +60,13 @@ This means code written to parse this file will need to be revisited each subseq
<property name="ExpReportTreePanel_EXP_REPORT_TREE_TABLE" value="2" type="GuiResourceData"/>
<property name="ExpRunTreePanel_EXP_RUN_TREE_TABLE" value="13" type="GuiResourceData"/>
<property name="ExploreAheadView_LAUNCH_SELECTED_RUNS" value="1" type="GuiResourceData"/>
<property name="FileSetPanel_FILE_SET_PANEL_TREE" value="328" type="GuiResourceData"/>
<property name="FlowNavigatorTreePanel_FLOW_NAVIGATOR_TREE" value="122" type="GuiResourceData"/>
<property name="GettingStartedView_OPEN_PROJECT" value="4" type="GuiResourceData"/>
<property name="FileSetPanel_FILE_SET_PANEL_TREE" value="336" type="GuiResourceData"/>
<property name="FlowNavigatorTreePanel_FLOW_NAVIGATOR_TREE" value="124" type="GuiResourceData"/>
<property name="GettingStartedView_OPEN_PROJECT" value="5" type="GuiResourceData"/>
<property name="HACGCIPSymbol_SHOW_DISABLED_PORTS" value="4" type="GuiResourceData"/>
<property name="HACGCTabbedPane_TABBED_PANE" value="3" type="GuiResourceData"/>
<property name="HCodeEditor_CLOSE" value="5" type="GuiResourceData"/>
<property name="HCodeEditor_SEARCH_TEXT_COMBO_BOX" value="15" type="GuiResourceData"/>
<property name="HCodeEditor_SEARCH_TEXT_COMBO_BOX" value="16" type="GuiResourceData"/>
<property name="MainMenuMgr_EDIT" value="4" type="GuiResourceData"/>
<property name="MainMenuMgr_FILE" value="8" type="GuiResourceData"/>
<property name="MainMenuMgr_FLOW" value="2" type="GuiResourceData"/>
Expand Down
8 changes: 8 additions & 0 deletions project_LITE/project_LITE/17.runs/.jobs/vrs_config_58.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0"?>
<Runs Version="1" Minor="0">
<Run Id="synth_1" LaunchDir="C:/Users/yoongroup/Documents/Adam/vivado/project_LITE/project_LITE/17.runs/synth_1" FlowId="Vivado_Synthesis" FromStepId="vivado" ToStepId="vivado"/>
<Run Id="impl_1" LaunchDir="C:/Users/yoongroup/Documents/Adam/vivado/project_LITE/project_LITE/17.runs/impl_1" FlowId="Vivado_Implementation" FromStepId="init_design" ToStepId="write_bitstream">
<Parent Id="synth_1"/>
</Run>
</Runs>

2 changes: 1 addition & 1 deletion project_LITE/project_LITE/17.runs/impl_1/.init_design.begin.rst
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<ProcessHandle Version="1" Minor="0">
<Process Command=".planAhead." Owner="yoongroup" Host="EECS-TOYODA" Pid="14704">
<Process Command=".planAhead." Owner="yoongroup" Host="EECS-TOYODA" Pid="46356">
</Process>
</ProcessHandle>
2 changes: 1 addition & 1 deletion project_LITE/project_LITE/17.runs/impl_1/.opt_design.begin.rst
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<ProcessHandle Version="1" Minor="0">
<Process Command=".planAhead." Owner="yoongroup" Host="EECS-TOYODA" Pid="14704">
<Process Command=".planAhead." Owner="yoongroup" Host="EECS-TOYODA" Pid="46356">
</Process>
</ProcessHandle>
2 changes: 1 addition & 1 deletion project_LITE/project_LITE/17.runs/impl_1/.place_design.begin.rst
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<ProcessHandle Version="1" Minor="0">
<Process Command=".planAhead." Owner="yoongroup" Host="EECS-TOYODA" Pid="14704">
<Process Command=".planAhead." Owner="yoongroup" Host="EECS-TOYODA" Pid="46356">
</Process>
</ProcessHandle>
2 changes: 1 addition & 1 deletion project_LITE/project_LITE/17.runs/impl_1/.route_design.begin.rst
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<ProcessHandle Version="1" Minor="0">
<Process Command=".planAhead." Owner="yoongroup" Host="EECS-TOYODA" Pid="14704">
<Process Command=".planAhead." Owner="yoongroup" Host="EECS-TOYODA" Pid="46356">
</Process>
</ProcessHandle>
2 changes: 1 addition & 1 deletion project_LITE/project_LITE/17.runs/impl_1/.vivado.begin.rst
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<ProcessHandle Version="1" Minor="0">
<Process Command="vivado.bat" Owner="yoongroup" Host="EECS-TOYODA" Pid="15188">
<Process Command="vivado.bat" Owner="yoongroup" Host="EECS-TOYODA" Pid="46996">
</Process>
</ProcessHandle>
2 changes: 1 addition & 1 deletion project_LITE/project_LITE/17.runs/impl_1/.write_bitstream.begin.rst
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<ProcessHandle Version="1" Minor="0">
<Process Command=".planAhead." Owner="yoongroup" Host="EECS-TOYODA" Pid="14704">
<Process Command=".planAhead." Owner="yoongroup" Host="EECS-TOYODA" Pid="46356">
</Process>
</ProcessHandle>
Binary file modified project_LITE/project_LITE/17.runs/impl_1/OSC1_LITE_Control.bit
View file
Binary file not shown.
Loading

0 comments on commit 1a3eea6

Please sign in to comment.