From 6ed74e6a630e1ceeff02a8b7cd2b42e2e82f4028 Mon Sep 17 00:00:00 2001
From: Keegi <keegi@spamcop.net>
Date: Wed, 29 Jun 2011 23:13:43 +0300
Subject: [PATCH] Fixed missed change from self.feed{xyze} into
 self.settings.{xyze}_feedrate

---
 pronsole.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pronsole.py b/pronsole.py
index 2d38a5f..f4ba563 100644
--- a/pronsole.py
+++ b/pronsole.py
@@ -754,14 +754,12 @@ class pronsole(cmd.Cmd):
         if not self.p.online:
             print "Printer is not online. Unable to move."
             return
-        feed=self.feedz
-        axis="E"
         l=l.split()
         if(l[0].lower()=="x"):
-            feed=self.settings.x_feedrate
+            feed=self.settings.xy_feedrate
             axis="X"
         elif(l[0].lower()=="y"):
-            feed=self.settings.y_feedrate
+            feed=self.settings.xy_feedrate
             axis="Y"
         elif(l[0].lower()=="z"):
             feed=self.settings.z_feedrate
@@ -788,9 +786,9 @@ class pronsole(cmd.Cmd):
         
     def help_move(self):
         print "Move an axis. Specify the name of the axis and the amount. "
-        print "move X 10 will move the X axis forward by 10mm at ",self.feedxy,"mm/min (default XY speed)"
+        print "move X 10 will move the X axis forward by 10mm at ",self.settings.xy_feedrate,"mm/min (default XY speed)"
         print "move Y 10 5000 will move the Y axis forward by 10mm at 5000mm/min"
-        print "move Z -1 will move the Z axis down by 1mm at ",self.feedz,"mm/min (default Z speed)"
+        print "move Z -1 will move the Z axis down by 1mm at ",self.settings.z_feedrate,"mm/min (default Z speed)"
         print "Common amounts are in the tabcomplete list."
     
     def complete_move(self, text, line, begidx, endidx):
@@ -809,7 +807,7 @@ class pronsole(cmd.Cmd):
     
     def do_extrude(self,l,override=None,overridefeed=300):
         length=5#default extrusion length
-        feed=self.feede#default speed
+        feed=self.settings.e_feedrate#default speed
         if not self.p.online:
             print "Printer is not online. Unable to move."
             return
@@ -849,7 +847,7 @@ class pronsole(cmd.Cmd):
         
     def do_reverse(self, l):
         length=5#default extrusion length
-        feed=self.feede#default speed
+        feed=self.settings.e_feedrate#default speed
         if not self.p.online:
             print "Printer is not online. Unable to move."
             return