errors removed

12 files changed, 30 insertions, 9 deletions

diff --git a/views/script/gui.js b/views/script/gui.js
index 5fc62b1..e501955 100644
--- a/views/script/gui.js
+++ b/views/script/gui.js
@@ -725,11 +725,11 @@ jQuery(".digital").hide();
    $("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;}

+      if(risedelay!=""){$(webtronics_risedelay_value).value=risedelay;}

       var falldelay = netlistcreator.readwtx(this.circuit.selected[0],"falldelay");

-      if(falldelay!=""){$(webtronics_part_falldelay).value=falldelay;}

+      if(falldelay!=""){$(webtronics_falldelay_value).value=falldelay;}

        var inputload = netlistcreator.readwtx(this.circuit.selected[0],"inputload");

-      if(inputload!=""){$(webtronics_part_inputload).value=inputload;}

+      if(inputload!=""){$(webtronics_inputload_value).value=inputload;}

 

     }

   }

diff --git a/views/script/netlist.js b/views/script/netlist.js
index c7435a7..fcc259a 100644
--- a/views/script/netlist.js
+++ b/views/script/netlist.js
@@ -945,9 +945,6 @@ else if(sections.netlist[i].name=="pwl"){
 else if(sections.netlist[i].name=="exponential"){
   command+=" "+"EXP ("+sections.netlist[i].eval1+" "+sections.netlist[i].eval2+" "+sections.netlist[i].eval3+" "+sections.netlist[i].eval4+" "+sections.netlist[i].eval5+" "+sections.netlist[i].eval6+")";
 }
-else if(sections.netlist[i].name=="and"){
-  command+=" "+sections.netlist[i].risedelay+" "+sections.netlist[i].falldelay+" "+sections.netlist[i].inputload;
-}
 else if(sections.netlist[i].name=="gains"){
   var inoff=sections.netlist[i].inoffset;var gn=sections.netlist[i].gain;var outoff=sections.netlist[i].outoffset;
   command+=" ref_"+pid+"\n"+".model ref_"+pid+" gain(in_offset="+inoff+" gain="+gn+" out_offset="+outoff+")\n";
diff --git a/views/webtronix_server/digitalmodels/and.svg b/views/webtronix_server/digitalmodels/and.svg
index f80165f..a2fb07f 100644
--- a/views/webtronix_server/digitalmodels/and.svg
+++ b/views/webtronix_server/digitalmodels/and.svg
@@ -20,6 +20,10 @@
     </wtx:pins>
     <wtx:id>and</wtx:id>
 
+     <wtx:risedelay></wtx:risedelay>
+    <wtx:falldelay></wtx:falldelay>
+    <wtx:inputload></wtx:inputload>
+
     <wtx:type>a</wtx:type>
     <wtx:name>and</wtx:name>
     <wtx:category>digitalmodels</wtx:category>
diff --git a/views/webtronix_server/digitalmodels/nand.svg b/views/webtronix_server/digitalmodels/nand.svg
index 0c3d364..516fe9f 100644
--- a/views/webtronix_server/digitalmodels/nand.svg
+++ b/views/webtronix_server/digitalmodels/nand.svg
@@ -24,6 +24,10 @@
     </wtx:pins>
     <wtx:id>nand</wtx:id>
 
+    <wtx:risedelay></wtx:risedelay>
+    <wtx:falldelay></wtx:falldelay>
+    <wtx:inputload></wtx:inputload>
+
     <wtx:type>a</wtx:type>
     <wtx:name>nand</wtx:name>
     <wtx:category>digitalmodels</wtx:category>
diff --git a/views/webtronix_server/digitalmodels/nor.svg b/views/webtronix_server/digitalmodels/nor.svg
index e9515a9..088027f 100644
--- a/views/webtronix_server/digitalmodels/nor.svg
+++ b/views/webtronix_server/digitalmodels/nor.svg
@@ -23,6 +23,9 @@
         </wtx:digital>
     </wtx:pins>
     <wtx:id>nor</wtx:id>
+    <wtx:risedelay></wtx:risedelay>
+    <wtx:falldelay></wtx:falldelay>
+    <wtx:inputload></wtx:inputload>
 
     <wtx:type>a</wtx:type>
     <wtx:name>nor</wtx:name>
diff --git a/views/webtronix_server/digitalmodels/not.svg b/views/webtronix_server/digitalmodels/not.svg
index ff07cb2..84b1e79 100644
--- a/views/webtronix_server/digitalmodels/not.svg
+++ b/views/webtronix_server/digitalmodels/not.svg
@@ -21,6 +21,9 @@
 
     </wtx:pins>
     <wtx:id>inv</wtx:id>
+    <wtx:risedelay></wtx:risedelay>
+    <wtx:falldelay></wtx:falldelay>
+    <wtx:inputload></wtx:inputload>
 
     <wtx:type>a</wtx:type>
     <wtx:name>not</wtx:name>
diff --git a/views/webtronix_server/digitalmodels/or.svg b/views/webtronix_server/digitalmodels/or.svg
index 56df34c..bb82709 100644
--- a/views/webtronix_server/digitalmodels/or.svg
+++ b/views/webtronix_server/digitalmodels/or.svg
@@ -21,6 +21,9 @@
         </wtx:digital>
     </wtx:pins>
     <wtx:id>or</wtx:id>
+    <wtx:risedelay></wtx:risedelay>
+    <wtx:falldelay></wtx:falldelay>
+    <wtx:inputload></wtx:inputload>
 
     <wtx:type>a</wtx:type>
     <wtx:name>or</wtx:name>
diff --git a/views/webtronix_server/digitalmodels/source.svg b/views/webtronix_server/digitalmodels/source.svg
index f76961d..a0d24ea 100644
--- a/views/webtronix_server/digitalmodels/source.svg
+++ b/views/webtronix_server/digitalmodels/source.svg
@@ -10,7 +10,7 @@
 
     </wtx:pins>
     <wtx:id>clock</wtx:id>
-
+    
     <wtx:type>a</wtx:type>
     <wtx:name>source</wtx:name>
     <wtx:category>digitalmodels</wtx:category>
diff --git a/views/webtronix_server/digitalmodels/xnor.svg b/views/webtronix_server/digitalmodels/xnor.svg
index 21b2c56..8a97871 100644
--- a/views/webtronix_server/digitalmodels/xnor.svg
+++ b/views/webtronix_server/digitalmodels/xnor.svg
@@ -24,6 +24,9 @@
         </wtx:digital>
     </wtx:pins>
     <wtx:id>xnor</wtx:id>
+    <wtx:risedelay></wtx:risedelay>
+    <wtx:falldelay></wtx:falldelay>
+    <wtx:inputload></wtx:inputload>
 
     <wtx:type>a</wtx:type>
     <wtx:name>xnor</wtx:name>
diff --git a/views/webtronix_server/digitalmodels/xor.svg b/views/webtronix_server/digitalmodels/xor.svg
index c3350c1..f518a12 100644
--- a/views/webtronix_server/digitalmodels/xor.svg
+++ b/views/webtronix_server/digitalmodels/xor.svg
@@ -24,6 +24,10 @@
         </wtx:digital>
     </wtx:pins>
     <wtx:id>xor</wtx:id>
+    <wtx:risedelay></wtx:risedelay>
+    <wtx:falldelay></wtx:falldelay>
+    <wtx:inputload></wtx:inputload>
+
 
     <wtx:type>a</wtx:type>
     <wtx:name>xor</wtx:name>
diff --git a/views/webtronix_server/hybridmodels/adc_bridge.svg b/views/webtronix_server/hybridmodels/adc_bridge.svg
index 4a5f653..03c3fb4 100644
--- a/views/webtronix_server/hybridmodels/adc_bridge.svg
+++ b/views/webtronix_server/hybridmodels/adc_bridge.svg
@@ -14,7 +14,7 @@
         </wtx:digital>
     </wtx:pins>
 <!--id for svg diagram and spice-->
-    <wtx:id>ada</wtx:id>
+    <wtx:id>a</wtx:id>
 <!--type of part-->
     <wtx:type>a</wtx:type>
 <!--name of file-->
diff --git a/views/webtronix_server/hybridmodels/dac_bridge.svg b/views/webtronix_server/hybridmodels/dac_bridge.svg
index 0877acf..3611613 100644
--- a/views/webtronix_server/hybridmodels/dac_bridge.svg
+++ b/views/webtronix_server/hybridmodels/dac_bridge.svg
@@ -18,7 +18,7 @@
             <wtx:node index="2" x="30" y="10" />
         </wtx:analog>
     </wtx:pins>
-    <wtx:id>ad</wtx:id>
+    <wtx:id>a</wtx:id>
     <wtx:type>a</wtx:type>
     <wtx:name>dac_bridge</wtx:name>
     <wtx:category>hybridmodels</wtx:category>