Merge branch 'lookuptable' of github.com:paulscherrerinstitute/ecmccfg

paulscherrerinstitute · Dec 11, 2024 · 063f23c · 063f23c
2 parents 307d080 + 455ac1f
commit 063f23c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/scripts/jinja2/ecmcYamlSchema.py b/scripts/jinja2/ecmcYamlSchema.py
@@ -281,8 +281,8 @@ def get_schema(self, keys):
                 'type': 'dict',
                 'schema': {
                     'filename': {'required': True, 'type': 'string'},
-                    'mask': {'type': 'string'},
-                    'enable': {'type': 'integer'},
+                    'range': {'type': 'float'},
+                    'enable': {'type': 'boolean'},
                 }
             },
             'unit': {'type': 'string'},

diff --git a/scripts/jinja2/templates/encoder.jinja2 b/scripts/jinja2/templates/encoder.jinja2
@@ -170,11 +170,11 @@ ecmcConfigOrDie "Cfg.SetAxisEncOffset(${ECMC_AXIS_NO},{{ encoder.absOffset }})"
 
 {%- if encoder.lookuptable is defined %}
     ecmcConfigOrDie "Cfg.LoadAxisEncLookupTable(${ECMC_AXIS_NO},{{ encoder.lookuptable.filename }})"
-    {%- if encoder.lookuptable.mask is defined %}
-        ecmcConfigOrDie "Cfg.SetAxisEncLookupTableRawPosMask(${ECMC_AXIS_NO},{{ encoder.lookuptable.mask }})"
+    {%- if encoder.lookuptable.range is defined %}
+        ecmcConfigOrDie "Cfg.SetAxisEncLookupTableRange(${ECMC_AXIS_NO},{{ encoder.lookuptable.range }})"
     {%- endif %}    
 
     {%- if encoder.lookuptable.enable is defined %}
-        ecmcConfigOrDie "Cfg.SetAxisEncLookupTableEnable(${ECMC_AXIS_NO},{{ encoder.lookuptable.enable }})"
+        ecmcConfigOrDie "Cfg.SetAxisEncLookupTableEnable(${ECMC_AXIS_NO},{{ encoder.lookuptable.enable|int }})"
     {%- endif %}    
 {%- endif %}