updated jinja2 with new json

Author: caiodasilva2005

cangen/code-gen/templates/decoders.c.j2

@@ -20,12 +20,11 @@ void receive_{{ macros.function_name(msg) }}(can_msg_t message, {{macros.functio
 	uint8_t bitstream_data[{{ macros.msg_size(msg) }}];
 	bitstream_init(&bitstream, bitstream_data, {{ macros.msg_size(msg) }});
     bitstream_add(&bitstream, data, {{ macros.msg_size(msg) }} * 8);
-    {% for field in msg.fields -%}
-    {% for value in field["values"] -%}
-    {% set point = msg.points[value - 1] %}
-    {{macros.function_name(msg) -}}->{{- macros.field_name(field, loop.index) }} = bitstream_remove(&bitstream, {{ point.size }});
-{%- endfor %}
-{%- endfor %}
+    {% for point in msg.points -%}
+    {% if point.name is defined -%}
+    {{macros.function_name(msg) -}}->{{ point.name }} = bitstream_remove(&bitstream, {{ point.size }});
+    {% endif %}
+    {%- endfor -%}
 }
 
 {% endfor %}

cangen/code-gen/templates/decoders.h.j2

@@ -2,10 +2,10 @@
 {{ macros.imports() -}}
 {% for msg in can_msgs %}
 typedef struct {
-{% for field in msg.fields -%}
-{% for value in field["values"] %}  {{ macros.field_type(msg.points, field) }} {{ macros.field_name(field, loop.index) }};
+{% for point in msg.points -%}
+{% if point.name is defined %} {{ point.c_type }} {{ point.name }};
+{% endif -%}
 {% endfor -%}
-{%- endfor -%}
 } {{ macros.function_name(msg) -}}_t;
 
 void receive_{{ macros.function_name(msg) }}(can_msg_t message, {{macros.function_name(msg) }}_t *{{macros.function_name(msg) }});

cangen/code-gen/templates/encoders.c.j2

@@ -16,11 +16,11 @@
 {% for msg in can_msgs -%}
 void send_{{ macros.function_name(msg) }}
 (
-    {% for field in msg.fields -%}
-    {% for value in field["values"] -%}
-    {{ macros.field_type(msg.points, field) }} {{ macros.field_name(field, loop.index) }},
-    {% endfor -%}
-    {% endfor -%}
+    {% for point in msg.points -%}
+    {%- if point.name is defined -%}
+    {{ point.c_type }} {{ point.name }},
+    {% endif %}
+    {%- endfor -%}
     can_t *can
 )
 {
@@ -29,14 +29,10 @@ void send_{{ macros.function_name(msg) }}
 	uint8_t bitstream_data[{{ macros.msg_size(msg) }}];
 	bitstream_init(&{{ macros.function_name(msg) }}_msg, bitstream_data, {{ macros.msg_size(msg) }});
 
-	{% for field in msg.fields -%}
-    {% for value in field["values"] -%}
-        {% set point = msg.points[value - 1] -%}
-        {% if point.parse is not defined or point.parse == true -%}
-        bitstream_add(&{{ macros.function_name(msg) -}}_msg, {{ macros.field_name(field, loop.index) -}}, {{ point.size -}});
-    {% set field_idx.value = field_idx.value + 1 -%}
+	{% for point in msg.points -%}
+    {% if point.name is defined -%}
+        bitstream_add(&{{ macros.function_name(msg) -}}_msg, {{ point.name -}}, {{ point.size -}});
     {% endif -%}
-    {% endfor -%}
     {%- endfor %}
     can_msg_t msg;
     msg.id = {{ msg.id }};