Added the deleted content from code generation

Author: Cantonplas

Core/Inc/Code_generation/Packet_generation/DataTemplate.hpp

@@ -1,37 +1,37 @@
 #pragma once
 #include "ST-LIB.hpp"
 
-/*Data packets for {{board}}
+/*Data packets for {{board}} 
 -AUTOGENERATED CODE, DO NOT MODIFY-*/
 class DataPackets{
 public:
     {% for enum in enums -%}
-    enum class {{enum.name}} : uint8_t
+    enum class {{enum.name}} : uint8_t 
     {
     {%- for value in enum["values"] %}
         {{value}} = {{loop.index0}},
     {%- endfor %}
     };
     {% endfor %}
-
+    
     {% for packet in packets -%}
     static void {{packet.name}}_init({% for variable in packet.variables %}{{variable.type}} &{{variable.name}}{% if not loop.last %}, {% endif %}{% endfor %})
     {
         {{packet.name}}_packet = new HeapPacket(static_cast<uint16_t>({{packet.id}}){% if packet.variables %}, {% for variable in packet.variables %}&{{variable.name}}{% if not loop.last %}, {% endif %}{% endfor %}{% endif %});
     }
-
+    
     {% endfor -%}
-
+    
 public:
     {%for packet in packets -%}
     inline static HeapPacket *{{packet.name}}_packet{nullptr};
     {% endfor %}
     {% for socket in DatagramSockets -%}
     inline static {{socket.type}} *{{socket.name}}{nullptr};
     {% endfor %}
-
+        
     static void start()
-    {
+    {   
         {% for packet in packets -%}
         if ({{packet.name}}_packet == nullptr) {
             ErrorHandler("Packet {{packet.name}} not initialized");
@@ -41,7 +41,7 @@ class DataPackets{
         {% for socket in DatagramSockets -%}
         {{socket.name}} = new DatagramSocket("{{socket.board_ip}}",{{socket.port}},"{{socket.remote_ip}}",{{socket.port}});
         {% endfor %}
-
+        
         {%- for group in sending_packets %}
         Scheduler::register_task({% if group.period_type == "ms" %}{{ (group.period*1000)|round|int }}{% else %}{{ group.period|round|int }}{% endif %}, +[](){
             {% for packet in group.packets -%}
@@ -52,5 +52,5 @@ class DataPackets{
     }
 
 
-
+   
 };

Core/Inc/Code_generation/Packet_generation/OrderTemplate.hpp

@@ -1,14 +1,14 @@
 #pragma once
 #include "ST-LIB.hpp"
 
-/*Order packets for {{board}}
+/*Order packets for {{board}} 
 -AUTOGENERATED CODE, DO NOT MODIFY- */
 
 
 class OrderPackets{
 public:
     {% for enum in enums -%}
-    enum class {{enum.name}} : uint8_t
+    enum class {{enum.name}} : uint8_t 
     {
     {%- for value in enum["values"] %}
         {{value}} = {{loop.index0}},
@@ -25,7 +25,7 @@ class OrderPackets{
     {% for packet in packets -%}
     inline static HeapOrder *{{packet.name}}_order{nullptr};
     {% endfor %}
-
+    
     {% for packet in packets -%}
     static void {{packet.name}}_init({% for variable in packet.variables %}{{variable.type}} &{{variable.name}}{% if not loop.last %}, {% endif %}{% endfor %})
     {
@@ -63,4 +63,4 @@ class OrderPackets{
         {{packet.name}}_flag = true;
     }
     {% endfor %}
-};
+};

Core/Inc/Code_generation/Packet_generation/Packet_descriptions.py

@@ -1,4 +1,4 @@
-import re
+import re 
 import json
 
 class BoardDescription:
@@ -13,7 +13,7 @@ def __init__(self,name:str,board:dict,JSONpath:str):
                 self.sockets=self.SocketsDescription(socks,self.ip)
         except Exception as e:
             raise Exception(f"Error in file {JSONpath}/boards/{name}/sockets.json: {e}")
-        #Packets:
+        #Packets: 
         self.sending_packets = []
         self.data_size =0
         self.order_size =0
@@ -40,15 +40,15 @@ def __init__(self,name:str,board:dict,JSONpath:str):
                 aux_sending= PacketDescription.check_for_sending(packet)
                 if aux_sending is not None:
                     self.sending_packets.append(aux_sending)
-
+                    
                 if self.packets[packets_name][i].type != "order":
                     self.data_size += 1
                 else:
                     self.order_size += 1
                 i += 1
-
+            
         self.sending_packets = self.fix_sendind_packets(self.sending_packets)
-
+        
     @staticmethod
     def fix_sendind_packets(sending_packets:list):
         fixed_packets = []
@@ -72,9 +72,9 @@ def fix_sendind_packets(sending_packets:list):
             fixed_packets.append(entry)
 
         return fixed_packets
-
-
-
+                
+                
+                
     class SocketsDescription:
         def __init__(self,sockets:list,board_ip:str):
             self.allSockets=[]
@@ -86,16 +86,16 @@ def __init__(self,sockets:list,board_ip:str):
                 name = sock["name"].replace(" ", "_").replace("-", "_")
                 sock_type = sock["type"]
                 self.allSockets.append({"name": name,"type":sock_type})
-
+                
                 if sock_type == "ServerSocket":
                     self.ServerSockets.append({"name": name,"type":sock_type,"board_ip":self.board_ip, "port": sock["port"]})
                 elif sock_type == "Socket":
                     self.Sockets.append({"name": name,"type":sock_type,"board_ip":self.board_ip, "local_port": sock["local_port"], "remote_ip": sock["remote_ip"], "remote_port": sock["remote_port"]})
                 elif sock_type == "DatagramSocket":
                     self.DatagramSockets.append({"name": name,"type":sock_type,"board_ip":self.board_ip, "port": sock["port"],"remote_ip":sock["remote_ip"]})
+            
 
-
-
+        
 class PacketDescription:
     def __init__(self, packet:dict,measurements:list, filename:str="Unknown"):
         self.id =packet["id"]
@@ -108,13 +108,13 @@ def __init__(self, packet:dict,measurements:list, filename:str="Unknown"):
         for variable in packet["variables"]:
             self.variables.append(variable)
             self.measurements.append(MeasurmentsDescription(measurements,variable, filename))
-
+            
     @staticmethod
     def check_for_sending(packet:dict):
         if "period" in packet and "period_type" in packet and "socket" in packet:
             name = packet["name"].replace(" ", "_").replace("-", "_")
             return {"name": name,"period": packet["period"],"period_type":packet["period_type"],"socket": packet["socket"]}
-
+        
         elif "period_ms" in packet and "socket" in packet:
             name = packet["name"].replace(" ", "_").replace("-", "_")
             return {"name": name,"period": packet["period_ms"],"period_type":"ms","socket": packet["socket"]}
@@ -126,11 +126,11 @@ def __init__(self,measurements:list, variable:str, filename:str="Unknown"):
         if not hasattr(self.__class__, 'viewed_measurements'):
             self.__class__.viewed_measurements = {}
         measurement = self._MeasurementSearch(measurements,variable)
-
+        
         if measurement is None:
             print(f"Measurement not found for variable: {variable} in file: {filename}\n")
             raise Exception(f"Measurement not found for variable: {variable} in file: {filename}")
-
+        
         self.name = measurement["name"]
         self.type = (self._unsigned_int_correction(measurement["type"]).replace(" ", "_").replace("-", "_"))
         if self.type == "enum":
@@ -145,8 +145,8 @@ def _Enum_values_correction(values:list):
         for i in range(len(values)):
             values[i] = values[i].replace(" ", "_").replace("-", "_")
         return values
-
-
+                
+                
     @staticmethod
     def _MeasurementSearch(measurements:list, variable:str):
         if variable in MeasurmentsDescription.viewed_measurements:
@@ -157,13 +157,15 @@ def _MeasurementSearch(measurements:list, variable:str):
                     MeasurmentsDescription.viewed_measurements[variable] = measurment
                     return measurment
         return None
-
-
+    
+    
     @staticmethod
     def _unsigned_int_correction(type:str):
         aux_type = type[:4]
         if aux_type == "uint":
             type += "_t"
         elif type == "float32":
             type = "float"
-        return type
+        elif type == "float64":
+            type = "double"
+        return type

Core/Inc/Code_generation/Packet_generation/Packet_generation.py

@@ -6,7 +6,7 @@
 
 templates_path = "Core/Inc/Code_generation/Packet_generation"
 
-def Generate_PacketDescription(JSONpath:str,board:str):
+def Generate_PacketDescription(JSONpath:str,board:str):    
     with open(JSONpath+"/boards.json") as f:
         boards = json.load(f)
     boards_name = []
@@ -20,9 +20,9 @@ def Generate_PacketDescription(JSONpath:str,board:str):
     else:
         print(f"Board {board} not found, exiting...")
         sys.exit()
-
+    
     return boards_name
-
+        
 
 #--------------DataPackets.hpp generation---------------#
 
@@ -36,8 +36,8 @@ def GenerateDataEnum(board:BoardDescription):
                         if hasattr(measurement, "enum")and measurement.enum not in Enums:
                             Enums.append(measurement.enum)
         return Enums
-
-
+    
+    
     def GenerateDataPackets(board:BoardDescription):
         Packets =[]
         totaldata = []
@@ -50,10 +50,10 @@ def GenerateDataPackets(board:BoardDescription):
                         tempdata +=(str(variable) +",")
                         tempdata_but_pointer +=("&"+str(variable) +",")
                     if tempdata.endswith(","):
-                        tempdata = tempdata[:-1]
+                        tempdata = tempdata[:-1]  
                     if tempdata_but_pointer.endswith(","):
                         tempdata_but_pointer = tempdata_but_pointer[:-1]
-
+                    
                     packet_variables = []
                     for measurement in packet_instance.measurements:
                         packet_variables.append({
@@ -67,11 +67,11 @@ def GenerateDataPackets(board:BoardDescription):
                         aux_data = {"type": measurement.type, "name": measurement.id.replace(" ", "_").replace("-", "_")}
                         if not any(x["name"] == aux_data["name"] for x in totaldata):
                             totaldata.append(aux_data)
-
+        
         return Packets,totaldata
-
+    
     packets,data = GenerateDataPackets(board)
-
+    
     def GenerateGroupedSendingPackets(board: BoardDescription):
         datagram_sockets = [s["name"] for s in board.sockets.DatagramSockets]
         grouped_lookup = {}
@@ -84,17 +84,17 @@ def GenerateGroupedSendingPackets(board: BoardDescription):
             period = packet["period"]
             period_type = packet["period_type"]
             names = packet["name"]
-
+            
             key = (period, period_type)
             if key not in grouped_lookup:
                 grouped_lookup[key] = []
-
+                
             if isinstance(names, list):
                 for name in names:
                     grouped_lookup[key].append({"socket": socket_name, "name": name})
             else:
                 grouped_lookup[key].append({"socket": socket_name, "name": names})
-
+        
         grouped_list = []
         for (period, period_type), items in grouped_lookup.items():
             grouped_list.append({
@@ -123,16 +123,16 @@ def Generate_DataPackets_hpp(board_input:str):
     if board_instance.data_size == 0:
         if os.path.exists(data_packets_path):
             os.remove(data_packets_path)
-        return
-
+        return    
+  
     env= jinja2.Environment(loader=jinja2.FileSystemLoader(templates_path))
     template = env.get_template("DataTemplate.hpp")
     context = Get_data_context(board_instance)
 
-
+    
     with open(data_packets_path,"w") as Output:
         Output.write(template.render(context))
-
+            
 #--------------OrderPackets.hpp generation---------------#
 
 def Get_order_context(board:BoardDescription):
@@ -145,8 +145,8 @@ def GenerateOrderEnum(board:BoardDescription):
                         if hasattr(measurement, "enum") and measurement.enum not in Enums:
                             Enums.append(measurement.enum)
         return Enums
-
-
+    
+    
     def GenerateOrderPackets(board:BoardDescription):
         Packets =[]
         totaldata = []
@@ -159,8 +159,8 @@ def GenerateOrderPackets(board:BoardDescription):
                         tempdata +=(str(variable) +",")
                         tempdata_but_pointer +=("&"+str(variable) +",")
                     if tempdata.endswith(","):
-                        tempdata = tempdata[:-1]
-                        tempdata_but_pointer = tempdata_but_pointer[:-1]
+                        tempdata = tempdata[:-1] 
+                        tempdata_but_pointer = tempdata_but_pointer[:-1] 
 
                     packet_variables = []
                     for measurement in packet_instance.measurements:
@@ -175,10 +175,10 @@ def GenerateOrderPackets(board:BoardDescription):
                         aux_data = {"type": measurement.type, "name": measurement.id}
                         if not any(x["name"] == aux_data["name"] for x in totaldata):
                             totaldata.append(aux_data)
-
+        
         return Packets,totaldata
-
-
+    
+    
     packets,data = GenerateOrderPackets(board)
     context = {
         "board": board.name,
@@ -197,12 +197,14 @@ def Generate_OrderPackets_hpp(board_input:str):
     if board_instance.order_size == 0:
         if os.path.exists(order_packets_path):
             os.remove(order_packets_path)
-        return
-
+        return    
+  
     env= jinja2.Environment(loader=jinja2.FileSystemLoader(templates_path))
     template = env.get_template("OrderTemplate.hpp")
     context = Get_order_context(board_instance)
 
-
+    
     with open(order_packets_path,"w") as Output:
         Output.write(template.render(context))
+
+