2 files changed, 16 insertions, 3 deletions

diff --git a/src/config/parameters/parameters.c b/src/config/parameters/parameters.c
index e3328ca..bff7642 100644
--- a/src/config/parameters/parameters.c
+++ b/src/config/parameters/parameters.c
@@ -103,6 +103,8 @@ int relabsd_parameters_parse_execution_mode
       return -1;
    }
 
+   relabsd_parameters_initialize_options(parameters);
+
    if
    (
       RELABSD_STRING_EQUALS("-?", argv[1])
@@ -169,8 +171,6 @@ int relabsd_parameters_parse_options
 
    RELABSD_S_DEBUG(RELABSD_DEBUG_PROGRAM_FLOW, "Parsing options...");
 
-   relabsd_parameters_initialize_options(parameters);
-
    /*
     * i = (parameters->read_argc + 1) because reading 2 params is actually
     * reaching the [2] element of the array, since the [0] element is the
@@ -283,7 +283,11 @@ int relabsd_parameters_parse_options
          }
 
          ++i;
-         parameters->configuration_file = argv[i];
+
+         if (relabsd_parameters_parse_config_file(argv[i], parameters) < 0)
+         {
+            return -1;
+         }
       }
       else
       {
diff --git a/src/config/parameters/parameters_accessors.c b/src/config/parameters/parameters_accessors.c
index 71c2482..f47ff63 100644
--- a/src/config/parameters/parameters_accessors.c
+++ b/src/config/parameters/parameters_accessors.c
@@ -5,6 +5,8 @@
 /**** RELABSD *****************************************************************/
 #include <relabsd/config/parameters.h>
 
+#include <relabsd/device/axis.h>
+
 /******************************************************************************/
 /**** LOCAL FUNCTIONS *********************************************************/
 /******************************************************************************/
@@ -17,11 +19,18 @@ void relabsd_parameters_initialize_options
    struct relabsd_parameters parameters [const restrict static 1]
 )
 {
+   int i;
+
    parameters->run_as_daemon = 0;
    parameters->communication_node_name = (const char *) NULL;
    parameters->device_name = (const char *) NULL;
    parameters->physical_device_file_name = (const char *) NULL;
    parameters->configuration_file = (const char *) NULL;
+
+   for (i = 0; i < RELABSD_AXIS_VALID_AXES_COUNT; ++i)
+   {
+      relabsd_axis_initialize(parameters->axes + i);
+   }
 }
 
 int relabsd_parameters_get_run_as_daemon