Merge pull request #1167 from ra3xdh/fix_1166

Fix digital simulation with subcircuits
ra3xdh · Dec 30, 2024 · 7c9c40e · 7c9c40e
2 parents 2c086e6 + 7ffbcc5
commit 7c9c40e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/qucs/components/subcircuit.cpp b/qucs/components/subcircuit.cpp
@@ -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++) {
@@ -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++)

diff --git a/qucs/schematic_file.cpp b/qucs/schematic_file.cpp
@@ -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 ...................................
@@ -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"
@@ -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)) {