From f7ed7bba09eb5b34ce99e75da96bb94b7d8ac4f4 Mon Sep 17 00:00:00 2001
From: sanjayk03-dev <imsanjay003@gmail.com>
Date: Mon, 8 Jul 2024 23:12:22 +0530
Subject: [PATCH] logging

---
 src/py/bbctrl/Config.py | 8 ++++----
 src/py/bbctrl/Mach.py   | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/py/bbctrl/Config.py b/src/py/bbctrl/Config.py
index e9a7c96..e528a39 100644
--- a/src/py/bbctrl/Config.py
+++ b/src/py/bbctrl/Config.py
@@ -80,7 +80,6 @@ class Config(object):
         return self.values.get(name, default)
     
     def set(self, name, default = None):
-        config = self.ctrl.config
         path = self.ctrl.get_path('config.json')
 
         try:
@@ -91,7 +90,8 @@ class Config(object):
             if name in config_data:
                 existing_value = config_data[name]
                 if isinstance(existing_value, dict) and isinstance(default, dict):
-                    config_data[name] = {**existing_value, **default}
+                    # config_data[name] = {**existing_value, **default}
+                    existing_value.update(default)
                 elif isinstance(existing_value, list) and isinstance(default, list):
                     config_data[name].extend(default)
                 elif isinstance(existing_value, list):
@@ -101,8 +101,8 @@ class Config(object):
             else:
                 config_data[name] = default
             
-            config.save(config_data)
-            self.log.info('name:{} default:{}'.format(name, default))
+            self.save(config_data)
+            self.log.info('105: name:{} default:{}'.format(name, default))
         except Exception: self.log.exception('Internal error: Failed to upgrade config')
 
     def save(self, config):
diff --git a/src/py/bbctrl/Mach.py b/src/py/bbctrl/Mach.py
index 5dc232f..e9542d2 100644
--- a/src/py/bbctrl/Mach.py
+++ b/src/py/bbctrl/Mach.py
@@ -371,12 +371,14 @@ class Mach(Comm):
 
             # Set the absolute position both locally and via the AVR
             target = position + state.get('offset_' + axis)
-            self.mlog.info('target ' + str(target))
-            self.mlog.info('state.get ' + str(state.get('offset_' + axis)))
+            self.mlog.info('target %s' % str(target))
+            self.mlog.info('state.get %s axis' % str(state.get('offset_' + axis)))
             state.set(axis + 'p', target)
             axes = config.values.setdefault('axes',{})
             axes[axis + 'p'] = target
+            self.mlog.info('Saving %s axis' % axis)
             config.set('axes', axes)
+            self.mlog
             super().queue_command(Cmd.set_axis(axis, target))