checkpoint
This commit is contained in:
@@ -1,35 +1,6 @@
|
||||
################################################################################
|
||||
# #
|
||||
# This file is part of the Buildbotics firmware. #
|
||||
# #
|
||||
# Copyright (c) 2015 - 2018, Buildbotics LLC #
|
||||
# All rights reserved. #
|
||||
# #
|
||||
# This file ("the software") is free software: you can redistribute it #
|
||||
# and/or modify it under the terms of the GNU General Public License, #
|
||||
# version 2 as published by the Free Software Foundation. You should #
|
||||
# have received a copy of the GNU General Public License, version 2 #
|
||||
# along with the software. If not, see <http://www.gnu.org/licenses/>. #
|
||||
# #
|
||||
# The software is distributed in the hope that it will be useful, but #
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of #
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
|
||||
# Lesser General Public License for more details. #
|
||||
# #
|
||||
# You should have received a copy of the GNU Lesser General Public #
|
||||
# License along with the software. If not, see #
|
||||
# <http://www.gnu.org/licenses/>. #
|
||||
# #
|
||||
# For information regarding this software email: #
|
||||
# "Joseph Coffland" <joseph@buildbotics.com> #
|
||||
# #
|
||||
################################################################################
|
||||
|
||||
import os
|
||||
import time
|
||||
import bbctrl
|
||||
|
||||
|
||||
class Ctrl(object):
|
||||
def __init__(self, args, ioloop, id):
|
||||
self.args = args
|
||||
|
||||
@@ -82,9 +82,6 @@ class State(object):
|
||||
self.set_callback(str(i) + 'latch_velocity',
|
||||
lambda name, i = i: self.motor_latch_velocity(i))
|
||||
|
||||
#self.set_callback('metric', lambda name: 1 if self.is_metric() else 0)
|
||||
#self.set_callback('imperial', lambda name: 0 if self.is_metric() else 1)
|
||||
|
||||
self.reset()
|
||||
self.load_files()
|
||||
|
||||
@@ -99,11 +96,6 @@ class State(object):
|
||||
self.log.info('INIT Metric %d' % metric)
|
||||
if not 'metric' in self.vars: self.set('metric', metric)
|
||||
if not 'imperial' in self.vars: self.set('imperial', not metric)
|
||||
|
||||
# Bit diameter for probing
|
||||
diameter = self.ctrl.config.get('probe-diameter', 6.35)
|
||||
self.log.info('INIT Diameter %f' % diameter)
|
||||
self.set('bitDiameter',diameter)
|
||||
|
||||
|
||||
def reset(self):
|
||||
|
||||
Reference in New Issue
Block a user