intelligent-agent · ajmirsky · Oct 13, 2017 · Oct 23, 2017 · Oct 26, 2017 · Oct 26, 2017
diff --git a/configs/Kossel_K25000.cfg b/configs/Kossel_K25000.cfg
@@ -1,6 +1,7 @@
 [System]
 
 machine_type = Kossel_K25000
+version = 2.0
 
 [Geometry]
 # Delta

diff --git a/configs/debrew.cfg b/configs/debrew.cfg
@@ -1,3 +1,7 @@
+[System]
+
+version = 2.0
+
 [Geometry]
 # Delta
 axis_config = 3

diff --git a/configs/kossel_mini.cfg b/configs/kossel_mini.cfg
@@ -1,6 +1,7 @@
 [System]
 
 machine_type = Kossel_mini
+version = 2.0
 
 [Geometry]
 # Delta

diff --git a/configs/makerbot_cupcake.cfg b/configs/makerbot_cupcake.cfg
@@ -1,6 +1,7 @@
 [System]
 
 machine_type = Makerbot_Cupcake
+version = 2.0
 
 [Geometry]
 # 0 - Cartesian

diff --git a/configs/maxcorexy.cfg b/configs/maxcorexy.cfg
@@ -1,5 +1,7 @@
 [System]
 
+version = 2.0
+
 [Geometry]
 # Core-XY
 axis_config = 2

diff --git a/configs/mendelmax.cfg b/configs/mendelmax.cfg
@@ -1,5 +1,7 @@
 [System]
 
+version = 2.0
+
 [Geometry]
 # Cartesian XY
 axis_config = 0 

diff --git a/configs/prusa_i3.cfg b/configs/prusa_i3.cfg
@@ -1,6 +1,7 @@
 [System]
 
 machine_type = Prusa_I3
+version = 2.0
 
 [Geometry]
 offset_x = -0.19

diff --git a/configs/prusa_i3_quad.cfg b/configs/prusa_i3_quad.cfg
@@ -1,6 +1,7 @@
 [System]
 
 machine_type = Prusa_I3
+version = 2.0
 
 [Geometry]
 offset_x = -0.19

diff --git a/configs/rostock_max_v2.cfg b/configs/rostock_max_v2.cfg
@@ -2,6 +2,7 @@
 [System]
 
 machine_type = Roskock_Max_v2
+version = 2.0
 
 [Geometry]
 # Delta

diff --git a/configs/series1.cfg b/configs/series1.cfg
@@ -8,6 +8,7 @@ loglevel =  10
 # Machine type is used by M115
 # to identify the machine connected.
 machine_type = Series 1 Pro
+version = 2.0
 
 
 [Geometry]

diff --git a/configs/testing_rev_A.cfg b/configs/testing_rev_A.cfg
@@ -3,6 +3,7 @@
 
 [System]
 loglevel = 10
+version = 2.0
 
 [Geometry]
 axis_config = 0

diff --git a/configs/testing_rev_B.cfg b/configs/testing_rev_B.cfg
@@ -3,6 +3,7 @@
 
 [System]
 loglevel = 10
+version = 2.0
 
 [Geometry]
 axis_config = 0

diff --git a/configs/thing.cfg b/configs/thing.cfg
@@ -1,5 +1,7 @@
 [System]
 
+version = 2.0
+
 [Geometry]
 # Thing has H-belt
 axis_config = 1

diff --git a/configs/thing_delta.cfg b/configs/thing_delta.cfg
@@ -1,6 +1,7 @@
 [System]
 
 machine_type = Thing delta
+version = 2.0
 
 [Geometry]
 # Delta

diff --git a/configs/ultimaker_original.cfg b/configs/ultimaker_original.cfg
@@ -1,3 +1,7 @@
+[System]
+
+version = 2.0
+
 [Geometry]
 travel_x = 0.2
 travel_y = -0.2

diff --git a/redeem/CascadingConfigParser.py b/redeem/CascadingConfigParser.py
diff --git a/redeem/Printer.py b/redeem/Printer.py
@@ -26,10 +26,11 @@
 from Delta import Delta
 from PruInterface import PruInterface
 from SDCardManager import SDCardManager
-import os
 import json
 from six import iteritems
 
+from configuration.RedeemConfig import RedeemConfig
+
 
 class Printer:
     AXES = "XYZEHABC"
@@ -108,6 +109,11 @@ def __init__(self):
 
         self.sd_card_manager = SDCardManager()
 
+        # default. should be initialized later
+        # TODO : these should be passed into from constructor
+        self.config = RedeemConfig()
+        self.replicape_key = None
+
     def add_slave(self, master, slave):
         ''' Make an axis copy the movement of another.
         the slave will get the same position as the axis'''

diff --git a/redeem/Redeem.py b/redeem/Redeem.py
@@ -52,7 +52,6 @@
 from Gcode import Gcode
 from ColdEnd import ColdEnd
 from PruFirmware import PruFirmware
-from CascadingConfigParser import CascadingConfigParser
 from Printer import Printer
 from GCodeProcessor import GCodeProcessor
 from PluginsController import PluginsController
@@ -69,6 +68,9 @@
 from _version import __version__, __release_name__
 
 # Global vars
+from redeem.configuration import get_config_factory
+from redeem.configuration.factories.ConfigFactoryV20 import ConfigFactoryV20
+
 printer = None
 
 # Default logging level is set to debug
@@ -101,29 +103,20 @@ def __init__(self, config_location="/etc/redeem"):
         Alarm.executor = AlarmExecutor()
         alarm = Alarm(Alarm.ALARM_TEST, "Alarm framework operational")
 
-        # check for config files
-        file_path = os.path.join(config_location,"default.cfg")
-        if not os.path.exists(file_path):
-            logging.error(file_path + " does not exist, this file is required for operation")
-            sys.exit() # maybe use something more graceful?
-
         local_path = os.path.join(config_location,"local.cfg")
         if not os.path.exists(local_path):
             logging.info(local_path + " does not exist, Creating one")
             os.mknod(local_path)
             os.chmod(local_path, 0o777)
 
         # Parse the config files.
-        printer.config = CascadingConfigParser(
-            [os.path.join(config_location,'default.cfg'),
-             os.path.join(config_location,'printer.cfg'),
-             os.path.join(config_location,'local.cfg')])
-
-        # Check the local and printer files
-        printer_path = os.path.join(config_location,"printer.cfg")
-        if os.path.exists(printer_path):
-            printer.config.check(printer_path)
-        printer.config.check(os.path.join(config_location,'local.cfg'))
+        config_files = [
+            os.path.join(config_location, 'printer.cfg'),
+            os.path.join(config_location, 'local.cfg')
+        ]
+
+        config_factory = get_config_factory(config_files)
+        printer.config = config_factory.hydrate_config(config_files=config_files)
 
         # Get the revision and loglevel from the Config file
         level = self.printer.config.getint('System', 'loglevel')