Fix/code gen improvement 2.0.1.0 (#69)

* Added improved error handeling for python autogenerator script

* Eliminated state machine generation and protection

* La blcu funciona va chavales, ahora si que si apuntito de caramelo V2

* La blcu funciona va chavales, ahora si que si apuntito de caramelo V2

---------

Co-authored-by: Jorge Sáez <jorgeesg82@gmail.com>

Author: Cantonplas

Core/Inc/Code_generation/Packet_generation/DataTemplate.hpp

@@ -26,7 +26,7 @@ class DataPackets{
     {%for packet in packets -%}
     inline static HeapPacket *{{packet.name}}_packet{nullptr};
     {% endfor %}
-    {% for socket in sockets -%}
+    {% for socket in DatagramSockets -%}
     inline static {{socket.type}} *{{socket.name}}{nullptr};
     {% endfor %}
 
@@ -38,26 +38,17 @@ class DataPackets{
         }
         {% endfor %}
 
-        {% for socket in ServerSockets -%}
-        {{socket.name}} = new ServerSocket("{{socket.board_ip}}",{{socket.port}});
-        {%- endfor %}
         {% for socket in DatagramSockets -%}
         {{socket.name}} = new DatagramSocket("{{socket.board_ip}}",{{socket.port}},"{{socket.remote_ip}}",{{socket.port}});
         {% endfor %}
-        {% for socket in Sockets -%}
-        {{socket.name}} = new Socket("{{socket.board_ip}}",{{socket.local_port}},"{{socket.remote_ip}}",{{socket.remote_port}});
-        {% endfor %}
 
-        {%- for packet in sending_packets %}
-        Scheduler::register_task({% if packet.period_type == "ms" %}{{ (packet.period*1000)|round|int }}{% else %}{{ packet.period|round|int }}{% endif %}, +[](){
-            {% if packet.name is string -%}
+        {%- 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 -%}
             DataPackets::{{packet.socket}}->send_packet(*DataPackets::{{packet.name}}_packet);
-            {% else %}
-            {% for name in packet.name -%}
-            DataPackets::{{packet.socket}}->send_packet(*DataPackets::{{name}}_packet);
             {% endfor -%}
-            {%- endif %}
-        }); {%- endfor %}
+        });
+        {%- endfor %}
     }
 
 

Core/Inc/Code_generation/Packet_generation/OrderTemplate.hpp

@@ -33,6 +33,29 @@ class OrderPackets{
     }
     {% endfor %}
 
+    {% for socket in Sockets -%}
+    inline static {{socket.type}} *{{socket.name}}{nullptr};
+    {% endfor %}
+    {% for socket in ServerSockets -%}
+    inline static {{socket.type}} *{{socket.name}}{nullptr};
+    {% endfor %}
+
+    static void start()
+    {
+        {% for packet in packets -%}
+        if ({{packet.name}}_order == nullptr) {
+            ErrorHandler("Order {{packet.name}} not initialized");
+        }
+        {% endfor %}
+
+        {% for socket in ServerSockets -%}
+        {{socket.name}} = new ServerSocket("{{socket.board_ip}}",{{socket.port}});
+        {%- endfor %}
+        {% for socket in Sockets -%}
+        {{socket.name}} = new Socket("{{socket.board_ip}}",{{socket.local_port}},"{{socket.remote_ip}}",{{socket.remote_port}});
+        {% endfor %}
+    }
+
 private:
     {% for packet in packets -%}
     static void {{packet.name}}_cb()

Core/Inc/Code_generation/Packet_generation/Packet_generation.py

@@ -71,17 +71,49 @@ def GenerateDataPackets(board:BoardDescription):
         return Packets,totaldata
 
     packets,data = GenerateDataPackets(board)
+    
+    def GenerateGroupedSendingPackets(board: BoardDescription):
+        datagram_sockets = [s["name"] for s in board.sockets.DatagramSockets]
+        grouped_lookup = {}
+
+        for packet in board.sending_packets:
+            socket_name = packet["socket"]
+            if socket_name not in datagram_sockets:
+                continue
+
+            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({
+                "period": period,
+                "period_type": period_type,
+                "packets": items
+            })
+        return grouped_list
+
     context = {
         "board": board.name,
         "enums": GenerateDataEnum(board),
         "packets" : packets,
         "data": data,
         "size": board.order_size,
-        "sockets":board.sockets.allSockets,
-        "ServerSockets":board.sockets.ServerSockets,
         "Sockets":board.sockets.Sockets,
         "DatagramSockets":board.sockets.DatagramSockets,
-        "sending_packets": board.sending_packets,
+        "DatagramSocketNames": [s["name"] for s in board.sockets.DatagramSockets],
+        "sending_packets": GenerateGroupedSendingPackets(board),
     }
     return context
 
@@ -154,6 +186,8 @@ def GenerateOrderPackets(board:BoardDescription):
         "packets" : packets,
         "data": data,
         "size": board.order_size,
+        "ServerSockets":board.sockets.ServerSockets,
+        "Sockets":board.sockets.Sockets,
     }
     return context