Merge branch 'pre-master' into bt_dev

compile_cyg_make_short_check_64.sh

@@ -38,7 +38,7 @@ cd release64_cyg
 if [ $? -ne 0 ]; then  echo "cd release64_cyg failed"; exit 1 ; fi
 echo
 # You may add  --enable-adms to the following command for adding adms generated devices 
-../configure --with-x=yes --with-readline=yes --disable-debug --enable-cider --enable-openmp  --enable-xspice --enable-shortcheck CFLAGS="-O2 -m64" LDFLAGS="-s -m64"
+../configure --with-x=yes --with-readline=yes --disable-debug --enable-cider --enable-openmp  --enable-xspice --enable-osdi --enable-shortcheck CFLAGS="-O2 -m64" LDFLAGS="-s -m64"
 #../configure --with-x=no --with-readline=yes --disable-debug --enable-xspice --enable-cider --enable-openmp
 
 if [ $? -ne 0 ]; then  echo "../configure failed"; exit 1 ; fi

examples/osdi/hicuml0/ECL-OR.cir

@@ -16,10 +16,12 @@ R3 GND Net-_Q3-Pad2_ 575
 Ra2 A2 VEE 510
 V3 In2 GND dc -1.75 pulse(-1.75 -0.9 0 1n 1n 2.5u 5u)
 Rt1 DT GND 1G
-.tran 0.1n 100u
+.tran 0.3n 100u
 .control
 pre_osdi osdi_libs/HICUML0-2.osdi
 run
+rusage
+set xbrushwidth=2
 plot a1 a2+2 in1+4 in2+6
 .endc
 .end

examples/osdi/hicuml0/KiCad/ECL-OR.kicad_prl

@@ -0,0 +1,75 @@
+{
+  "board": {
+    "active_layer": 0,
+    "active_layer_preset": "",
+    "auto_track_width": true,
+    "hidden_nets": [],
+    "high_contrast_mode": 0,
+    "net_color_mode": 1,
+    "opacity": {
+      "pads": 1.0,
+      "tracks": 1.0,
+      "vias": 1.0,
+      "zones": 0.6
+    },
+    "ratsnest_display_mode": 0,
+    "selection_filter": {
+      "dimensions": true,
+      "footprints": true,
+      "graphics": true,
+      "keepouts": true,
+      "lockedItems": true,
+      "otherItems": true,
+      "pads": true,
+      "text": true,
+      "tracks": true,
+      "vias": true,
+      "zones": true
+    },
+    "visible_items": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15,
+      16,
+      17,
+      18,
+      19,
+      20,
+      21,
+      22,
+      23,
+      24,
+      25,
+      26,
+      27,
+      28,
+      29,
+      30,
+      32,
+      33,
+      34,
+      35,
+      36
+    ],
+    "visible_layers": "fffffff_ffffffff",
+    "zone_display_mode": 0
+  },
+  "meta": {
+    "filename": "ECL-RO.kicad_prl",
+    "version": 3
+  },
+  "project": {
+    "files": []
+  }
+}

examples/osdi/hicuml0/KiCad/ECL-OR.kicad_sch

@@ -819,6 +819,10 @@
     (uuid fffeed8b-d6ec-4440-8197-319371f73fce)
   )
 
+  (text "ECL OR - NOR gate" (at 245.364 87.884 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 323369ca-7b3f-476e-866f-1c1d7820c037)
+  )
   (text ".tran 0.1n 100u\n.control\npre_osdi test_osdi_win/HICUML0-2.osdi\nrun\nplot a1 a2+2 in1+4 in2+6\n.endc"
     (at 242.824 120.142 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))

visualc/src/include/ngspice/config.h

@@ -491,7 +491,7 @@
 #define PACKAGE_VERSION VERSION
 
 /* Define if we want predictor algorithm */
-/* #undef PREDICTOR */
+#define PREDICTOR
 
 /* Define to 1 if the C compiler supports function prototypes. */
 /* #undef PROTOTYPES */