Diff: classes.h

Revision:

41:a1ab19cc1387

Parent:

40:e70f811c69dc

Child:

42:48096cfdea78

--- a/classes.h	Sat Jun 09 18:41:32 2018 +0000
+++ b/classes.h	Sun Jun 10 06:18:14 2018 +0000
@@ -16,33 +16,10 @@
     public:
         int debug;
     
-        // PUBLIC FUNCTIONS ----------------------------------------------------------------------------------------------------------------------------------------
-        void move_to(float x, float y, float z, string type, int speed){
-            
-        }
-        
-        void move(int x_axis, int y_axis, int z_axis, float pct_speed){
-            buffer = "";
-        
-            buffer.append("f");
-            
-            //buffer.append("X");
-            n = sprintf(buffer_char, "%d", x_axis);
-            buffer.append(buffer_char);
-            
-            //buffer.append("Y");
-            n = sprintf(buffer_char, "%d", y_axis);
-            buffer.append(buffer_char);
-            
-            //buffer.append("Z");
-            n = sprintf(buffer_char, "%d", z_axis);
-            buffer.append(buffer_char);
-            
-            buffer.append("F");
-            n = sprintf(buffer_char, "%.2f", pct_speed);
-            buffer.append(buffer_char);
-            
-            send(buffer);
+        // PUBLIC FUNCTIONS ----------------------------------------------------------------------------------------------------------------------------------------     
+        void move(string move_code){
+            printf("Moving: %s\n\r",  move_code);
+            send(move_code);
         } 
         
         void save_point(int mode, float pct_speed){
@@ -61,7 +38,7 @@
         
         void start_program(void){
             send("b");  
-            printf("b\n\r");  
+            printf("Starting Program\n\r");  
         }
         
         void cancel_program(void){
@@ -74,7 +51,7 @@
         
         void machine_zero(void){
             send("zm");
-            printf("zm\n\r");
+            printf("Zero Machine\n\r");
         }
         
         void set_zero(string axis){
@@ -86,15 +63,15 @@
         
         void jog(void){
             send("j");
-            printf("j\n\r"); 
+            printf("Starting Jog\n\r"); 
         }
         
         void kill_jog(void){
             send("jk");
-            printf("jk\n\r"); 
+            printf("Killing Jog\n\r"); 
         }
         
-        void reset (void){
+        void reset(void){
             send("r");
         }
         
@@ -103,6 +80,8 @@
             buffer.append("u");
             buffer.append(gcode);
             
+            printf("Uploading GCODE: %s\n\r", gcode);
+            
             send(buffer);
         }
         
@@ -116,7 +95,7 @@
         
         void clean_glue(void){
             send("g");   
-            printf("g\n\r");     
+            printf("Cleaning Glue\n\r");     
         }
         
         private:
@@ -314,6 +293,10 @@
         lcd.locate(col,min);
         lcd.printf("%c", 0x3E);
         while (bot_enter==penter){
+            if(emerg){
+                func = 31;
+                break;
+            }
             if (bot_cima==0){
                 if (linha==min){
                     lcd.locate(col,min);
@@ -1297,7 +1280,10 @@
         }
     void tela_emergencia(void){
         lcd.cls();
-        lcd.printf("EMERGENCIA");    
+        lcd.printf("EMERGENCIA");  
+        printf("Waiting release...");
+        func = 1;
+        while(!emergencia.read()); 
     }
         
     //função para ler os pontos
@@ -1326,6 +1312,7 @@
                 limpar_cola = 0;
                 printf("oi\n\r");
                 action = 1;
+                WiFi.putc('ax');
             }
                 
             if (recv == 'p'){