Merge branch 'FW-301/Execute_Code_gen_on_cmake' of https://github.com/Hyperloop-UPV/template-project

Author: Cantonplas

Core/Inc/Code_generation/Packet_generation/DataTemplate.hpp

@@ -19,41 +19,7 @@ class DataPackets{
         {{packet.name}} = 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 -%}
-
-private:
-
-    {% set sending_count = sending_packets|length %}
-    {% if sending_count <= 32 %}
-    using FlagsType = uint32_t;
-    #define CTZ_FUNC __builtin_ctz
-    {% elif sending_count <= 64 %}
-    using FlagsType = uint64_t;
-    #define CTZ_FUNC __builtin_ctzll
-    {% else %}
-    #error "Too many sending tasks (>64)"
-    {% endif %}
-
-    inline static volatile FlagsType send_flags{0};
-
-    {% for packet in sending_packets %}
-    static void send_task_{{loop.index0}}() {
-        {% if packet.name is string -%}
-        DataPackets::{{packet.socket}}->send_packet(*DataPackets::{{packet.name}});
-        {% else %}
-        {% for name in packet.name -%}
-        DataPackets::{{packet.socket}}->send_packet(*DataPackets::{{name}});
-        {% endfor -%}
-        {%- endif %}
-    }
-    {% endfor %}
-
-    using SendAction = void(*)();
-    static inline SendAction send_actions[] = {
-        {% for packet in sending_packets %}
-        send_task_{{loop.index0}},
-        {% endfor %}
-    };
-
+    
 public:
     {%for packet in packets -%}
     inline static HeapPacket *{{packet.name}}{nullptr};
@@ -82,20 +48,20 @@ class DataPackets{
 
         {%- for packet in sending_packets %}
         Scheduler::register_task({% if packet.period_type == "ms" %}{{ (packet.period*1000)|round|int }}{% else %}{{ packet.period|round|int }}{% endif %}, +[](){
-            DataPackets::send_flags |= (static_cast<FlagsType>(1) << {{loop.index0}});
+            {% if packet.name is string -%}
+            if(DataPackets::{{packet.name}}){
+                DataPackets::{{packet.socket}}->send_packet(*DataPackets::{{packet.name}});
+            }
+            {% else %}
+            {% for name in packet.name -%}
+            if(DataPackets::{{name}}){
+                DataPackets::{{packet.socket}}->send_packet(*DataPackets::{{name}});
+            }
+            {% endfor -%}
+            {%- endif %}
         }); {%- endfor %}
     }
 
-    static void update()
-    {
-        while(DataPackets::send_flags) {
-            uint8_t index = CTZ_FUNC(DataPackets::send_flags);
-            DataPackets::send_flags &= ~(static_cast<FlagsType>(1) << index);
-            if (index < {{sending_count}}) {
-                DataPackets::send_actions[index]();
-            }
-        }
-    }
 
 
 };

Core/Inc/Communications/Packets/.gitignore

@@ -0,0 +1 @@
+

Core/Inc/Communications/Packets/.gitkeep

@@ -87,7 +87,3 @@ void Comms::start()
 
 }
 
-void Comms::update()
-{
-    DataPackets::update();
-}

Core/Src/PCU/Comms/Comms.cpp

@@ -89,6 +89,7 @@ void PCU::update()
         CurrentSensors::zeroing();
     }
 
+    //Control updates:
     if(flag_update_speed_control)
     {
         flag_update_speed_control=false;

Core/Src/PCU/PCU.cpp

@@ -5,11 +5,11 @@
 extern "C"{
     const char DESCRIPTION[255]  __attribute__((section(".metadata_pool")))= 
         "****************"  // placeholder for beggining
-        "20260204T183122"   // DateTime using ISO-8601 format
+        "20260204T195355"   // DateTime using ISO-8601 format
         " "                 // alignment
         "98e5b96e"          // STLIB commit
         "--------"          // ADJ commit
-        "21bf8d5e"          // Board commit
+        "79732e36"          // Board commit
         // the '=' is used for unparsing
         ;
 }