From 981aee4c14d73077804347c11fbde3f287a8d695 Mon Sep 17 00:00:00 2001 From: GauravSupal Date: Tue, 5 May 2015 10:59:19 +0000 Subject: Analog Models Added --- src/configuration/Appconfig.pyc | Bin 1388 -> 1391 bytes src/configuration/__init__.pyc | Bin 143 -> 144 bytes src/frontEnd/Application.py | 1 - src/frontEnd/ProjectExplorer.pyc | Bin 3009 -> 3015 bytes src/frontEnd/ViewManagement.py | 2 +- src/frontEnd/ViewManagement.pyc | Bin 2902 -> 2875 bytes src/frontEnd/Workspace.pyc | Bin 3526 -> 3533 bytes src/modelParamXML/Analog/aswitch.xml | 14 ++++++++++++++ src/modelParamXML/Analog/climit.xml | 15 +++++++++++++++ src/modelParamXML/Analog/d_dt.xml | 14 ++++++++++++++ src/modelParamXML/Analog/divide.xml | 18 ++++++++++++++++++ src/modelParamXML/Analog/gain.xml | 2 +- src/modelParamXML/Analog/hyst.xml | 16 ++++++++++++++++ src/modelParamXML/Analog/ilimit.xml | 19 +++++++++++++++++++ src/modelParamXML/Analog/int.xml | 15 +++++++++++++++ src/modelParamXML/Analog/limit.xml | 15 +++++++++++++++ src/modelParamXML/Analog/mult.xml | 13 +++++++++++++ src/modelParamXML/Analog/slew.xml | 12 ++++++++++++ src/modelParamXML/Analog/summer.xml | 10 +++++----- src/modelParamXML/Analog/zener.xml | 14 ++++++++++++++ src/projManagement/Kicad.pyc | Bin 4302 -> 4309 bytes src/projManagement/Validation.pyc | Bin 2397 -> 2404 bytes src/projManagement/Worker.pyc | Bin 1501 -> 1507 bytes src/projManagement/__init__.pyc | Bin 144 -> 145 bytes src/projManagement/newProject.pyc | Bin 3743 -> 3749 bytes src/projManagement/openProject.pyc | Bin 1767 -> 1771 bytes 26 files changed, 172 insertions(+), 8 deletions(-) create mode 100644 src/modelParamXML/Analog/aswitch.xml create mode 100644 src/modelParamXML/Analog/climit.xml create mode 100644 src/modelParamXML/Analog/d_dt.xml create mode 100644 src/modelParamXML/Analog/divide.xml create mode 100644 src/modelParamXML/Analog/hyst.xml create mode 100644 src/modelParamXML/Analog/ilimit.xml create mode 100644 src/modelParamXML/Analog/int.xml create mode 100644 src/modelParamXML/Analog/limit.xml create mode 100644 src/modelParamXML/Analog/mult.xml create mode 100644 src/modelParamXML/Analog/slew.xml create mode 100644 src/modelParamXML/Analog/zener.xml (limited to 'src') diff --git a/src/configuration/Appconfig.pyc b/src/configuration/Appconfig.pyc index 7d047db5..9e78df71 100644 Binary files a/src/configuration/Appconfig.pyc and b/src/configuration/Appconfig.pyc differ diff --git a/src/configuration/__init__.pyc b/src/configuration/__init__.pyc index 4997c274..5d054b24 100644 Binary files a/src/configuration/__init__.pyc and b/src/configuration/__init__.pyc differ diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index ae92939b..9c845ed4 100755 --- a/src/frontEnd/Application.py +++ b/src/frontEnd/Application.py @@ -29,7 +29,6 @@ import Workspace import sys import time import subprocess -import TestView class Application(QtGui.QMainWindow): diff --git a/src/frontEnd/ProjectExplorer.pyc b/src/frontEnd/ProjectExplorer.pyc index fe22b7f0..392fa27b 100644 Binary files a/src/frontEnd/ProjectExplorer.pyc and b/src/frontEnd/ProjectExplorer.pyc differ diff --git a/src/frontEnd/ViewManagement.py b/src/frontEnd/ViewManagement.py index 2160be8b..d3269a93 100755 --- a/src/frontEnd/ViewManagement.py +++ b/src/frontEnd/ViewManagement.py @@ -23,7 +23,7 @@ from PyQt4 import QtCore from PyQt4 import QtGui from projManagement.Kicad import Kicad from ProjectExplorer import ProjectExplorer -from Plotting import Plotting + class ViewManagement(QtGui.QSplitter): diff --git a/src/frontEnd/ViewManagement.pyc b/src/frontEnd/ViewManagement.pyc index ef6ae7ee..6511e9ea 100644 Binary files a/src/frontEnd/ViewManagement.pyc and b/src/frontEnd/ViewManagement.pyc differ diff --git a/src/frontEnd/Workspace.pyc b/src/frontEnd/Workspace.pyc index 935ed8d5..576e6ba1 100644 Binary files a/src/frontEnd/Workspace.pyc and b/src/frontEnd/Workspace.pyc differ diff --git a/src/modelParamXML/Analog/aswitch.xml b/src/modelParamXML/Analog/aswitch.xml new file mode 100644 index 00000000..fe50ecd3 --- /dev/null +++ b/src/modelParamXML/Analog/aswitch.xml @@ -0,0 +1,14 @@ + +aswitch +Analog +3 +Add Parameters for Analog Switch +1-NV:2-V + + Enter Control OFF value (default=0.0) + Enter Control ON value(default=1.0) + Enter OFF Resistance (default=1.0e12) + Enter ON Resistance (default=1.0) + Enter Log (default=TRUE) + + diff --git a/src/modelParamXML/Analog/climit.xml b/src/modelParamXML/Analog/climit.xml new file mode 100644 index 00000000..0d1f9c7e --- /dev/null +++ b/src/modelParamXML/Analog/climit.xml @@ -0,0 +1,15 @@ + +climit +Analog +4 +Add Parameters for Controlled Limiter +None + + Enter offset for Input (default=0.0) + Enter value for Gain (default=1.0) + Enter Output Upper Delta (default=0.0) + Enter Output Lower Delta (default=0.0) + Enter Limit Range (default=1.0e-6) + Enter Fraction (default=false) + + \ No newline at end of file diff --git a/src/modelParamXML/Analog/d_dt.xml b/src/modelParamXML/Analog/d_dt.xml new file mode 100644 index 00000000..65494392 --- /dev/null +++ b/src/modelParamXML/Analog/d_dt.xml @@ -0,0 +1,14 @@ + +d_dt +Analog +2 +Add Parameters for Differentiator +None + + Enter value for Gain (default=1.0) + Enter offset for Output (default=0.0) + Enter Output Lower Limit (default=0.0) + Enter Output Upper Limit (default=1.0) + Enter Limit Range (default=1.0e-6) + + diff --git a/src/modelParamXML/Analog/divide.xml b/src/modelParamXML/Analog/divide.xml new file mode 100644 index 00000000..d501ae4e --- /dev/null +++ b/src/modelParamXML/Analog/divide.xml @@ -0,0 +1,18 @@ + +divide +Analog +3 +Add Parameters for Multiplier +None + + Enter offset for Numerator (default=0.0) + Enter gain for Numerator (default=1.0) + Enter offset for Denominator (default=0.0) + Enter gain for Denominator (default=1.0) + Enter Denominator Lower Limit (default=1.0e-10) + Enter Denominator Domain (default=1.0e-10) + Enter Fraction (default=false) + Enter gain for output (default=1.0) + Enter offset for output (default=0.0) + + diff --git a/src/modelParamXML/Analog/gain.xml b/src/modelParamXML/Analog/gain.xml index 20f00004..ff71d46a 100644 --- a/src/modelParamXML/Analog/gain.xml +++ b/src/modelParamXML/Analog/gain.xml @@ -2,7 +2,7 @@ gain Analog 2 -Add Parameter for model gain +Add Parameters for model Gain None Enter offset for input (default=0.0) diff --git a/src/modelParamXML/Analog/hyst.xml b/src/modelParamXML/Analog/hyst.xml new file mode 100644 index 00000000..56a60c0f --- /dev/null +++ b/src/modelParamXML/Analog/hyst.xml @@ -0,0 +1,16 @@ + +hyst +Analog +2 +Add Parameters for Hysteresis +None + + Enter Input Low Value (default=0.0) + Enter Input High Value (default=1.0) + Enter Hysteresis (default=0.1) + Enter Output Lower Limit (default=0.0) + Enter Output Upper Limit (default=1.0) + Enter Input Domain Value (default=0.01) + Enter Fraction (default=TRUE) + + diff --git a/src/modelParamXML/Analog/ilimit.xml b/src/modelParamXML/Analog/ilimit.xml new file mode 100644 index 00000000..32b2149f --- /dev/null +++ b/src/modelParamXML/Analog/ilimit.xml @@ -0,0 +1,19 @@ + +ilimit +Analog +4 +Add Parameters for Current Limiter +None + + Enter offset for Input (default=0.0) + Enter value for Gain (default=1.0) + Enter value for Sourcing Resistance (default=1.0) + Enter value for Sinking Resistance (default=1.0) + Enter Current Sourcing Limit (default=1.0e-12) + Enter Current Sinking Limit (default=1.0e-12) + Enter Power Supply Range (default=1.0e-6) + Enter Current Sourcing Range (default=1.0e-9) + Enter Current Sinking Range (default=1.0e-9) + Enter Voltage Delta Range (default=1.0e-9) + + diff --git a/src/modelParamXML/Analog/int.xml b/src/modelParamXML/Analog/int.xml new file mode 100644 index 00000000..6ccec625 --- /dev/null +++ b/src/modelParamXML/Analog/int.xml @@ -0,0 +1,15 @@ + +int +Analog +2 +Add Parameters for int +None + + Enter offset for Input (default=0.0) + Enter value for Gain (default=1.0) + Enter Output Lower Limit (default=0.0) + Enter Output Upper Limit (default=1.0) + Enter Limit Range (default=1.0e-6) + Enter Output Initial Condition (default=0.0) + + diff --git a/src/modelParamXML/Analog/limit.xml b/src/modelParamXML/Analog/limit.xml new file mode 100644 index 00000000..c2a1f382 --- /dev/null +++ b/src/modelParamXML/Analog/limit.xml @@ -0,0 +1,15 @@ + +limit +Analog +2 +Add Parameters for Limiter +None + + Enter offset for Input (default=0.0) + Enter value for Gain (default=1.0) + Enter Output Lower Limit (default=0.0) + Enter Output Upper Limit (default=1.0) + Enter Limit Range (default=1.0e-6) + Enter Fraction (default=false) + + diff --git a/src/modelParamXML/Analog/mult.xml b/src/modelParamXML/Analog/mult.xml new file mode 100644 index 00000000..e41463ff --- /dev/null +++ b/src/modelParamXML/Analog/mult.xml @@ -0,0 +1,13 @@ + +mult +Analog +3 +Add Parameters for Multiplier +2-V:1-NV + + Enter offset for input (default=0.0) + Enter gain for input(default=1.0) + Enter gain for output (default=1.0) + Enter offset for output (default=0.0) + + diff --git a/src/modelParamXML/Analog/slew.xml b/src/modelParamXML/Analog/slew.xml new file mode 100644 index 00000000..2eafde2d --- /dev/null +++ b/src/modelParamXML/Analog/slew.xml @@ -0,0 +1,12 @@ + +slew +Analog +2 +Add Parameters for slew +None + + Enter Rising Slope Value (default=1.0e9) + Enter Falling Slope Value (default=1.0e9) + Enter Range (default=0.1) + + diff --git a/src/modelParamXML/Analog/summer.xml b/src/modelParamXML/Analog/summer.xml index 5f8b3d52..d9856b62 100644 --- a/src/modelParamXML/Analog/summer.xml +++ b/src/modelParamXML/Analog/summer.xml @@ -2,12 +2,12 @@ summer Analog 3 -Add parameters for Summer +Add Parameters for Summer 2-V:1-NV - Enter offset for input (default=0.0): - Enter gain for input(default=1.0): - Enter gain for output (default=1.0): - Enter offset for output (default=0.0): + Enter offset for input (default=0.0) + Enter gain for input(default=1.0) + Enter gain for output (default=1.0) + Enter offset for output (default=0.0) diff --git a/src/modelParamXML/Analog/zener.xml b/src/modelParamXML/Analog/zener.xml new file mode 100644 index 00000000..c6e32c36 --- /dev/null +++ b/src/modelParamXML/Analog/zener.xml @@ -0,0 +1,14 @@ + +zener +Analog +2 +Add Parameters for Zener Diode +None + + Enter Breakdown Voltage (default=5.6) + Enter Breakdown Current (default=2.0e-2) + Enter Saturation Current (default=1.0e-12) + Enter Forward Emission Coefficient (default=1.0) + Enter Switch for Limiting (default=FALSE) + + diff --git a/src/projManagement/Kicad.pyc b/src/projManagement/Kicad.pyc index 3cb015de..7f977180 100644 Binary files a/src/projManagement/Kicad.pyc and b/src/projManagement/Kicad.pyc differ diff --git a/src/projManagement/Validation.pyc b/src/projManagement/Validation.pyc index a1bbf393..54ae7db1 100644 Binary files a/src/projManagement/Validation.pyc and b/src/projManagement/Validation.pyc differ diff --git a/src/projManagement/Worker.pyc b/src/projManagement/Worker.pyc index 4f8652b7..b8f921e3 100644 Binary files a/src/projManagement/Worker.pyc and b/src/projManagement/Worker.pyc differ diff --git a/src/projManagement/__init__.pyc b/src/projManagement/__init__.pyc index 2f39d337..a5c33b52 100644 Binary files a/src/projManagement/__init__.pyc and b/src/projManagement/__init__.pyc differ diff --git a/src/projManagement/newProject.pyc b/src/projManagement/newProject.pyc index a5fbed82..9a413352 100644 Binary files a/src/projManagement/newProject.pyc and b/src/projManagement/newProject.pyc differ diff --git a/src/projManagement/openProject.pyc b/src/projManagement/openProject.pyc index 49ac9b28..c4b544ae 100644 Binary files a/src/projManagement/openProject.pyc and b/src/projManagement/openProject.pyc differ -- cgit