Skip to content

Add new circuits, enhancement to CircuitModel #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erictarrbelmont merged 1 commit into from
Dec 27, 2022
Merged

Add new circuits, enhancement to CircuitModel #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified CircuitModel/CircuitModel.p
View file
Open in desktop
Binary file not shown.
7 changes: 4 additions & 3 deletions Circuits/AmpClippers/BognerAmpPt2.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@
R3 = Resistor(4.75e3,5,0);
R4 = Resistor(100e3,3,4);
%R5 = Resistor(100e3,2,6);
o.layout.Rs = [R1; R2; R3; R4];
%o.layout.Rs = [R1; R2; R3; R4];
o.layout.Rs = [R2; R3; R4];

C1 = Capacitor(470e-12,1,2);

C2 = Capacitor(0.001e-6,3,4);
o.layout.Cs = [C2];
%o.layout.Cs = [C1; C2];
%o.layout.Cs = [C1];
o.layout.Cs = [C1; C2];

model = Model12AX7.RSD1; % RSD1, RSD2, EXH

Expand Down
4 changes: 2 additions & 2 deletions Circuits/AmpClippers/BognerAmpPt3.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

C1 = Capacitor(470e-12,1,2);
C2 = Capacitor(470e-12,4,5);
o.layout.Cs = [C2];
%o.layout.Cs = [C1; C2];
%o.layout.Cs = [C2];
o.layout.Cs = [C1; C2];

model = Model12AX7.EXH; % RSD1, RSD2, EHX

Expand Down
27 changes: 27 additions & 0 deletions Circuits/AmpClippers/BognerAmpPt5.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
classdef BognerAmpPt5 < Circuit

methods
function [o] = BognerAmpPt5()

o.layout.numNodes = 3;

o.layout.Vin = VoltageInput(1,0);
o.layout.Vout = VoltageOutput(3,0);
o.layout.Vs = VoltageSource(265,2); % Voltage, Node

R1 = Resistor(100e3,3,0);
o.layout.Rs = [R1];

model = Model12AX7.EXH; % RSD1, RSD2, EHX

tube = Tube12AX7(model,1,2,3); % Grid, Anode, Cathode

o.layout.Tube12AX7s = tube;

o.layout.hasDCBlocker = true;

o.circuit = CircuitModel(o.layout);
end
end
end

31 changes: 31 additions & 0 deletions Circuits/AmpClippers/FenderBlackfaceInput.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
classdef FenderBlackfaceInput < Circuit

methods
function [o] = FenderBlackfaceInput()

o.layout.numNodes = 5;

o.layout.Vin = VoltageInput(1,0);
o.layout.Vout = VoltageOutput(4,0);
o.layout.Vs = VoltageSource(410,5); % Voltage, Node

R1 = Resistor(68e3,1,2); % In->Grid
R2 = Resistor(1.5e3,3,0); % Cathode->Ground
R3 = Resistor(100e3,4,5); % Anode->Vs
o.layout.Rs = [R1; R2; R3];

C1 = Capacitor(25e-6,3,0); % Cathode->Ground
o.layout.Cs = C1;

model = Model12AX7.RSD1;

tube = Tube12AX7(model,2,4,3); % Grid, Anode, Cathode

o.layout.Tube12AX7s = tube;

o.layout.hasDCBlocker = true;

o.circuit = CircuitModel(o.layout);
end
end
end
32 changes: 32 additions & 0 deletions Circuits/AmpClippers/MarshallMasterVolumeInput_1.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
classdef MarshallMasterVolumeInput_1 < Circuit

methods
function [o] = MarshallMasterVolumeInput_1()

o.layout.numNodes = 6;

o.layout.Vin = VoltageInput(1,0);
o.layout.Vout = VoltageOutput(6,0);
o.layout.Vs = VoltageSource(280,5); % Voltage, Node

R1 = Resistor(68e3,1,2); % In->Grid
R2 = Resistor(2.7e3,3,0); % Cathode->Ground
R3 = Resistor(100e3,4,5); % Anode->Vs
o.layout.Rs = [R1; R2; R3];

C1 = Capacitor(0.68e-6,3,0); % Cathode->Ground
C2 = Capacitor(0.0022e-6,4,6); % Anode->Pot
o.layout.Cs = [C1; C2];

model = Model12AX7.RSD1;

tube = Tube12AX7(model,2,4,3); % Grid, Anode, Cathode

o.layout.Tube12AX7s = tube;

o.layout.hasDCBlocker = true;

o.circuit = CircuitModel(o.layout);
end
end
end
39 changes: 39 additions & 0 deletions Circuits/AmpClippers/MarshallMasterVolumeInput_2.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@

