Formating stuff

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,10 +13,10 @@ 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
+        self.data_size = 0
+        self.order_size = 0
         self.measurement_lists = []
         self.packets = {}
         for measurement in board["measurements"]:
@@ -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 = []
@@ -60,42 +60,42 @@ def fix_sendind_packets(sending_packets:list):
             period_type = item.get("period_type")
             socket = item.get("socket")
             name = item.get("name")
-            key = (period,period_type, socket)
+            key = (period, period_type, socket)
             lookup.setdefault(key, []).append(name)
 
-        for (period,period_type, socket), names in lookup.items():
-            entry = {"period": period,"period_type":period_type, "socket": socket}
+        for (period, period_type, socket), names in lookup.items():
+            entry = {"period": period, "period_type": period_type, "socket": socket}
             if len(names) == 1:
                 entry["name"] = names[0]
             else:
                 entry["name"] = names
             fixed_packets.append(entry)
 
         return fixed_packets
-                
-                
-                
+
+
+
     class SocketsDescription:
-        def __init__(self,sockets:list,board_ip:str):
-            self.allSockets=[]
+        def __init__(self, sockets: list, board_ip: str):
+            self.allSockets = []
             self.ServerSockets = []
             self.Sockets = []
             self.DatagramSockets = []
             self.board_ip = board_ip
             for sock in sockets:
                 name = sock["name"].replace(" ", "_").replace("-", "_")
                 sock_type = sock["type"]
-                self.allSockets.append({"name": name,"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"]})
+                    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"]})
+                    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"]})
-            
+                    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,8 +157,8 @@ 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]
@@ -168,4 +168,4 @@ def _unsigned_int_correction(type:str):
             type = "float"
         elif type == "float64":
             type = "double"
-        return type
+        return type