Align client/docs gen with recent changes

data/templates/xap/client/python/constants.py.j2

@@ -1,14 +1,17 @@
+{{ constants.GPL2_HEADER_SH_LIKE }}
+{{ constants.GENERATED_HEADER_SH_LIKE }}
 from enum import IntEnum
 
 
 # version: 0.0.1
 class RgblightModes(IntEnum):
-{%- for id, effect in constants.rgblight.effects | dictsort %}
+{%- for id, effect in specs.rgblight.effects | dictsort %}
     {{ effect.key }} = {{ id }}
 {%- endfor %}
 
 
+# version: 0.0.1
 class RgbMatrixModes(IntEnum):
-{%- for id, effect in constants.rgb_matrix.effects | dictsort %}
+{%- for id, effect in specs.rgb_matrix.effects | dictsort %}
     {{ effect.key }} = {{ id }}
 {%- endfor %}

data/templates/xap/client/python/routes.py.j2

@@ -1,4 +1,5 @@
-
+{{ constants.GPL2_HEADER_SH_LIKE }}
+{{ constants.GENERATED_HEADER_SH_LIKE }}
 class XAPRouteError(Exception):
     pass
 

data/templates/xap/client/python/types.py.j2

@@ -1,3 +1,5 @@
+{{ constants.GPL2_HEADER_SH_LIKE }}
+{{ constants.GENERATED_HEADER_SH_LIKE }}
 from collections import namedtuple
 from enum import IntFlag, IntEnum
 from struct import Struct

data/templates/xap/docs/docs.md.j2

@@ -1,3 +1,5 @@
+{{ constants.GPL2_HEADER_XML_LIKE }}
+{{ constants.GENERATED_HEADER_XML_LIKE }}
 {%- for item in xap.documentation.order -%}
 {%- if not item[0:1] == '!' -%}
 {{ xap.documentation.get(item) }}

data/templates/xap/docs/route_request.md.j2

@@ -1,8 +0,0 @@
-{%- if route.request_type == 'struct' -%}
-__Request:__
-{%- for member in route.request_struct_members -%}
-<br>{{ "&nbsp;"|safe*4 }}* {{ member.name }}: `{{ member.type }}`
-{%- endfor -%}
-{%- elif route.request_type -%}
-__Request:__ `{{ route.request_type }}`
-{%- endif -%}

data/templates/xap/docs/route_response.md.j2

@@ -1,8 +0,0 @@
-{%- if route.return_type == 'struct' -%}
-__Response:__
-{%- for member in route.return_struct_members -%}
-<br>{{ "&nbsp;"|safe*4 }}* {{ member.name }}: `{{ member.type }}`
-{%- endfor -%}
-{%- elif route.return_type -%}
-__Response:__ `{{ route.return_type }}`
-{%- endif -%}

data/templates/xap/docs/routes.md.j2

@@ -1,3 +1,22 @@
+{%- macro gen_payload(name, type, members) -%}
+{%- if type == 'struct' -%}
+__{{ name }}:__
+{%- for member in members -%}
+<br>{{ "&nbsp;"|safe*4 }}* {{ member.name }}: `{{ member.type }}`
+{%- endfor -%}
+{%- elif type -%}
+__{{ name }}:__ `{{ type }}`
+{%- endif -%}
+{%- endmacro -%}
+
+{%- macro gen_payloads(route) -%}
+{{ gen_payload('Request', route.request_type, route.request_struct_members) }}{%- if route.return_type and route.request_type -%}<br><br>{% endif %}{{ gen_payload('Response', route.return_type, route.return_struct_members) }}
+{%- endmacro -%}
+
+{%- macro gen_tags(route) -%}
+{% if 'secure' == route.permissions %}__Secure__{% endif %}
+{%- endmacro -%}
+
 {%- for id, route in xap.routes | dictsort %}
 ### {{ route.name }} - `{{ id }}`
 {{ route.description }}
@@ -7,9 +26,7 @@
 | -- | -- | -- | -- | -- |
 {%- for subid, subroute in route.routes | dictsort %}
 {%- if not subroute.routes %}
-{%- with route=subroute %}
-| {{ subroute.name }} | `{{ id }} {{ subid }}` | {% if 'secure' == subroute.permissions %}__Secure__{% endif %} | {%- include 'route_request.md.j2' -%}{%- if subroute.return_type and subroute.request_type -%}<br><br>{% endif %}{%- include 'route_response.md.j2' -%} | {{ subroute.description.replace('\n', '<br>') }}|
-{%- endwith %}
+| {{ subroute.name }} | `{{ id }} {{ subid }}` | {{ gen_tags(subroute) }} | {{ gen_payloads(subroute) }} | {{ subroute.description | newline_to_br }}|
 {%- endif %}
 {%- endfor %}
 
@@ -23,9 +40,7 @@
 | -- | -- | -- | -- | -- |
 {%- for subsubid, subsubroute in subroute.routes | dictsort %}
 {%- if not subsubroute.routes %}
-{%- with route=subsubroute %}
-| {{ subsubroute.name }} | `{{ id }} {{ subid }} {{ subsubid }}` | {% if 'secure' == subsubroute.permissions %}__Secure__{% endif %} | {%- include 'route_request.md.j2' -%}{%- if subsubroute.return_type and subsubroute.request_type -%}<br><br>{% endif %}{%- include 'route_response.md.j2' -%} | {{ subsubroute.description.replace('\n', '<br>') }}|
-{%- endwith %}
+| {{ subsubroute.name }} | `{{ id }} {{ subid }} {{ subsubid }}` | {{ gen_tags(subsubroute) }} | {{ gen_payloads(subsubroute) }} | {{ subsubroute.description | newline_to_br }}|
 {%- endif %}
 {%- endfor %}
 {%- endif %}

data/templates/xap/docs/versions.md.j2

@@ -0,0 +1,6 @@
+{{ constants.GPL2_HEADER_XML_LIKE }}
+{{ constants.GENERATED_HEADER_XML_LIKE }}
+
+{%- for ver in versions | reverse -%}
+* [XAP Version {{ ver }}](xap_{{ ver }}.md)
+{% endfor %}

data/templates/xap/firmware/xap_generated.h.j2

@@ -1,5 +1,5 @@
-{{ GPL2_HEADER_C_LIKE }}
-{{ GENERATED_HEADER_C_LIKE }}
+{{ constants.GPL2_HEADER_C_LIKE }}
+{{ constants.GENERATED_HEADER_C_LIKE }}
 #pragma once
 
 #include <stdint.h>

data/templates/xap/firmware/xap_generated.inl.j2

@@ -1,5 +1,5 @@
-{{ GPL2_HEADER_C_LIKE }}
-{{ GENERATED_HEADER_C_LIKE }}
+{{ constants.GPL2_HEADER_C_LIKE }}
+{{ constants.GENERATED_HEADER_C_LIKE }}
 
 ////////////////////////////////////////////////////////////////////////////////
 // Full XAP {{ xap.version }} definitions