change STmin type to float, according to specification.

Sauci · Jul 24, 2019 · 109ba85 · 109ba85
1 parent 3a60956
commit 109ba85
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/config/can_tp.json b/config/can_tp.json
@@ -10,7 +10,7 @@
             {
               "block_size": 2,
               "wait_for_transmission_maximum": 1,
-              "minimum_separation_time": 2,
+              "minimum_separation_time": 0.01,
               "N_Ar_timeout": 1.0,
               "N_Br_timeout": 0.9,
               "N_Cr_timeout": 1.0,

diff --git a/config/can_tp.schema.json b/config/can_tp.schema.json
@@ -264,8 +264,9 @@
       "minimum": 0
     },
     "minimum_separation_time": {
-      "type": "integer",
-      "minimum": 0
+      "type": "number",
+      "minimum": 0.0,
+      "maximum": 0.127
     },
     "wait_for_transmission_maximum": {
       "type": "integer",

diff --git a/script/config.c.jinja2 b/script/config.c.jinja2
@@ -147,7 +147,7 @@ static const CanTp_RxNSduType CanTp_RxNSduConfig{{'%02X' % configuration_loop.in
         (uint32)((ieee_float){{'%f' % receiver.N_Br_timeout}} * (ieee_float)1000000),
         (uint32)((ieee_float){{'%f' % receiver.N_Cr_timeout}} * (ieee_float)1000000),
         {{'0x%04Xu' % receiver.wait_for_transmission_maximum}},
-        {{'0x%04Xu' % receiver.minimum_separation_time}},
+        (uint16)((ieee_float){{'%f' % receiver.minimum_separation_time}} * (ieee_float)1000000),
         {{receiver.addressing_format}},
         {% if receiver.enable_padding %}CANTP_ON{% else %}CANTP_OFF{% endif %},
         {{receiver.communication_type}},