From f307d229e48b7745a4c4258b5b57d20bcc13fec4 Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Thu, 25 Jul 2024 18:08:57 +0530 Subject: [PATCH] v.1.4.2 to v.1.5.0 --- package.json | 2 +- pakage-lock.json | 2 +- src/py/bbctrl/Config.py | 2 +- src/py/bbctrl/State.py | 3 +-- src/resources/onefinity_defaults.json | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 60f34ab..fbcc99d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bbctrl", - "version": "1.4.2", + "version": "1.5.0", "homepage": "https://onefinitycnc.com/", "repository": "https://github.com/OneFinityCNC/onefinity", "license": "GPL-3.0+", diff --git a/pakage-lock.json b/pakage-lock.json index ec33c09..e8d9eb1 100644 --- a/pakage-lock.json +++ b/pakage-lock.json @@ -1,6 +1,6 @@ { "name": "bbctrl", - "version": "1.4.2", + "version": "1.5.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/src/py/bbctrl/Config.py b/src/py/bbctrl/Config.py index 1518ab9..bf0e246 100644 --- a/src/py/bbctrl/Config.py +++ b/src/py/bbctrl/Config.py @@ -43,7 +43,7 @@ class Config(object): self.values = {} try: - self.version = "1.4.2" + self.version = "1.5.0" # Load config template with open(get_resource('http/config-template.json'), 'r', diff --git a/src/py/bbctrl/State.py b/src/py/bbctrl/State.py index a463b03..865057c 100644 --- a/src/py/bbctrl/State.py +++ b/src/py/bbctrl/State.py @@ -230,7 +230,6 @@ class State(object): def set(self, name, value): name = self.resolve(name) - keys = ['offset_x', 'offset_y', 'offset_z'] if not name in self.vars or self.vars[name] != value: self.vars[name] = value @@ -240,7 +239,7 @@ class State(object): if self.timeout is None: self.timeout = self.ctrl.ioloop.call_later(0.25, self._notify) - if name in keys and 'cycle' in self.vars: + if name in ['offset_x', 'offset_y', 'offset_z'] and 'cycle' in self.vars: if self.vars['cycle'] == 'mdi': self.ctrl.config.set('axes', {name: value}) self.set('cycle', 'idle') diff --git a/src/resources/onefinity_defaults.json b/src/resources/onefinity_defaults.json index 9db7fd3..106305f 100644 --- a/src/resources/onefinity_defaults.json +++ b/src/resources/onefinity_defaults.json @@ -1,5 +1,5 @@ { - "version": "1.4.2", + "version": "1.5.0", "settings": { "junction-accel": 200000, "max-deviation": 0.05,