Skip to content
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

Fix digital simulation with subcircuits #1167

Merged
merged 3 commits into from
Dec 30, 2024
Merged

Fix digital simulation with subcircuits #1167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e985de
Fix crash when try to simulate digital schematic with subcircuit
ra3xdh Dec 30, 2024
5542816
Fix writing digital netlists with subcircuits
ra3xdh Dec 30, 2024
7ffbcc5
Fix GHDL simulation for subcircuits
ra3xdh Dec 30, 2024
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
4 changes: 2 additions & 2 deletions qucs/components/subcircuit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ QString Subcircuit::vhdlCode(int) {
QString s = " " + Name + ": entity Sub_" + misc::properName(f);

// output all user defined properties
if (Props.at(1) != nullptr) {
if (Props.count() > 1) {
s += " generic map (";
s += Props.at(1)->Value;
for (qsizetype i = 2; i < Props.size(); i++) {
Expand Down Expand Up @@ -274,7 +274,7 @@ QString Subcircuit::verilogCode(int) {
QString s = " Sub_" + misc::properName(f);

// output all user defined properties
if (Props.at(1) != nullptr) {
if (Props.count() > 1) {
s += " #(";
s += misc::Verilog_Param(Props.at(1)->Value);
for (qsizetype i = 2; i < Props.size(); i++)
Expand Down
29 changes: 20 additions & 9 deletions qucs/schematic_file.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1869,7 +1869,8 @@ void Schematic::createSubNetlistPlain(QTextStream *stream, QPlainTextEdit *ErrTe



if (QucsSettings.DefaultSimulator == spicecompat::simQucsator) {
if (QucsSettings.DefaultSimulator == spicecompat::simQucsator ||
!a_isAnalog) {

if(a_isAnalog) {
// ..... analog subcircuit ...................................
Expand Down Expand Up @@ -1956,26 +1957,35 @@ void Schematic::createSubNetlistPlain(QTextStream *stream, QPlainTextEdit *ErrTe
} else {
// ..... digital subcircuit ...................................
(*tstream) << VHDL_LIBRARIES;
(*tstream) << "entity Sub_" << Type << " is\n"
<< " port ("
<< SubcircuitPortNames.join(";\n ") << ");\n";
(*tstream) << "entity Sub_" << Type << " is\n";

for(pi = a_SymbolPaints.first(); pi != 0; pi = a_SymbolPaints.next())
QString generic_str;
for(pi = a_SymbolPaints.first(); pi != 0; pi = a_SymbolPaints.next()) {
if(pi->Name == ".ID ") {
ID_Text *pid = (ID_Text*)pi;
QList<SubParameter *>::const_iterator it;

(*tstream) << " generic (";


for(it = pid->Parameter.constBegin(); it != pid->Parameter.constEnd(); it++) {
s = (*it)->Name;
QString t = (*it)->Type.isEmpty() ? "real" : (*it)->Type;
(*tstream) << s.replace("=", " : "+t+" := ") << ";\n ";
generic_str += s.replace("=", " : "+t+" := ") + ";\n ";
}

(*tstream) << ");\n";

break;
}
}
if (!generic_str.isEmpty()) {
(*tstream) << " generic (";
(*tstream) << generic_str;
(*tstream) << ");\n";
}

(*tstream) << " port ("
<< SubcircuitPortNames.join(";\n ") << ");\n";


(*tstream) << "end entity;\n"
<< "use work.all;\n"
Expand Down Expand Up @@ -2054,7 +2064,8 @@ bool Schematic::createSubNetlist(QTextStream *stream, int& countInit,

// Emit subcircuit components
createSubNetlistPlain(stream, ErrText, NumPorts);
if (QucsSettings.DefaultSimulator != spicecompat::simQucsator) {
if (QucsSettings.DefaultSimulator != spicecompat::simQucsator &&
a_isAnalog) {
AbstractSpiceKernel *kern = new AbstractSpiceKernel(this);
QStringList err_lst;
if (!kern->checkSchematic(err_lst)) {
Expand Down
Loading