%%% NOT WORKING %%%

classdef MarshallMasterVolumeInput_2 < Circuit

methods
function [o] = MarshallMasterVolumeInput_2()

o.layout.numNodes = 8;

o.layout.Vin = VoltageInput(1,0);
o.layout.Vout = VoltageOutput(8,0);
o.layout.Vs = VoltageSource(280,7); % Voltage, Node

R1 = Resistor(470e3,1,2); %
R2 = Resistor(1e3,3,4); % In->Grid
R3 = Resistor(10e3,5,0); % Cathode->Ground
R4 = Resistor(100e3,6,7); % Source->Anode
R5 = Resistor(500e3,2,3); % Pot 1
R6 = Resistor(500e3,3,0); % Pot 2
o.layout.Rs = [R1; R2; R3; R4; R5; R6];

C1 = Capacitor(470e-12,1,2);
C2 = Capacitor(0.001e-6,2,3);
C3 = Capacitor(0.022e-6,6,8);
o.layout.Cs = [C1; C2; C3];

model = Model12AX7.RSD1;

tube = Tube12AX7(model,4,6,5); % Grid, Anode, Cathode

o.layout.Tube12AX7s = tube;

o.layout.hasDCBlocker = true;

o.circuit = CircuitModel(o.layout);
end
end
end
44 changes: 44 additions & 0 deletions Circuits/AmpClippers/MarshallSuperLeadBrightInput.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
classdef MarshallSuperLeadBrightInput < Circuit

methods
function [o] = MarshallSuperLeadBrightInput()

o.layout.numNodes = 8;

o.layout.Vin = VoltageInput(1,0);
o.layout.Vout = VoltageOutput(7,0);
o.layout.Vs = VoltageSource(260,5); % Voltage, Node

R1 = Resistor(68e3,1,2); % In->Grid
R2 = Resistor(2.7e3,3,0); % Cathode->Ground
R3 = Resistor(100e3,4,5); % Anode->Vs
R4 = Resistor(1e3,8,0);
o.layout.Rs = [R1; R2; R3; R4];

C1 = Capacitor(68e-6,3,0); % Cathode->Ground
C2 = Capacitor(0.0022e-6,4,6); % Anode->Pot
C3 = Capacitor(0.005e-6,6,7);
o.layout.Cs = [C1; C2; C3];

P1A = VariableResistor(1e6,1,...
VariableResistorDirection.PROPORTIONAL,...
VariableResistorSkew.LINEAR,...
6,7);
P1B = VariableResistor(1e6,1,...
VariableResistorDirection.INVPROPORTIONAL,...
VariableResistorSkew.LINEAR,...
7,8);
o.layout.VarRs = [P1A; P1B;];

model = Model12AX7.RSD1;

tube = Tube12AX7(model,2,4,3); % Grid, Anode, Cathode

o.layout.Tube12AX7s = tube;

o.layout.hasDCBlocker = true;

o.circuit = CircuitModel(o.layout);
end
end
end
31 changes: 31 additions & 0 deletions Circuits/AmpClippers/MarshallSuperLeadCathodeFollower.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

%%% NOT WORKING %%%

classdef MarshallSuperLeadCathodeFollower < Circuit

methods
function [o] = MarshallSuperLeadCathodeFollower()

o.layout.numNodes = 5;

o.layout.Vin = VoltageInput(1,0);
o.layout.Vout = VoltageOutput(4,0);
o.layout.Vs = VoltageSource(275,5); % Voltage, Node

R1 = Resistor(1e3,1,2); % In->Grid
R2 = Resistor(1e3,3,0); % Cathode->Ground
R3 = Resistor(100e3,4,5); % Anode->Vs
o.layout.Rs = [R1; R2; R3];

model = Model12AX7.RSD1;

tube1 = Tube12AX7(model,2,4,3); % Grid, Anode, Cathode

o.layout.Tube12AX7s = tube1;

o.layout.hasDCBlocker = true;

o.circuit = CircuitModel(o.layout);
end
end
end
43 changes: 43 additions & 0 deletions Circuits/AmpClippers/MarshallSuperLeadNormalInput.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
classdef MarshallSuperLeadNormalInput < Circuit

methods
function [o] = MarshallSuperLeadNormalInput()

o.layout.numNodes = 8;

o.layout.Vin = VoltageInput(1,0);
o.layout.Vout = VoltageOutput(7,0);
o.layout.Vs = VoltageSource(260,5); % Voltage, Node

