Added new Panel stuff

[clinton/Smoothieware.git] / src / modules / robot / Robot.cpp

diff --git a/src/modules/robot/Robot.cpp b/src/modules/robot/Robot.cpp
index 06a643a..cf0beb9 100644 (file)
--- a/src/modules/robot/Robot.cpp
+++ b/src/modules/robot/Robot.cpp
@@ -116,7 +116,8 @@ void Robot::on_get_public_data(void* argument){
     if(!pdr->starts_with(robot_checksum)) return;
 
     if(pdr->second_element_is(speed_override_percent_checksum)) {
-        static double return_data= 100*60/seconds_per_minute;
+               static double return_data;
+               return_data= 100*this->seconds_per_minute/60;
         pdr->set_data_ptr(&return_data);
         pdr->set_taken();
         
@@ -138,7 +139,7 @@ void Robot::on_set_public_data(void* argument){
 
     if(pdr->second_element_is(speed_override_percent_checksum)) {
         double t= *static_cast<double*>(pdr->get_data_ptr());
-        seconds_per_minute= t * 0.6;
+        this->seconds_per_minute= t * 0.6;
         pdr->set_taken();
     }
 }
@@ -201,7 +202,7 @@ void Robot::on_gcode_received(void * argument){
                 gcode->add_nl = true;
                 gcode->mark_as_taken();
                 return;
-            case 114: gcode->stream->printf("C: X:%1.3f Y:%1.3f Z:%1.3f ",
+                       case 114: gcode->stream->printf("C: X:%1.3f Y:%1.3f Z:%1.3f ",
                                                  from_millimeters(this->current_position[0]),
                                                  from_millimeters(this->current_position[1]),
                                                  from_millimeters(this->current_position[2]));