ini: Implement a new ini-file parser and adapt the code to use it.

configs/sim/axis/gladevcp/meter_scale.py

@@ -18,7 +18,7 @@ def __init__(self, halcomp,builder,useropts):
         self.max_value.connect('value-changed', self._on_max_value_change)
 
         inifile = linuxcnc.ini(os.getenv("INI_FILE_NAME"))
-        mmax = float(inifile.find("METER", "MAX") or 100.0)
+        mmax = inifile.getreal("METER", "MAX", fallback=100.0)
         self.meter = self.builder.get_object('meter')
         self.max_value.set(mmax)
 

configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/python/remap.py

@@ -39,20 +39,17 @@
 
 # set up parsing of the inifile
 import os
-import configparser
+import linuxcnc
 # get the path for the ini file used to start this config
 inifile = os.environ.get("INI_FILE_NAME")
-# instantiate a parser in non-strict mode because we have multiple entries for
-# some sections in the ini
-config = configparser.ConfigParser(strict=False)
-# ingest the ini file
-config.read(inifile)
+# instantiate the LinuxCNC ini-parser
+config = linuxcnc.ini(inifile)
 
 ## SPINDLE ROTARY JOINT LETTERS
 # spindle primary joint
-joint_letter_primary = (config['TWP']['PRIMARY']).capitalize()
+joint_letter_primary = config.getstring('TWP', 'PRIMARY', fallback="").capitalize()
 # spindle secondary joint (ie the one closer to the tool)
-joint_letter_secondary = (config['TWP']['SECONDARY']).capitalize()
+joint_letter_secondary = config.getstring('TWP', 'SECONDARY', fallback="").capitalize()
 
 if not joint_letter_primary in ('A','B','C') or not joint_letter_secondary in ('A','B','C'):
     log.error("Unable to parse joint letters given in INI [TWP].")
@@ -61,18 +58,18 @@
 else:
     # get the MIN/MAX limits of the respective rotary joint letters
     category = 'AXIS_' +  joint_letter_primary
-    primary_min_limit = float(config[category]['MIN_LIMIT'])
-    primary_max_limit = float(config[category]['MAX_LIMIT'])
+    primary_min_limit = config.getreal(category, 'MIN_LIMIT', fallback=0.0)
+    primary_max_limit = config.getreal(category, 'MAX_LIMIT', fallback=0.0)
     log.info('Joint letter for primary   is %s with MIN/MAX limits: %s,%s', joint_letter_primary, primary_min_limit, primary_max_limit)
     category = 'AXIS_' +  joint_letter_secondary
-    secondary_min_limit = float(config[category]['MIN_LIMIT'])
-    secondary_max_limit = float(config[category]['MAX_LIMIT'])
+    secondary_min_limit = config.getreal(category, 'MIN_LIMIT', fallback=0.0)
+    secondary_max_limit = config.gerreal(category, 'MAX_LIMIT', fallback=0.0)
     log.info('Joint letter for secondary is %s with MIN/MAX Limits: %s,%s', joint_letter_secondary, secondary_min_limit, secondary_max_limit)
 
 
 ## CONNECTIONS TO THE KINEMATIC COMPONENT
-# get the name of the kinematic component (this seems to ingest also the next line)
-kins_comp = (config['KINS']['KINEMATICS']).partition('\n')[0]
+# get the name of the kinematic component
+kins_comp = config.getstring('KINS', 'KINEMATICS', fallback="")
 # name of the hal pin that represents the nutation-angle
 kins_nutation_angle = kins_comp + '_kins.nut-angle'
 # name of the hal pin that represents the pre-rotation

debian/linuxcnc.install.in

@@ -34,6 +34,7 @@ usr/bin/hexagui
 usr/bin/hy_gt_vfd
 usr/bin/hy_vfd
 usr/bin/image-to-gcode
+usr/bin/inivalue
 usr/bin/inivar
 usr/bin/latency-histogram
 usr/bin/latency-plot

debian/linuxcnc.lintian-overrides.in

@@ -9,7 +9,7 @@ linuxcnc-uspace: elevated-privileges 4755 root/root [usr/bin/linuxcnc_module_hel
 linuxcnc-uspace: elevated-privileges 4755 root/root [usr/bin/rtapi_app]
 
 # that is intentional - for now
-linuxcnc-uspace: package-name-doesnt-match-sonames liblinuxcnchal0 liblinuxcncini0 libnml0 libposemath0 libpyplugin0 librs274-0 libtooldata0
+linuxcnc-uspace: package-name-doesnt-match-sonames liblinuxcnchal0 liblinuxcncini1 libnml0 libposemath0 libpyplugin0 librs274-0 libtooldata0
 
 # These are dlopened by rtapi_app, which is already linked against libc.
 linuxcnc-uspace: library-not-linked-against-libc [usr/lib/linuxcnc/modules/*.so]

debian/linuxcnc.manpages.in

@@ -30,6 +30,7 @@ usr/share/man/man1/hexagui.1
 usr/share/man/man1/hy_gt_vfd.1
 usr/share/man/man1/hy_vfd.1
 usr/share/man/man1/image-to-gcode.1
+usr/share/man/man1/inivalue.1
 usr/share/man/man1/inivar.1
 usr/share/man/man1/io.1
 usr/share/man/man1/iocontrol.1

docs/man/.gitignore

@@ -39,6 +39,7 @@ man1/hexagui.1
 man1/hy_gt_vfd.1
 man1/hy_vfd.1
 man1/image-to-gcode.1
+man1/inivalue.1
 man1/inivar.1
 man1/io.1
 man1/iov2.1

docs/po4a.cfg

@@ -177,6 +177,7 @@
 [type: AsciiDoc_def] src/man/man1/hy_gt_vfd.1.adoc $lang:src/$lang/man/man1/hy_gt_vfd.1.adoc
 [type: AsciiDoc_def] src/man/man1/hy_vfd.1.adoc $lang:src/$lang/man/man1/hy_vfd.1.adoc
 [type: AsciiDoc_def] src/man/man1/image-to-gcode.1.adoc $lang:src/$lang/man/man1/image-to-gcode.1.adoc
+[type: AsciiDoc_def] src/man/man1/inivalue.1.adoc $lang:src/$lang/man/man1/inivalue.1.adoc
 [type: AsciiDoc_def] src/man/man1/inivar.1.adoc $lang:src/$lang/man/man1/inivar.1.adoc
 [type: AsciiDoc_def] src/man/man1/io.1.adoc $lang:src/$lang/man/man1/io.1.adoc
 [type: AsciiDoc_def] src/man/man1/latency-histogram.1.adoc $lang:src/$lang/man/man1/latency-histogram.1.adoc