From 6cf6929d5c36b964dc6643182059e6f02a910fcc Mon Sep 17 00:00:00 2001 From: amritaH Date: Wed, 29 Jun 2016 01:39:23 +0530 Subject: Hybridmodels,deletekeypress added --- views/schematic.html | 161 +++++++- views/script/gui.js | 438 ++++++++++++++++++++- views/script/netlist.js | 202 +++++++++- views/style/schematic.css | 4 +- .../webtronix_server/digitalmodels/adc_bridge.svg | 43 -- .../webtronix_server/digitalmodels/dac_bridge.svg | 62 --- views/webtronix_server/digitalmodels/dff.svg | 56 +++ views/webtronix_server/digitalmodels/dlatch.svg | 60 +++ views/webtronix_server/digitalmodels/jkff.svg | 63 +++ views/webtronix_server/digitalmodels/srff.svg | 60 +++ views/webtronix_server/digitalmodels/srlatch.svg | 61 +++ views/webtronix_server/digitalmodels/tff.svg | 60 +++ views/webtronix_server/hybridmodels/adc_bridge.svg | 48 +++ views/webtronix_server/hybridmodels/cdo.svg | 38 ++ views/webtronix_server/hybridmodels/dac_bridge.svg | 68 ++++ views/webtronix_server/parts.json | 29 +- 16 files changed, 1308 insertions(+), 145 deletions(-) delete mode 100644 views/webtronix_server/digitalmodels/adc_bridge.svg delete mode 100644 views/webtronix_server/digitalmodels/dac_bridge.svg create mode 100644 views/webtronix_server/digitalmodels/dff.svg create mode 100644 views/webtronix_server/digitalmodels/dlatch.svg create mode 100644 views/webtronix_server/digitalmodels/jkff.svg create mode 100644 views/webtronix_server/digitalmodels/srff.svg create mode 100644 views/webtronix_server/digitalmodels/srlatch.svg create mode 100644 views/webtronix_server/digitalmodels/tff.svg create mode 100644 views/webtronix_server/hybridmodels/adc_bridge.svg create mode 100644 views/webtronix_server/hybridmodels/cdo.svg create mode 100644 views/webtronix_server/hybridmodels/dac_bridge.svg (limited to 'views') diff --git a/views/schematic.html b/views/schematic.html index 0e3165f..cbec32e 100644 --- a/views/schematic.html +++ b/views/schematic.html @@ -466,8 +466,26 @@ properties form - - + + +
+ + Out Uundefined: + + +
+ + + + + + + + + + + +
Rise Delay: @@ -476,7 +494,7 @@ properties form
- +
Fall Delay: @@ -485,7 +503,7 @@ properties form
- +
Input Load: @@ -493,6 +511,130 @@ properties form
+ + +
+ + Clk Delay: + +
+ + + +
+ + Set Delay: + +
+ + + +
+ + Reset Delay: + +
+ + + +
+ + Data Delay: + +
+ + + +
+ + Enable Delay: + +
+ + + +
+ + SR Delay: + +
+ + + + + +
+ + Ic: + +
+ + + +
+ + Data Load: + +
+ + + +
+ + JK Load: + +
+ + + +
+ + T Load: + +
+ + + +
+ + SR Load: + +
+ + + +
+ + Clk Load: + +
+ + + +
+ + Set Load: + +
+ + + +
+ + Reset Load: + +
+ + + +
+ + Enable Load: + +
+ + + @@ -937,14 +1079,14 @@ properties form
Outputlowvalue: - +
- OutputHighvalue: + Output Highvalue:
@@ -953,7 +1095,7 @@ properties form
- ControlArray: + Control Array:
@@ -961,7 +1103,7 @@ properties form
- FrequencyArray: + Frequency Array:
@@ -969,7 +1111,7 @@ properties form
- DutyCycle: + Duty Cycle:
@@ -1086,7 +1228,6 @@ properties form - diff --git a/views/script/gui.js b/views/script/gui.js index e686d49..a9ea209 100644 --- a/views/script/gui.js +++ b/views/script/gui.js @@ -24,7 +24,7 @@ var webtronics={ Vlist:/\s*expression|\s*url|.*script/, Alist:/^(x|y|x1|y1|x2|y2|dx|dy|cx|cy|r|width|height|style|transform|d|id|xml:space|class|fill|stroke|text-anchor|visibility|fill-opacity|stroke-linejoin|stroke-linecap|stroke-opacity|stroke-width|xmlns|xmlns:wtx|connects|partvalue|flippable|spice|index|font-size|font-weight|font-style|font-family)$/, - Elist:/^(path|circle|rect|line|text|g|tspan|svg|wtx:limitswitch|wtx:irev|wtx:rbreak|wtx:inoffset|wtx:gain|wtx:outoffset|wtx:ingain|wtx:outgain|wtx:denoffset|wtx:dengain|wtx:numoffset|wtx:numgain|wtx:fraction|wtx:dendomain|wtx:denlowerlimit|wtx:outlowerlimit|wtx:outupperlimit|wtx:limitrange|wtx:upperdelta|wtx:lowerdelta|wtx:indomain|wtx:xarr|wtx:yarr|wtx:amodel|wtx:coff|wtx:con|wtx:roff|wtx:ron|wtx:log|wtx:vbreak|wtx:ibreak|wtx:isat|wtx:nfor|wtx:rsource|wtx:rsink|wtx:ilimitsource|wtx:ilimitsink|wtx:vpwr|wtx:isource|wtx:isink|wtx:routdomain|wtx:inlow|wtx:inhigh|wtx:hyst|wtx:outic|wtx:numcoeff|wtx:dencoeff|wtx:intic|wtx:denormfreq|wtx:riseslope|wtx:fallslope|wtx:outlow|wtx:outhigh|wtx:cntlarr|wtx:freqarr|wtx:duty|wtx:risetime|wtx:falltime|wtx:clktrig|wtx:pwarr|wtx:ptrig|wtx:rdelay|wtx:fdelay|wtx:rmax|wtx:rmin|wtx:rinit|wtx:vt|wtx:alpha|wtx:beta|wtx:eval1|wtx:eval2|wtx:eval3|wtx:eval4|wtx:eval5|wtx:eval6|wtx:pwlval1|wtx:pwlval2|wtx:pwlval3|wtx:pwlval4|wtx:pwlval5|wtx:pwlval6|wtx:pwlval7|wtx:pwlval8|wtx:pulval1|wtx:pulval2|wtx:pulval3|wtx:pulval4|wtx:pulval5|wtx:pulval6|wtx:pulval7|wtx:amplitude|wtx:phase|wtx:offsetvoltage|wtx:voltageamplitude|wtx:frequency|wtx:delaytime|wtx:dampingfactor|wtx:part|wtx:pins|wtx:analog|wtx:digital|wtx:node|wtx:id|wtx:type|wtx:name|wtx:category|wtx:value|wtx:label|wtx:spice|wtx:risedelay|wtx:inputload|wtx:falldelay|wtx:flip|wtx:model|wtx:measure|metadata|)$/, + Elist:/^(path|circle|rect|line|text|g|tspan|svg|wtx:limitswitch|wtx:irev|wtx:rbreak|wtx:inoffset|wtx:gain|wtx:outoffset|wtx:outundef|wtx:ingain|wtx:outgain|wtx:denoffset|wtx:dengain|wtx:numoffset|wtx:numgain|wtx:fraction|wtx:dendomain|wtx:denlowerlimit|wtx:outlowerlimit|wtx:outupperlimit|wtx:limitrange|wtx:upperdelta|wtx:lowerdelta|wtx:indomain|wtx:xarr|wtx:yarr|wtx:amodel|wtx:coff|wtx:con|wtx:roff|wtx:ron|wtx:log|wtx:vbreak|wtx:ibreak|wtx:isat|wtx:nfor|wtx:rsource|wtx:rsink|wtx:ilimitsource|wtx:ilimitsink|wtx:vpwr|wtx:isource|wtx:isink|wtx:routdomain|wtx:inlow|wtx:inhigh|wtx:hyst|wtx:outic|wtx:numcoeff|wtx:dencoeff|wtx:intic|wtx:denormfreq|wtx:riseslope|wtx:fallslope|wtx:outlow|wtx:outhigh|wtx:cntlarr|wtx:freqarr|wtx:duty|wtx:risetime|wtx:falltime|wtx:clktrig|wtx:pwarr|wtx:ptrig|wtx:rdelay|wtx:fdelay|wtx:rmax|wtx:rmin|wtx:rinit|wtx:vt|wtx:alpha|wtx:beta|wtx:eval1|wtx:eval2|wtx:eval3|wtx:eval4|wtx:eval5|wtx:eval6|wtx:pwlval1|wtx:pwlval2|wtx:pwlval3|wtx:pwlval4|wtx:pwlval5|wtx:pwlval6|wtx:pwlval7|wtx:pwlval8|wtx:pulval1|wtx:pulval2|wtx:pulval3|wtx:pulval4|wtx:pulval5|wtx:pulval6|wtx:pulval7|wtx:amplitude|wtx:phase|wtx:offsetvoltage|wtx:voltageamplitude|wtx:frequency|wtx:delaytime|wtx:dampingfactor|wtx:part|wtx:pins|wtx:analog|wtx:digital|wtx:node|wtx:id|wtx:type|wtx:name|wtx:category|wtx:value|wtx:label|wtx:spice|wtx:risedelay|wtx:inputload|wtx:falldelay|wtx:flip|wtx:model|wtx:measure|metadata|)$/, /* .lib files contain spice .model devices .mod devices contain .subckt devices and the id must begin with x*/ // serverurls:["http://logical.github.io/webtronix/webtronix_server"], serverurls:["webtronix_server"], @@ -155,6 +155,7 @@ openProperties:function(){ var type=netlistcreator.readwtx(this.circuit.selected[0],"type"); var category=netlistcreator.readwtx(this.circuit.selected[0],"category"); jQuery(".analog").hide(); +jQuery(".digital").hide(); $("models").style.display='block' $("webtronics_risedelay").style.display='none'; @@ -499,7 +500,237 @@ jQuery(".analog").hide(); $("webtronics_amplitude").style.display='none' $("webtronics_phase").style.display='none' } - + + else if(category=="digitalmodels") + { + $("models").style.display='none' + if(c=="dff"){ + $("webtronics_clkdelay").style.display='block' + $("webtronics_setdelay").style.display='block' + $("webtronics_resetdelay").style.display='block' + $("webtronics_ic").style.display='block' + $("webtronics_dataload").style.display='block' + $("webtronics_clkload").style.display='block' + $("webtronics_setload").style.display='block' + $("webtronics_resetload").style.display='block' + $("webtronics_risedelay").style.display='block' + $("webtronics_falldelay").style.display='block' + + var clkdelay = netlistcreator.readwtx(this.circuit.selected[0],"clkdelay"); + if(clkdelay!=""){$(webtronics_clkdelay_value).value=clkdelay;} + var setdelay = netlistcreator.readwtx(this.circuit.selected[0],"setdelay"); + if(setdelay!=""){$(webtronics_setdelay_value).value=setdelay;} + var resetdelay = netlistcreator.readwtx(this.circuit.selected[0],"resetdelay"); + if(resetdelay!=""){$(webtronics_resetdelay_value).value=resetdelay;} + var ic = netlistcreator.readwtx(this.circuit.selected[0],"ic"); + if(ic!=""){$(webtronics_ic_value).value=ic;} + var dataload = netlistcreator.readwtx(this.circuit.selected[0],"dataload"); + if(dataload!=""){$(webtronics_dataload_value).value=dataload;} + var clkload = netlistcreator.readwtx(this.circuit.selected[0],"clkload"); + if(clkload!=""){$(webtronics_clkload_value).value=clkload;} + var setload = netlistcreator.readwtx(this.circuit.selected[0],"setload"); + if(setload!=""){$(webtronics_setload_value).value=setload;} + var resetload = netlistcreator.readwtx(this.circuit.selected[0],"resetload"); + if(resetload!=""){$(webtronics_resetload_value).value=resetload;} + var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay"); + if(risedelay!=""){$(webtronics_risedelay_value).value=risedelay;} + var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay"); + if(falldelay!=""){$(webtronics_falldelay_value).value=falldelay;} + } + + if(c=="jkff"){ + $("webtronics_clkdelay").style.display='block' + $("webtronics_setdelay").style.display='block' + $("webtronics_resetdelay").style.display='block' + $("webtronics_ic").style.display='block' + $("webtronics_jkload").style.display='block' + $("webtronics_clkload").style.display='block' + $("webtronics_setload").style.display='block' + $("webtronics_resetload").style.display='block' + $("webtronics_risedelay").style.display='block' + $("webtronics_falldelay").style.display='block' + + var clkdelay = netlistcreator.readwtx(this.circuit.selected[0],"clkdelay"); + if(clkdelay!=""){$(webtronics_clkdelay_value).value=clkdelay;} + var setdelay = netlistcreator.readwtx(this.circuit.selected[0],"setdelay"); + if(setdelay!=""){$(webtronics_setdelay_value).value=setdelay;} + var resetdelay = netlistcreator.readwtx(this.circuit.selected[0],"resetdelay"); + if(resetdelay!=""){$(webtronics_resetdelay_value).value=resetdelay;} + var ic = netlistcreator.readwtx(this.circuit.selected[0],"ic"); + if(ic!=""){$(webtronics_ic_value).value=ic;} + var jkload = netlistcreator.readwtx(this.circuit.selected[0],"jkload"); + if(jkload!=""){$(webtronics_jkload_value).value=jkload;} + var clkload = netlistcreator.readwtx(this.circuit.selected[0],"clkload"); + if(clkload!=""){$(webtronics_clkload_value).value=clkload;} + var setload = netlistcreator.readwtx(this.circuit.selected[0],"setload"); + if(setload!=""){$(webtronics_setload_value).value=setload;} + var resetload = netlistcreator.readwtx(this.circuit.selected[0],"resetload"); + if(resetload!=""){$(webtronics_resetload_value).value=resetload;} + var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay"); + if(risedelay!=""){$(webtronics_risedelay_value).value=risedelay;} + var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay"); + if(falldelay!=""){$(webtronics_falldelay_value).value=falldelay;} + } + + if(c=="tff"){ + $("webtronics_clkdelay").style.display='block' + $("webtronics_setdelay").style.display='block' + $("webtronics_resetdelay").style.display='block' + $("webtronics_ic").style.display='block' + $("webtronics_tload").style.display='block' + $("webtronics_clkload").style.display='block' + $("webtronics_setload").style.display='block' + $("webtronics_resetload").style.display='block' + $("webtronics_risedelay").style.display='block' + $("webtronics_falldelay").style.display='block' + + var clkdelay = netlistcreator.readwtx(this.circuit.selected[0],"clkdelay"); + if(clkdelay!=""){$(webtronics_clkdelay_value).value=clkdelay;} + var setdelay = netlistcreator.readwtx(this.circuit.selected[0],"setdelay"); + if(setdelay!=""){$(webtronics_setdelay_value).value=setdelay;} + var resetdelay = netlistcreator.readwtx(this.circuit.selected[0],"resetdelay"); + if(resetdelay!=""){$(webtronics_resetdelay_value).value=resetdelay;} + var ic = netlistcreator.readwtx(this.circuit.selected[0],"ic"); + if(ic!=""){$(webtronics_ic_value).value=ic;} + var tload = netlistcreator.readwtx(this.circuit.selected[0],"tload"); + if(tload!=""){$(webtronics_tload_value).value=tload;} + var clkload = netlistcreator.readwtx(this.circuit.selected[0],"clkload"); + if(clkload!=""){$(webtronics_clkload_value).value=clkload;} + var setload = netlistcreator.readwtx(this.circuit.selected[0],"setload"); + if(setload!=""){$(webtronics_setload_value).value=setload;} + var resetload = netlistcreator.readwtx(this.circuit.selected[0],"resetload"); + if(resetload!=""){$(webtronics_resetload_value).value=resetload;} + var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay"); + if(risedelay!=""){$(webtronics_risedelay_value).value=risedelay;} + var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay"); + if(falldelay!=""){$(webtronics_falldelay_value).value=falldelay;} + } + + if(c=="srff"){ + $("webtronics_clkdelay").style.display='block' + $("webtronics_setdelay").style.display='block' + $("webtronics_resetdelay").style.display='block' + $("webtronics_ic").style.display='block' + $("webtronics_srload").style.display='block' + $("webtronics_clkload").style.display='block' + $("webtronics_setload").style.display='block' + $("webtronics_resetload").style.display='block' + $("webtronics_risedelay").style.display='block' + $("webtronics_falldelay").style.display='block' + + var clkdelay = netlistcreator.readwtx(this.circuit.selected[0],"clkdelay"); + if(clkdelay!=""){$(webtronics_clkdelay_value).value=clkdelay;} + var setdelay = netlistcreator.readwtx(this.circuit.selected[0],"setdelay"); + if(setdelay!=""){$(webtronics_setdelay_value).value=setdelay;} + var resetdelay = netlistcreator.readwtx(this.circuit.selected[0],"resetdelay"); + if(resetdelay!=""){$(webtronics_resetdelay_value).value=resetdelay;} + var ic = netlistcreator.readwtx(this.circuit.selected[0],"ic"); + if(ic!=""){$(webtronics_ic_value).value=ic;} + var srload = netlistcreator.readwtx(this.circuit.selected[0],"srload"); + if(srload!=""){$(webtronics_srload_value).value=srload;} + var clkload = netlistcreator.readwtx(this.circuit.selected[0],"clkload"); + if(clkload!=""){$(webtronics_clkload_value).value=clkload;} + var setload = netlistcreator.readwtx(this.circuit.selected[0],"setload"); + if(setload!=""){$(webtronics_setload_value).value=setload;} + var resetload = netlistcreator.readwtx(this.circuit.selected[0],"resetload"); + if(resetload!=""){$(webtronics_resetload_value).value=resetload;} + var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay"); + if(risedelay!=""){$(webtronics_risedelay_value).value=risedelay;} + var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay"); + if(falldelay!=""){$(webtronics_falldelay_value).value=falldelay;} + } + + if(c=="dlatch"){ + $("webtronics_datadelay").style.display='block' + $("webtronics_setdelay").style.display='block' + $("webtronics_resetdelay").style.display='block' + $("webtronics_ic").style.display='block' + $("webtronics_enabledelay").style.display='block' + $("webtronics_dataload").style.display='block' + $("webtronics_enableload").style.display='block' + $("webtronics_setload").style.display='block' + $("webtronics_resetload").style.display='block' + $("webtronics_risedelay").style.display='block' + $("webtronics_falldelay").style.display='block' + + var datadelay = netlistcreator.readwtx(this.circuit.selected[0],"datadelay"); + if(datadelay!=""){$(webtronics_datadelay_value).value=datadelay;} + var setdelay = netlistcreator.readwtx(this.circuit.selected[0],"setdelay"); + if(setdelay!=""){$(webtronics_setdelay_value).value=setdelay;} + var resetdelay = netlistcreator.readwtx(this.circuit.selected[0],"resetdelay"); + if(resetdelay!=""){$(webtronics_resetdelay_value).value=resetdelay;} + var ic = netlistcreator.readwtx(this.circuit.selected[0],"ic"); + if(ic!=""){$(webtronics_ic_value).value=ic;} + var enabledelay = netlistcreator.readwtx(this.circuit.selected[0],"enabledelay"); + if(enabledelay!=""){$(webtronics_enabledelay_value).value=enabledelay;} + var dataload = netlistcreator.readwtx(this.circuit.selected[0],"dataload"); + if(dataload!=""){$(webtronics_dataload_value).value=dataload;} + var enableload = netlistcreator.readwtx(this.circuit.selected[0],"enableload"); + if(enableload!=""){$(webtronics_enableload_value).value=enableload;} + var setload = netlistcreator.readwtx(this.circuit.selected[0],"setload"); + if(setload!=""){$(webtronics_setload_value).value=setload;} + var resetload = netlistcreator.readwtx(this.circuit.selected[0],"resetload"); + if(resetload!=""){$(webtronics_resetload_value).value=resetload;} + var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay"); + if(risedelay!=""){$(webtronics_risedelay_value).value=risedelay;} + var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay"); + if(falldelay!=""){$(webtronics_falldelay_value).value=falldelay;} + } + + if(c=="srlatch"){ + $("webtronics_srdelay").style.display='block' + $("webtronics_setdelay").style.display='block' + $("webtronics_resetdelay").style.display='block' + $("webtronics_ic").style.display='block' + $("webtronics_enabledelay").style.display='block' + $("webtronics_srload").style.display='block' + $("webtronics_enableload").style.display='block' + $("webtronics_setload").style.display='block' + $("webtronics_resetload").style.display='block' + $("webtronics_risedelay").style.display='block' + $("webtronics_falldelay").style.display='block' + + var srdelay = netlistcreator.readwtx(this.circuit.selected[0],"srdelay"); + if(srdelay!=""){$(webtronics_srdelay_value).value=srdelay;} + var setdelay = netlistcreator.readwtx(this.circuit.selected[0],"setdelay"); + if(setdelay!=""){$(webtronics_setdelay_value).value=setdelay;} + var resetdelay = netlistcreator.readwtx(this.circuit.selected[0],"resetdelay"); + if(resetdelay!=""){$(webtronics_resetdelay_value).value=resetdelay;} + var ic = netlistcreator.readwtx(this.circuit.selected[0],"ic"); + if(ic!=""){$(webtronics_ic_value).value=ic;} + var enabledelay = netlistcreator.readwtx(this.circuit.selected[0],"enabledelay"); + if(enabledelay!=""){$(webtronics_enabledelay_value).value=enabledelay;} + var srload = netlistcreator.readwtx(this.circuit.selected[0],"srload"); + if(srload!=""){$(webtronics_srload_value).value=srload;} + var enableload = netlistcreator.readwtx(this.circuit.selected[0],"enableload"); + if(enableload!=""){$(webtronics_enableload_value).value=enableload;} + var setload = netlistcreator.readwtx(this.circuit.selected[0],"setload"); + if(setload!=""){$(webtronics_setload_value).value=setload;} + var resetload = netlistcreator.readwtx(this.circuit.selected[0],"resetload"); + if(resetload!=""){$(webtronics_resetload_value).value=resetload;} + var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay"); + if(risedelay!=""){$(webtronics_risedelay_value).value=risedelay;} + var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay"); + if(falldelay!=""){$(webtronics_falldelay_value).value=falldelay;} + } + + + if(c=='and'|| c=='not'|| c=='nand'|| c=='or'||c=='nor'||c=='xor'||c=='xnor') + { + + $("webtronics_risedelay").style.display='block'; + $("webtronics_falldelay").style.display='block'; + $("webtronics_inputload").style.display='block'; + var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay"); + if(risedelay!=""){$(webtronics_part_risedelay).value=risedelay;} + var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay"); + if(falldelay!=""){$(webtronics_part_falldelay).value=falldelay;} + var inputload = netlistcreator.readwtx(this.circuit.selected[0],"inputload"); + if(inputload!=""){$(webtronics_part_inputload).value=inputload;} + + } + } + else if(category=="analogmodels"){ $("models").style.display='none' if(c=="gains"){ @@ -960,25 +1191,81 @@ jQuery(".analog").hide(); var value=netlistcreator.readwtx(this.circuit.selected[0],"value"); if(value!=""){$('webtronics_part_value').value=value;} - if(c=='and'|| c=='not'|| c=='nand'|| c=='or'||c=='nor'||c=='xor'||c=='xnor') + if(c=="dac_bridge") + { + $("webtronics_outlow").style.display='table-row' + $("webtronics_outhigh").style.display='table-row' + $("webtronics_outundef").style.display='table-row' + $("webtronics_inputload").style.display='block'; + $("webtronics_falltime").style.display='table-row' + $("webtronics_risetime").style.display='table-row' + $("valuemodel").style.display='none' + var outlow = netlistcreator.readwtx(this.circuit.selected[0],"outlow"); + if(outlow!=""){$(webtronics_outlow_value).value=outlow;} + var outhigh = netlistcreator.readwtx(this.circuit.selected[0],"outhigh"); + if(outhigh!=""){$(webtronics_outhigh_value).value=outhigh;} + var outundef = netlistcreator.readwtx(this.circuit.selected[0],"outundef"); + if(outundef!=""){$(webtronics_outundef_value).value=outundef;} + var inputload = netlistcreator.readwtx(this.circuit.selected[0],"inputload"); + if(inputload!=""){$(webtronics_inputload_value).value=inputload;} + var risetime = netlistcreator.readwtx(this.circuit.selected[0],"risetime"); + if(risetime!=""){$(webtronics_risetime_value).value=risetime;} + var falltime = netlistcreator.readwtx(this.circuit.selected[0],"falltime"); + if(falltime!=""){$(webtronics_falltime_value).value=falltime;} + + } + + if(c=="adc_bridge") { + $("webtronics_outundef").style.display='none' + $("webtronics_inlow").style.display='table-row' + $("webtronics_inhigh").style.display='table-row' + $("webtronics_risedelay").style.display='block'; + $("webtronics_falldelay").style.display='block'; + $("valuemodel").style.display='none' + var inlow = netlistcreator.readwtx(this.circuit.selected[0],"inlow"); + if(inlow!=""){$(webtronics_inlow_value).value=inlow;} + var inhigh = netlistcreator.readwtx(this.circuit.selected[0],"inhigh"); + if(inhigh!=""){$(webtronics_inhigh_value).value=inhigh;} + var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay"); + if(risedelay!=""){$(webtronics_risedelay_value).value=risedelay;} + var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay"); + if(falldelay!=""){$(webtronics_falldelay_value).value=falldelay;} - $("webtronics_risedelay").style.display='block'; - $("webtronics_falldelay").style.display='block'; - $("webtronics_inputload").style.display='block'; - var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay"); - if(risedelay!=""){$(webtronics_part_risedelay).value=risedelay;} - var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay"); - if(falldelay!=""){$(webtronics_part_falldelay).value=falldelay;} - var inputload = netlistcreator.readwtx(this.circuit.selected[0],"inputload"); - if(inputload!=""){$(webtronics_part_inputload).value=inputload;} + + } + if(c=="cdo") + { + $("webtronics_cntlarr").style.display='table-row' + $("webtronics_freqarr").style.display='table-row' + $("webtronics_duty").style.display='table-row' + $("webtronics_phase").style.display='table-row' + $("webtronics_risedelay").style.display='block'; + $("webtronics_falldelay").style.display='block'; + $("valuemodel").style.display='none'; + $("webtronics_outundef").style.display='none' + + var cntlarr = netlistcreator.readwtx(this.circuit.selected[0],"cntlarr"); + if(cntlarr!=""){$(webtronics_cntlarr_value).value=cntlarr;} + var freqarr = netlistcreator.readwtx(this.circuit.selected[0],"freqarr"); + if(freqarr!=""){$(webtronics_freqarr_value).value=freqarr;} + var duty = netlistcreator.readwtx(this.circuit.selected[0],"duty"); + if(duty!=""){$(webtronics_duty_value).value=duty;} + var phase = netlistcreator.readwtx(this.circuit.selected[0],"phase"); + if(phase!=""){$(webtronics_phase_value).value=phase;} + var risedelay = netlistcreator.readwtx(this.circuit.selected[0],"risedelay"); + if(risedelay!=""){$(webtronics_risedelay_value).value=risedelay;} + var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay"); + if(falldelay!=""){$(webtronics_falldelay_value).value=falldelay;} + } + } if(category=="mosfets"||category=="transistors"){ - $("directive").style.display='block'; + $("directive").style.display='block'; } if(c=="diode")$("directive").style.display='block' @@ -1137,7 +1424,16 @@ file_new:function(){ } }.bind(this)); - + Event.observe(this.circuit.container,'keydown',function(e){ + if(e.keyCode == 46) { + // alert('Delete Key Pressed'); + webtronics.circuit.clearinfo(); + webtronics.circuit.addhistory(); + webtronics.circuit.deleteSelection(); + } + + }.bind(this)); + }, formatnetlist:function(spice1,spice2){ @@ -1499,6 +1795,15 @@ if($("webtronics_select"))Event.observe($('webtronics_select'), 'click', functio webtronics.circuit.addhistory(); webtronics.circuit.deleteSelection(); }); + + Event.observe($(document), 'keydown', function(e) { + if(e.keyCode == 46) { + webtronics.circuit.clearinfo(); + webtronics.circuit.addhistory(); + webtronics.circuit.deleteSelection(); + } + }); + /* if($('webtronics_save')){ Event.observe($('webtronics_save'), 'click', function() { @@ -1965,6 +2270,111 @@ else if(modelname=="oneshot"){ netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value); netlistcreator.writewtx(model,"inputload",$('webtronics_inputload_value').value); } + else if(modelname=="dff"){ + netlistcreator.writewtx(model,"clkdelay",$('webtronics_clkdelay_value').value); + netlistcreator.writewtx(model,"setdelay",$('webtronics_setdelay_value').value); + netlistcreator.writewtx(model,"resetdelay",$('webtronics_resetdelay_value').value); + netlistcreator.writewtx(model,"ic",$('webtronics_ic_value').value); + netlistcreator.writewtx(model,"dataload",$('webtronics_dataload_value').value); + netlistcreator.writewtx(model,"clkload",$('webtronics_clkload_value').value); + netlistcreator.writewtx(model,"setload",$('webtronics_seload_value').value); + netlistcreator.writewtx(model,"resetload",$('webtronics_resetload_value').value); + netlistcreator.writewtx(model,"risedelay",$('webtronics_risedelay_value').value); + netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value); + + } + else if(modelname=="jkff"){ + netlistcreator.writewtx(model,"clkdelay",$('webtronics_clkdelay_value').value); + netlistcreator.writewtx(model,"setdelay",$('webtronics_setdelay_value').value); + netlistcreator.writewtx(model,"resetdelay",$('webtronics_resetdelay_value').value); + netlistcreator.writewtx(model,"ic",$('webtronics_ic_value').value); + netlistcreator.writewtx(model,"jkload",$('webtronics_jkload_value').value); + netlistcreator.writewtx(model,"clkload",$('webtronics_clkload_value').value); + netlistcreator.writewtx(model,"setload",$('webtronics_seload_value').value); + netlistcreator.writewtx(model,"resetload",$('webtronics_resetload_value').value); + netlistcreator.writewtx(model,"risedelay",$('webtronics_risedelay_value').value); + netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value); + } + else if(modelname=="tff"){ + netlistcreator.writewtx(model,"clkdelay",$('webtronics_clkdelay_value').value); + netlistcreator.writewtx(model,"setdelay",$('webtronics_setdelay_value').value); + netlistcreator.writewtx(model,"resetdelay",$('webtronics_resetdelay_value').value); + netlistcreator.writewtx(model,"ic",$('webtronics_ic_value').value); + netlistcreator.writewtx(model,"tload",$('webtronics_tload_value').value); + netlistcreator.writewtx(model,"clkload",$('webtronics_clkload_value').value); + netlistcreator.writewtx(model,"setload",$('webtronics_seload_value').value); + netlistcreator.writewtx(model,"resetload",$('webtronics_resetload_value').value); + netlistcreator.writewtx(model,"risedelay",$('webtronics_risedelay_value').value); + netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value); + } + else if(modelname=="srff"){ + netlistcreator.writewtx(model,"clkdelay",$('webtronics_clkdelay_value').value); + netlistcreator.writewtx(model,"setdelay",$('webtronics_setdelay_value').value); + netlistcreator.writewtx(model,"resetdelay",$('webtronics_resetdelay_value').value); + netlistcreator.writewtx(model,"ic",$('webtronics_ic_value').value); + netlistcreator.writewtx(model,"srload",$('webtronics_srload_value').value); + netlistcreator.writewtx(model,"clkload",$('webtronics_clkload_value').value); + netlistcreator.writewtx(model,"setload",$('webtronics_seload_value').value); + netlistcreator.writewtx(model,"resetload",$('webtronics_resetload_value').value); + netlistcreator.writewtx(model,"risedelay",$('webtronics_risedelay_value').value); + netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value); + } + else if(modelname=="dlatch"){ + netlistcreator.writewtx(model,"datadelay",$('webtronics_datadelay_value').value); + netlistcreator.writewtx(model,"enabledelay",$('webtronics_enabledelay_value').value); + netlistcreator.writewtx(model,"setdelay",$('webtronics_setdelay_value').value); + netlistcreator.writewtx(model,"resetdelay",$('webtronics_resetdelay_value').value); + netlistcreator.writewtx(model,"ic",$('webtronics_ic_value').value); + netlistcreator.writewtx(model,"dataload",$('webtronics_dataload_value').value); + netlistcreator.writewtx(model,"enableload",$('webtronics_enableload_value').value); + netlistcreator.writewtx(model,"setload",$('webtronics_seload_value').value); + netlistcreator.writewtx(model,"resetload",$('webtronics_resetload_value').value); + netlistcreator.writewtx(model,"risedelay",$('webtronics_risedelay_value').value); + netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value); + } + else if(modelname=="srlatch"){ + netlistcreator.writewtx(model,"datadelay",$('webtronics_datadelay_value').value); + netlistcreator.writewtx(model,"enabledelay",$('webtronics_enabledelay_value').value); + netlistcreator.writewtx(model,"setdelay",$('webtronics_setdelay_value').value); + netlistcreator.writewtx(model,"resetdelay",$('webtronics_resetdelay_value').value); + netlistcreator.writewtx(model,"ic",$('webtronics_ic_value').value); + netlistcreator.writewtx(model,"srload",$('webtronics_srload_value').value); + netlistcreator.writewtx(model,"enableload",$('webtronics_enableload_value').value); + netlistcreator.writewtx(model,"setload",$('webtronics_seload_value').value); + netlistcreator.writewtx(model,"resetload",$('webtronics_resetload_value').value); + netlistcreator.writewtx(model,"risedelay",$('webtronics_risedelay_value').value); + netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value); + } + + else if(modelname=="cdo"){ + netlistcreator.writewtx(model,"cntlarr",$('webtronics_cntlarr_value').value); + netlistcreator.writewtx(model,"freqarr",$('webtronics_freqarr_value').value); + netlistcreator.writewtx(model,"duty",$('webtronics_duty_value').value); + netlistcreator.writewtx(model,"phase",$('webtronics_phase_value').value); + netlistcreator.writewtx(model,"risedelay",$('webtronics_risedelay_value').value); + netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value); + + } + + else if(modelname=="adc_bridge"){ + netlistcreator.writewtx(model,"inlow",$('webtronics_inlow_value').value); + netlistcreator.writewtx(model,"inhigh",$('webtronics_inhigh_value').value); + netlistcreator.writewtx(model,"risedelay",$('webtronics_risedelay_value').value); + netlistcreator.writewtx(model,"falldelay",$('webtronics_falldelay_value').value); + + } + + else if(modelname=="dac_bridge") + { + netlistcreator.writewtx(model,"outlow",$('webtronics_outlow_value').value); + netlistcreator.writewtx(model,"outhigh",$('webtronics_outhigh_value').value); + netlistcreator.writewtx(model,"outundef",$('webtronics_outundef_value').value); + netlistcreator.writewtx(model,"inputload",$('webtronics_inputload_value').value); + netlistcreator.writewtx(model,"outlow",$('webtronics_risetime_value').value); + netlistcreator.writewtx(model,"falltime",$('webtronics_falltime_value').value); + } + + webtronics.circuit.createvalue(webtronics.circuit.selected[0]); }); diff --git a/views/script/netlist.js b/views/script/netlist.js index d8a3655..f5876d7 100644 --- a/views/script/netlist.js +++ b/views/script/netlist.js @@ -210,7 +210,7 @@ tovector:function(pin,nodenumber){ for(var i=0;i - - - - - - - - - - - - - - - - ada - - a - - adc_bridge - - digitalmodels - - - - - - - - - - - - - - - - - - - - diff --git a/views/webtronix_server/digitalmodels/dac_bridge.svg b/views/webtronix_server/digitalmodels/dac_bridge.svg deleted file mode 100644 index b584869..0000000 --- a/views/webtronix_server/digitalmodels/dac_bridge.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - ad - a - dac_bridge - digitalmodels - - - - - - - - - - - - - - - diff --git a/views/webtronix_server/digitalmodels/dff.svg b/views/webtronix_server/digitalmodels/dff.svg new file mode 100644 index 0000000..f169801 --- /dev/null +++ b/views/webtronix_server/digitalmodels/dff.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + a + a + dff + digitalmodels + + + + + + + + + + + + + + + + + + + + + + S + R + Q + D + Q' + + + + + + + + + + \ No newline at end of file diff --git a/views/webtronix_server/digitalmodels/dlatch.svg b/views/webtronix_server/digitalmodels/dlatch.svg new file mode 100644 index 0000000..a7328eb --- /dev/null +++ b/views/webtronix_server/digitalmodels/dlatch.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + a + a + dlatch + digitalmodels + + + + + + + + + + + + + + + + + + + + + + + + + + + S + R + Q + D + Q' + + + + + + + E + + \ No newline at end of file diff --git a/views/webtronix_server/digitalmodels/jkff.svg b/views/webtronix_server/digitalmodels/jkff.svg new file mode 100644 index 0000000..03b5206 --- /dev/null +++ b/views/webtronix_server/digitalmodels/jkff.svg @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + a + a + jkff + digitalmodels + + + + + + + + + + + + + + + + + + + + + + + + + + S + R + Q + J + Q' + + + + + + + + + + K + + \ No newline at end of file diff --git a/views/webtronix_server/digitalmodels/srff.svg b/views/webtronix_server/digitalmodels/srff.svg new file mode 100644 index 0000000..ba03871 --- /dev/null +++ b/views/webtronix_server/digitalmodels/srff.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + a + a + srff + digitalmodels + + + + + + + + + + + + + + + + + + + + + + + S + R + Q + S + Q' + + + + + + + + + + R + + \ No newline at end of file diff --git a/views/webtronix_server/digitalmodels/srlatch.svg b/views/webtronix_server/digitalmodels/srlatch.svg new file mode 100644 index 0000000..fe0bea0 --- /dev/null +++ b/views/webtronix_server/digitalmodels/srlatch.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + a + a + srlatch + digitalmodels + + + + + + + + + + + + + + + + + + + + + + + + S + R + Q + S + Q' + + + + + + + + R + E + + \ No newline at end of file diff --git a/views/webtronix_server/digitalmodels/tff.svg b/views/webtronix_server/digitalmodels/tff.svg new file mode 100644 index 0000000..af01593 --- /dev/null +++ b/views/webtronix_server/digitalmodels/tff.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + a + a + tff + digitalmodels + + + + + + + + + + + + + + + + + + + + + + + + + + S + R + Q + T + Q' + + + + + + + + + + \ No newline at end of file diff --git a/views/webtronix_server/hybridmodels/adc_bridge.svg b/views/webtronix_server/hybridmodels/adc_bridge.svg new file mode 100644 index 0000000..4a5f653 --- /dev/null +++ b/views/webtronix_server/hybridmodels/adc_bridge.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + ada + + a + + adc_bridge + + hybridmodels + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/views/webtronix_server/hybridmodels/cdo.svg b/views/webtronix_server/hybridmodels/cdo.svg new file mode 100644 index 0000000..021de64 --- /dev/null +++ b/views/webtronix_server/hybridmodels/cdo.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + a + a + cdo + hybridmodels + + + + + + + + + + + + + + + + + + + CDO + + \ No newline at end of file diff --git a/views/webtronix_server/hybridmodels/dac_bridge.svg b/views/webtronix_server/hybridmodels/dac_bridge.svg new file mode 100644 index 0000000..0877acf --- /dev/null +++ b/views/webtronix_server/hybridmodels/dac_bridge.svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + ad + a + dac_bridge + hybridmodels + + + + + + + + + + + + + + + + + + + + + diff --git a/views/webtronix_server/parts.json b/views/webtronix_server/parts.json index 581f66d..f09e106 100644 --- a/views/webtronix_server/parts.json +++ b/views/webtronix_server/parts.json @@ -42,11 +42,15 @@ } } - - - - - + }, + "hybridmodels":{ + "cdo":{}, + "adc_bridge":{ + "ideal_adc":["digital.lib"] + }, + "dac_bridge":{ + "ideal_dac":["digital.lib"] + } }, "analogmodels":{ @@ -82,12 +86,7 @@ "digitalmodels":{ - "adc_bridge":{ - "ideal_adc":["digital.lib"] - }, - "dac_bridge":{ - "ideal_dac":["digital.lib"] - }, + "source":{ "clk":["dsource.mod"] }, @@ -112,7 +111,13 @@ }, "xor":{ "xor":["digital.lib"] - } + }, + "dff":{}, + "jkff":{}, + "srff":{}, + "tff":{}, + "dlatch":{}, + "srlatch":{} }, "resistors":{ -- cgit