Bug fixes, add settings screenshot

.gitignore

@@ -7,3 +7,4 @@ dist
 *.egg*
 .DS_Store
 *.zip
+.vscode/

README.md

@@ -1,6 +1,6 @@
 # OctoPrint-AtCommands
 
-**TODO:** Describe what your plugin does.
+Executes system commands/scripts using @commands.
 
 ## Setup
 
@@ -9,9 +9,7 @@ or manually using this URL:
 
     https://github.com/ieatacid/OctoPrint-AtCommands/archive/master.zip
 
-**TODO:** Describe how to install your plugin, if more needs to be done than just installing it via pip or through
-the plugin manager.
 
-## Configuration
+## Screenshot
 
-**TODO:** Describe your plugin's configuration options (if any).
+![Settings](extras/assets/img/settings.png?raw=true)

octoprint_AtCommands/__init__.py

@@ -81,14 +81,12 @@ def atcommand_hook(self, comm, phase, command, parameters, tags=None, *args, **k
 
         if at_cmd["type"] == "system":
             self._logger.info("AtCommand '@%s' is type 'system'" % (command))
-
+            self._logger.info("Executing system command '%s'" % (at_cmd["command"]))
             try:
             	if len(parameters) > 0:
-            		self._logger.info("Executing system command '%s'" % (at_cmd["command"]))
             		self._logger.info("...with parameters: %s" % (parameters))
             		r = subprocess.call([at_cmd["command"], parameters])
             	else:
-            		self._logger.info("Executing system command '%s'" % (at_cmd["command"]))
                 	r = subprocess.call(at_cmd["command"])
             except:
                 e = sys.exc_info()[0]
@@ -97,9 +95,10 @@ def atcommand_hook(self, comm, phase, command, parameters, tags=None, *args, **k
 
             self._logger.info("Command '%s' returned: %s" % (command, r))
 
-        elif at_cmd["type"] == "octoprint":
-            self._logger.info("AtCommand '@%s' is type 'octoprint'" % (command))
+        elif at_cmd["type"] == "gcode":
+            self._logger.info("AtCommand '@%s' is type 'gcode'" % (command))
             self._logger.info("Executing octoprint command '%s'" % (at_cmd["command"]))
+            self._printer.commands(this_command["command"].split(";"))
 
         else:
             self._logger.error("AtCommand type not found or not known for '@%s'" % command)

octoprint_AtCommands/templates/AtCommands_settings.jinja2

@@ -12,7 +12,7 @@
     <div class="row-fluid">
         <div class="span3"><h4>&#64;name</h4></div>
         <div class="span2"><h4>Type</h4></div>
-        <div class="span5"><h4>Command</h4></div>
+        <div class="span5"><h4>Command<small><a href="#" data-toggle="tooltip" title="Multiple gcode commands can be&#013;&#010;separated with a semicolon ( ; )">?</a></small></h4></div>
     </div>
     <div data-bind="foreach: at_commands">
         <div class="row-fluid" style="margin-bottom: 5px">
@@ -23,10 +23,10 @@
             <div class="span2" title="System commands are executed by the OctoPrint host, octoprint commands are passed to the OctoPrint server.">
                 <select class="span12" id=type data-bind="value: type">
                     <option value="system">system</option>
-                    <option value="octoprint">octoprint</option>
+                    <option value="gcode">gcode</option>
                 </select>
             </div>
-            <div class="span5" title="The command to execute.">
+            <div class="span5"  title="The command or gcode to execute." >
                 <input type="text" class="input-block-level" data-bind="value: command">
             </div>
             <div class="span1">

setup.py

@@ -14,7 +14,7 @@
 plugin_name = "OctoPrint-AtCommands"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "0.1.2"
+plugin_version = "0.1.3"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module