Merge branch 'develop'

Conflicts:
	kicadSchematicLibrary/kicad.pro
	src/ngspicetoModelica/__init__.py

3 files changed, 119 insertions, 0 deletions

diff --git a/kicadSchematicLibrary/eSim_Plot.dcm b/kicadSchematicLibrary/eSim_Plot.dcm
new file mode 100644
index 00000000..5f3ed79b
--- /dev/null
+++ b/kicadSchematicLibrary/eSim_Plot.dcm
@@ -0,0 +1,3 @@
+EESchema-DOCLIB  Version 2.0
+#
+#End Doc Library
diff --git a/kicadSchematicLibrary/eSim_Plot.lib b/kicadSchematicLibrary/eSim_Plot.lib
new file mode 100644
index 00000000..5654a3d2
--- /dev/null
+++ b/kicadSchematicLibrary/eSim_Plot.lib
@@ -0,0 +1,84 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# plot_db
+#
+DEF plot_db U 0 40 Y Y 1 F N
+F0 "U" 0 500 60 H V C CNN
+F1 "plot_db" 200 350 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 500 100 0 1 0 N
+X ~ ~ 0 200 200 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# plot_i2
+#
+DEF plot_i2 U 0 40 Y Y 1 F N
+F0 "U" 0 400 60 H V C CNN
+F1 "plot_i2" 0 100 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 250 100 0 1 0 N
+X + 1 -300 250 200 R 50 50 1 1 I
+X - 2 300 250 200 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# plot_log
+#
+DEF plot_log U 0 40 Y Y 1 F N
+F0 "U" 0 500 60 H V C CNN
+F1 "plot_log" 200 350 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 500 100 0 1 0 N
+X ~ ~ 0 200 200 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# plot_phase
+#
+DEF plot_phase U 0 40 Y Y 1 F N
+F0 "U" 0 500 60 H V C CNN
+F1 "plot_phase" 250 350 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 500 100 0 1 0 N
+X ~ ~ 0 200 200 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# plot_v1
+#
+DEF plot_v1 U 0 40 Y Y 1 F N
+F0 "U" 0 500 60 H V C CNN
+F1 "plot_v1" 200 350 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 500 100 0 1 0 N
+X ~ ~ 0 200 200 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+# plot_v2
+#
+DEF plot_v2 U 0 40 Y Y 1 F N
+F0 "U" 0 400 60 H V C CNN
+F1 "plot_v2" 0 100 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 250 100 0 1 0 N
+X + 1 -300 250 200 R 50 50 1 1 I
+X - 2 300 250 200 L 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/kicadSchematicLibrary/kicad.pro b/kicadSchematicLibrary/kicad.pro
index b3b4672e..e2569a1f 100644
--- a/kicadSchematicLibrary/kicad.pro
+++ b/kicadSchematicLibrary/kicad.pro
@@ -40,6 +40,7 @@ LibName6=eSim_Power
 LibName7=eSim_Sources
 LibName8=eSim_Subckt
 LibName9=eSim_User
+<<<<<<< HEAD
 LibName10=adc-dac
 LibName11=memory
 LibName12=xilinx
@@ -68,3 +69,34 @@ LibName34=linear
 LibName35=regul
 LibName36=74xx
 LibName37=cmos4000
+=======
+LibName10=eSim_Plot
+LibName11=adc-dac
+LibName12=memory
+LibName13=xilinx
+LibName14=microcontrollers
+LibName15=dsp
+LibName16=microchip
+LibName17=analog_switches
+LibName18=motorola
+LibName19=texas
+LibName20=intel
+LibName21=audio
+LibName22=interface
+LibName23=digital-audio
+LibName24=philips
+LibName25=display
+LibName26=cypress
+LibName27=siliconi
+LibName28=opto
+LibName29=atmel
+LibName30=contrib
+LibName31=power
+LibName32=device
+LibName33=transistors
+LibName34=conn
+LibName35=linear
+LibName36=regul
+LibName37=74xx
+LibName38=cmos4000
+>>>>>>> develop