X-Git-Url: https://git.hcoop.net/clinton/Smoothieware.git/blobdiff_plain/6a301bc9631135167f56f9cf9ee6d80e25abc56a..18ca10a33a1ecb389a234eceea3631f2751aea6d:/src/modules/utils/simpleshell/SimpleShell.h

diff --git a/src/modules/utils/simpleshell/SimpleShell.h b/src/modules/utils/simpleshell/SimpleShell.h
index 7519d4a0..5f853463 100644
--- a/src/modules/utils/simpleshell/SimpleShell.h
+++ b/src/modules/utils/simpleshell/SimpleShell.h
@@ -5,12 +5,11 @@
       You should have received a copy of the GNU General Public License along with Smoothie. If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-#ifndef simpleshell_h
-#define simpleshell_h
+#pragma once
 
 #include "Module.h"
 
+#include <functional>
 #include <string>
 using std::string;
 
@@ -25,39 +24,52 @@ public:
     void on_console_line_received( void *argument );
     void on_gcode_received(void *argument);
     void on_second_tick(void *);
+    static bool parse_command(const char *cmd, string args, StreamOutput *stream);
+    static void print_mem(StreamOutput *stream) { mem_command("", stream); }
+    static void version_command(string parameters, StreamOutput *stream );
 
 private:
-    void ls_command(string parameters, StreamOutput *stream );
-    void cd_command(string parameters, StreamOutput *stream );
-    void delete_file_command(string parameters, StreamOutput *stream );
-    void pwd_command(string parameters, StreamOutput *stream );
-    void cat_command(string parameters, StreamOutput *stream );
-    void rm_command(string parameters, StreamOutput *stream );
-    void break_command(string parameters, StreamOutput *stream );
-    void reset_command(string parameters, StreamOutput *stream );
-    void dfu_command(string parameters, StreamOutput *stream );
-    void help_command(string parameters, StreamOutput *stream );
-    void version_command(string parameters, StreamOutput *stream );
-    void get_command(string parameters, StreamOutput *stream );
-    void set_temp_command(string parameters, StreamOutput *stream );
-    void mem_command(string parameters, StreamOutput *stream );
-
-    void net_command( string parameters, StreamOutput *stream);
-
-    void load_command( string parameters, StreamOutput *stream);
-    void save_command( string parameters, StreamOutput *stream);
-
-    bool parse_command(unsigned short cs, string args, StreamOutput *stream);
-
-    typedef void (SimpleShell::*PFUNC)(string parameters, StreamOutput *stream);
-    typedef struct {
-        unsigned short command_cs;
-        PFUNC pfunc;
-    } ptentry_t;
 
-    static ptentry_t commands_table[];
-    int reset_delay_secs;
-};
+    void jog(string params, StreamOutput *stream);
+
+    static void ls_command(string parameters, StreamOutput *stream );
+    static void cd_command(string parameters, StreamOutput *stream );
+    static void delete_file_command(string parameters, StreamOutput *stream );
+    static void pwd_command(string parameters, StreamOutput *stream );
+    static void cat_command(string parameters, StreamOutput *stream );
+    static void rm_command(string parameters, StreamOutput *stream );
+    static void mv_command(string parameters, StreamOutput *stream );
+    static void mkdir_command(string parameters, StreamOutput *stream );
+    static void upload_command(string parameters, StreamOutput *stream );
+    static void break_command(string parameters, StreamOutput *stream );
+    static void reset_command(string parameters, StreamOutput *stream );
+    static void dfu_command(string parameters, StreamOutput *stream );
+    static void help_command(string parameters, StreamOutput *stream );
+    static void get_command(string parameters, StreamOutput *stream );
+    static void set_temp_command(string parameters, StreamOutput *stream );
+    static void calc_thermistor_command( string parameters, StreamOutput *stream);
+    static void print_thermistors_command( string parameters, StreamOutput *stream);
+    static void md5sum_command( string parameters, StreamOutput *stream);
+    static void grblDP_command( string parameters, StreamOutput *stream);
+
+    static void switch_command(string parameters, StreamOutput *stream );
+    static void mem_command(string parameters, StreamOutput *stream );
+
+    static void net_command( string parameters, StreamOutput *stream);
 
+    static void load_command( string parameters, StreamOutput *stream);
+    static void save_command( string parameters, StreamOutput *stream);
 
-#endif
+    static void remount_command( string parameters, StreamOutput *stream);
+
+    static void test_command( string parameters, StreamOutput *stream);
+
+    typedef void (*PFUNC)(string parameters, StreamOutput *stream);
+    typedef struct {
+        const char *command;
+        const PFUNC func;
+    } const ptentry_t;
+
+    static const ptentry_t commands_table[];
+    static int reset_delay_secs;
+};