R1 = Resistor(68e3,1,2); % In->Grid
R2 = Resistor(820,3,0); % Cathode->Ground
R3 = Resistor(100e3,4,5); % Anode->Vs
R4 = Resistor(1e3,8,0);
o.layout.Rs = [R1; R2; R3; R4];

C1 = Capacitor(330e-6,3,0); % Cathode->Ground
C2 = Capacitor(0.022e-6,4,6); % Anode->Pot
o.layout.Cs = [C1; C2];

P1A = VariableResistor(1e6,1,...
VariableResistorDirection.PROPORTIONAL,...
VariableResistorSkew.LINEAR,...
6,7);
P1B = VariableResistor(1e6,1,...
VariableResistorDirection.INVPROPORTIONAL,...
VariableResistorSkew.LINEAR,...
7,8);
o.layout.VarRs = [P1A; P1B;];

model = Model12AX7.RSD1;

tube = Tube12AX7(model,2,4,3); % Grid, Anode, Cathode

o.layout.Tube12AX7s = tube;

o.layout.hasDCBlocker = true;

o.circuit = CircuitModel(o.layout);
end
end
end
30 changes: 30 additions & 0 deletions Circuits/AmpClippers/MarshallSuperLeadToneTube.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

%%% NOT WORKING %%%

classdef MarshallSuperLeadToneTube < Circuit

methods
function [o] = MarshallSuperLeadToneTube()

o.layout.numNodes = 4;

o.layout.Vin = VoltageInput(1,0);
o.layout.Vout = VoltageOutput(4,0);
o.layout.Vs = VoltageSource(275,3); % Voltage, Node

R1 = Resistor(1e3,1,2); % In->Grid
R2 = Resistor(100e3,4,0); % Cathode->Ground
o.layout.Rs = [R1; R2];

model = Model12AX7.RSD1;

tube = Tube12AX7(model,2,3,4); % Grid, Anode, Cathode

o.layout.Tube12AX7s = tube;

o.layout.hasDCBlocker = true;

o.circuit = CircuitModel(o.layout);
end
end
end
39 changes: 39 additions & 0 deletions Circuits/AmpClippers/VoxAC15TopBoostInput.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
classdef VoxAC15TopBoostInput < Circuit

methods
function [o] = VoxAC15TopBoostInput()

o.layout.numNodes = 7;

o.layout.Vin = VoltageInput(1,0);
o.layout.Vout = VoltageOutput(5,0);
o.layout.Vs = VoltageSource(450,6); % Voltage, Node

R1 = Resistor(68e3,1,2); % In->Grid
R2 = Resistor(1.5e3,3,0); % Cathode->Ground
R3 = Resistor(220e3,4,6); % Anode->Vs
R4 = Resistor(1e3,7,0);
o.layout.Rs = [R1; R2; R3; R4];

C1 = Capacitor(25e-6,3,0); % Cathode->Ground
C2 = Capacitor(500e-12,4,5); % Anode->Pot
o.layout.Cs = [C1; C2];

P1A = VariableResistor(500e3,1,... % Volume
VariableResistorDirection.INVPROPORTIONAL,...
VariableResistorSkew.LINEAR,...
5,7);
o.layout.VarRs = P1A;

model = Model12AX7.RSD1;

tube = Tube12AX7(model,2,4,3); % Grid, Anode, Cathode

o.layout.Tube12AX7s = tube;

o.layout.hasDCBlocker = true;

o.circuit = CircuitModel(o.layout);
end
end
end
34 changes: 34 additions & 0 deletions Circuits/PedalClippers/DallasRangemaster.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
classdef DallasRangemaster < Circuit

methods
function [o] = DallasRangemaster()

o.layout.numNodes = 5;

o.layout.Vin = VoltageInput(1,0);
o.layout.Vout = VoltageOutput(5,0);
o.layout.Vs = VoltageSource(9,4); % Voltage, Node

R1 = Resistor(68e3,4,2); % Vs to base
R2 = Resistor(470e3,2,0); % base to ground
R3 = Resistor(3.9e3,4,3); % Vs to emitter
R4 = Resistor(10e3,5,0); % Collector to ground
o.layout.Rs = [R1;R2; R3; R4];

C1 = Capacitor(5e-9,1,2); % in to base
C2 = Capacitor(47e-6,4,3); % Vs to emitter
%o.layout.Cs = [C2];
o.layout.Cs = [C1; C2];

type = Semiconductor.GERMANIUM;
doping = Doping.PNP;
bjt = BJT(doping,type,2,5,3); % base, collector, emitter

o.layout.BJTs = bjt;

o.layout.hasDCBlocker = true;

o.circuit = CircuitModel(o.layout);
end
end
end