C++ code generation for telemetry packets

compiler/lib/src/main/scala/analysis/Semantics/Dictionary.scala

@@ -84,10 +84,10 @@ object Dictionary {
   /** A telemetry channel entry in the dictionary */
   case class TlmChannelEntry(instance: ComponentInstance, tlmChannel: TlmChannel) {
 
-    def getName = {
+    def getQualifiedName = {
       val instanceName = instance.qualifiedName
       val channelName = tlmChannel.getName
-      s"$instanceName.$channelName"
+      Name.Qualified.fromIdentList(instanceName.toIdentList :+ channelName)
     }
 
   }

compiler/lib/src/main/scala/analysis/Semantics/TlmPacketSet.scala

@@ -92,7 +92,7 @@ object TlmPacketSet {
       if !usedIdSet.contains(id) && !tpg.omittedIdSet.contains(id)
       then {
         val entry = d.tlmChannelEntryMap(id)
-        val channelName = entry.getName
+        val channelName = entry.getQualifiedName
         val instanceLoc = t.instanceMap(entry.instance)._2
         val channelLoc = entry.tlmChannel.getLoc
         val msg = s"""|telemetry channel $channelName is neither used nor marked as omitted
@@ -109,7 +109,7 @@ object TlmPacketSet {
       if usedIdSet.contains(id) && tpg.omittedIdSet.contains(id)
       then {
         val entry = d.tlmChannelEntryMap(id)
-        val channelName = entry.getName
+        val channelName = entry.getQualifiedName
         val usedLoc = usedIdLocationMap(id)
         val omittedLoc = tpg.omittedLocationMap(id)
         val msg = s"""|telemetry channel $channelName is both used and marked omitted

compiler/lib/src/main/scala/codegen/CppWriter/AutocodeCppWriter.scala

@@ -82,7 +82,24 @@ object AutocodeCppWriter extends CppWriter {
   ) = {
     val node = aNode._2
     val data = node.data
-    val cppDoc = TopologyCppWriter(s, aNode).write
+    val ts = Symbol.Topology(aNode)
+    val t = s.a.topologyMap(ts)
+    val d = s.a.dictionaryMap(ts)
+    val a = s.a.copy(topology = Some(t), dictionary = Some(d))
+    val s1 = s.copy(a = a)
+    val cppDoc = TopologyCppWriter(s1, aNode).write
+    for {
+      s <- CppWriter.writeCppDoc(s1, cppDoc)
+      s <- visitList(s, data.members, matchTopologyMember)
+    }
+    yield s
+  }
+
+  override def specTlmPacketSetAnnotatedNode(
+    s: State,
+    aNode: Ast.Annotated[AstNode[Ast.SpecTlmPacketSet]]
+  ) = {
+    val cppDoc = TlmPacketSetCppWriter(s, aNode).write
     CppWriter.writeCppDoc(s, cppDoc)
   }
 

compiler/lib/src/main/scala/codegen/CppWriter/ComputeAutocodeCppFiles.scala

@@ -98,9 +98,27 @@ object ComputeAutocodeCppFiles extends ComputeCppFiles {
     aNode: Ast.Annotated[AstNode[Ast.DefTopology]]
   ) = {
     val node = aNode._2
-    val name = node.data.name
+    val data = node.data
+    val name = data.name
+    val loc = Locations.get(node.id)
+    val a = s.a.copy(parentSymbol = Some(Symbol.Topology(aNode)))
+    val s1 = s.copy(a = a)
+    for {
+      s <- addMappings(s1, ComputeCppFiles.FileNames.getTopology(name), Some(loc))
+      s <- visitList (s, data.members, matchTopologyMember)
+    }
+    yield s
+  }
+
+  override def specTlmPacketSetAnnotatedNode(
+    s: State,
+    aNode: Ast.Annotated[AstNode[Ast.SpecTlmPacketSet]]
+  ) = {
+    val node = aNode._2
     val loc = Locations.get(node.id)
-    addMappings(s, ComputeCppFiles.FileNames.getTopology(name), Some(loc))
+    val topSymbol = s.a.parentSymbol.get
+    val name = s"${topSymbol.getUnqualifiedName}_${node.data.name}"
+    addMappings(s, ComputeCppFiles.FileNames.getTlmPacketSet(name), Some(loc))
   }
 
 }

compiler/lib/src/main/scala/codegen/CppWriter/ComputeCppFiles.scala

@@ -84,19 +84,22 @@ object ComputeCppFiles {
     /** Gets the C++ file name for generated enums */
     def getEnum(baseName: String) = s"${baseName}EnumAc"
 
+    /** Gets the C++ file name for generated ports */
+    def getPort(baseName: String) = s"${baseName}PortAc"
+
     /** Gets the C++ file name for state machines */
     def getStateMachine(baseName: String, kind: StateMachine.Kind) =
       kind match {
         case StateMachine.Kind.External => s"${baseName}"
         case StateMachine.Kind.Internal => s"${baseName}StateMachineAc"
       }
 
-    /** Gets the C++ file name for generated ports */
-    def getPort(baseName: String) = s"${baseName}PortAc"
-
     /** Gets the C++ file name for generated structs */
     def getStruct(baseName: String) = s"${baseName}SerializableAc"
 
+    /** Gets the C++ file name for a telemetry packet set */
+    def getTlmPacketSet(baseName: String) = s"${baseName}TlmPacketsAc"
+
     /** Gets the C++ file name for generated topologies */
     def getTopology(baseName: String): String = s"${baseName}TopologyAc"
 

compiler/lib/src/main/scala/codegen/CppWriter/CppWriterState.scala

@@ -1,7 +1,8 @@
 package fpp.compiler.codegen
 
-import fpp.compiler.analysis.*
-import fpp.compiler.util.*
+import fpp.compiler.analysis._
+import fpp.compiler.ast._
+import fpp.compiler.util._
 import fpp.compiler.codegen.CppWriterState.builtInTypes
 
 /** C++ Writer state */

compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala

@@ -104,7 +104,7 @@ trait CppWriterUtils extends LineUtils {
   def wrapInEnumClass(
     name: String,
     ll: List[Line],
-    tyOpt: Option[String]
+    tyOpt: Option[String] = None
   ): List[Line] = {
     val prefix = tyOpt match {
       case Some(ty) => s"enum class $name : $ty {"