diff --git a/expertWires.js b/expertWires.js index bc41997..343f3d6 100644 --- a/expertWires.js +++ b/expertWires.js @@ -210,6 +210,10 @@ function setupParams(){ clockTriggers[value]=[clockTriggers[value],"setLow('rdy');"].join(""); } else if(name=="rdy1" && parseInt(value)!=NaN){ clockTriggers[value]=[clockTriggers[value],"setHigh('rdy');"].join(""); + } else if(name=="time" && parseInt(value)!=NaN){ + eventTime=value; + } else if(name=="databus" && parseInt(value)!=NaN){ + clockTriggers[eventTime]=[clockTriggers[eventTime],"writeDataBus(0x"+value+");"].join(""); } else // run a test program, and optionally check against a golden checksum if(name=="steps" && parseInt(value)!=NaN){ diff --git a/macros.js b/macros.js index 301b844..1dcc932 100644 --- a/macros.js +++ b/macros.js @@ -224,9 +224,9 @@ fetchTriggers={}; // simulate a single clock phase with no update to graphics or trace function halfStep(){ var clk = isNodeHigh(nodenames['clk0']); - eval(clockTriggers[cycle]); if (clk) {setLow('clk0'); handleBusRead(); } else {setHigh('clk0'); handleBusWrite();} + eval(clockTriggers[cycle]); } function handleBusRead(){