Diff: modules/communication/utils/Gcode.h

Revision:

2:1df0b61d3b5a

Parent:

0:31e91bb0ef3c

--- a/modules/communication/utils/Gcode.h	Sat Mar 01 02:37:29 2014 +0000
+++ b/modules/communication/utils/Gcode.h	Fri Feb 28 18:52:52 2014 -0800
@@ -1,8 +1,8 @@
-/*  
+/*
       This file is part of Smoothie (http://smoothieware.org/). The motion control part is heavily based on Grbl (https://github.com/simen/grbl).
       Smoothie is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
       Smoothie 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 General Public License for more details.
-      You should have received a copy of the GNU General Public License along with Smoothie. If not, see <http://www.gnu.org/licenses/>. 
+      You should have received a copy of the GNU General Public License along with Smoothie. If not, see <http://www.gnu.org/licenses/>.
 */
 
 
@@ -11,20 +11,39 @@
 #include <string>
 using std::string;
 #include "libs/StreamOutput.h"
-// Object to represent a Gcode comman
+// Object to represent a Gcode command
 #include <stdlib.h>
 
 class Gcode {
     public:
-        Gcode();
-        bool has_letter( char letter );
-        double get_value ( char letter );
+        Gcode(const string&, StreamOutput*);
+        Gcode(const Gcode& to_copy); 
+        Gcode& operator= (const Gcode& to_copy);
+        
+        bool   has_letter ( char letter );
+
+        float get_value  ( char letter );
+
+        float get_double ( char letter );
+        int    get_int    ( char letter );
+
+        int    get_num_args();
+        void   prepare_cached_values();
+        void   mark_as_taken();
 
         string command;
-        double millimeters_of_travel;
-        bool call_on_gcode_execute_event_immediatly;
-        bool on_gcode_execute_event_called;
+        float millimeters_of_travel;
+
+        bool has_m;
+        bool has_g;
+        unsigned int m;
+        unsigned int g;
 
+        bool add_nl;
         StreamOutput* stream;
+
+        string txt_after_ok;
+        bool accepted_by_module;
+
 };
-#endif
\ No newline at end of file
+#endif