Skip to content

Commit

Permalink
bump version number and remove diabling buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
BarbourSmith committed May 10, 2017
1 parent c0e3d3c commit 6139109
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion DataStructures/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Data(EventDispatcher):

#Gcodes contains all of the lines of gcode in the opened file
gcode = ObjectProperty([])
version = '0.70'
version = '0.71'
#all of the available COM ports
comPorts = []
#This defines which COM port is used
Expand Down
2 changes: 1 addition & 1 deletion DataStructures/logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def writeErrorValueToLog(self, error):
'''
if self.recordingPositionalErrors:
self.errorValues.append(error)
self.errorValues.append(abs(error))

#if we've gotten to the end of the file
if self.data.gcodeIndex == len(self.data.gcode) and self.recordingPositionalErrors:
Expand Down
14 changes: 7 additions & 7 deletions groundcontrol.kv
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
size_hint: None, None
width:dp(300)
height: dp(60*4)
disabled: not app.data.connectionStatus
#disabled: not app.data.connectionStatus
Button:
on_press: root.upLeft()
canvas.after:
Expand Down Expand Up @@ -130,7 +130,7 @@
size_hint: None, None
width: dp(300)
height: dp(60)
disabled: not app.data.connectionStatus
#disabled: not app.data.connectionStatus
Button:
text: 'RUN'
on_press: root.startRun()
Expand All @@ -146,7 +146,7 @@
size_hint: None, None
width: dp(300)
height: dp(30)
disabled: not app.data.connectionStatus
#disabled: not app.data.connectionStatus
Button:
text: "<<10"
on_press: root.moveGcodeIndex(-10)
Expand All @@ -165,7 +165,7 @@
size_hint: None, None
width: dp(300)
height: dp(70)
disabled: not app.data.connectionStatus
#disabled: not app.data.connectionStatus
GridLayout:
cols: 1
Label:
Expand Down Expand Up @@ -234,7 +234,7 @@
Button:
text: 'Return To Center'
on_release: root.returnToCenter()
disabled: not app.data.connectionStatus
#disabled: not app.data.connectionStatus
Button:
text: 'Zero Z'
disabled: True
Expand Down Expand Up @@ -277,7 +277,7 @@
text: "Diagnostic features"
GridLayout:
cols: 3
disabled: not app.data.connectionStatus
#disabled: not app.data.connectionStatus
Button:
text: 'Test Motors/Encoders'
on_press: root.testMotors()
Expand Down Expand Up @@ -309,7 +309,7 @@
text: "Manual Control"
GridLayout:
cols: 12
disabled: not app.data.connectionStatus
#disabled: not app.data.connectionStatus
Label:
text: "X:"
Button:
Expand Down

0 comments on commit 6139109

Please sign in to comment.