v.1.4.2 to v.1.5.0
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "bbctrl",
|
"name": "bbctrl",
|
||||||
"version": "1.4.2",
|
"version": "1.5.0",
|
||||||
"homepage": "https://onefinitycnc.com/",
|
"homepage": "https://onefinitycnc.com/",
|
||||||
"repository": "https://github.com/OneFinityCNC/onefinity",
|
"repository": "https://github.com/OneFinityCNC/onefinity",
|
||||||
"license": "GPL-3.0+",
|
"license": "GPL-3.0+",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "bbctrl",
|
"name": "bbctrl",
|
||||||
"version": "1.4.2",
|
"version": "1.5.0",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ class Config(object):
|
|||||||
self.values = {}
|
self.values = {}
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.version = "1.4.2"
|
self.version = "1.5.0"
|
||||||
|
|
||||||
# Load config template
|
# Load config template
|
||||||
with open(get_resource('http/config-template.json'), 'r',
|
with open(get_resource('http/config-template.json'), 'r',
|
||||||
|
|||||||
@@ -230,7 +230,6 @@ class State(object):
|
|||||||
|
|
||||||
def set(self, name, value):
|
def set(self, name, value):
|
||||||
name = self.resolve(name)
|
name = self.resolve(name)
|
||||||
keys = ['offset_x', 'offset_y', 'offset_z']
|
|
||||||
|
|
||||||
if not name in self.vars or self.vars[name] != value:
|
if not name in self.vars or self.vars[name] != value:
|
||||||
self.vars[name] = value
|
self.vars[name] = value
|
||||||
@@ -240,7 +239,7 @@ class State(object):
|
|||||||
if self.timeout is None:
|
if self.timeout is None:
|
||||||
self.timeout = self.ctrl.ioloop.call_later(0.25, self._notify)
|
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':
|
if self.vars['cycle'] == 'mdi':
|
||||||
self.ctrl.config.set('axes', {name: value})
|
self.ctrl.config.set('axes', {name: value})
|
||||||
self.set('cycle', 'idle')
|
self.set('cycle', 'idle')
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"version": "1.4.2",
|
"version": "1.5.0",
|
||||||
"settings": {
|
"settings": {
|
||||||
"junction-accel": 200000,
|
"junction-accel": 200000,
|
||||||
"max-deviation": 0.05,
|
"max-deviation": 0.05,
|
||||||
|
|||||||
Reference in New Issue
Block a user