Various changes, see pull request

docs/code_documentation/_build/html/_modules/pycont/controller.html

@@ -1036,7 +1036,7 @@ <h1>Source code for pycont.controller</h1><div class="highlight"><pre>
         <span class="bp">self</span><span class="o">.</span><span class="n">go_to_volume</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">total_volume</span><span class="p">,</span> <span class="n">speed</span><span class="o">=</span><span class="n">speed</span><span class="p">,</span> <span class="n">wait</span><span class="o">=</span><span class="n">wait</span><span class="p">)</span></div>
 
     <span class="c"># valve</span>
-<div class="viewcode-block" id="C3000Controller.get_raw_valve_postion"><a class="viewcode-back" href="../../pycont.html#pycont.controller.C3000Controller.get_raw_valve_postion">[docs]</a>    <span class="k">def</span> <span class="nf">get_raw_valve_postion</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+<div class="viewcode-block" id="C3000Controller.get_raw_valve_position"><a class="viewcode-back" href="../../pycont.html#pycont.controller.C3000Controller.get_raw_valve_position">[docs]</a>    <span class="k">def</span> <span class="nf">get_raw_valve_position</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot;</span>
 <span class="sd">        Gets the raw value of the valve&#39;s position.</span>
 
@@ -1063,7 +1063,7 @@ <h1>Source code for pycont.controller</h1><div class="highlight"><pre>
 
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">max_repeat</span><span class="p">):</span>
-            <span class="n">raw_valve_position</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">get_raw_valve_postion</span><span class="p">()</span>
+            <span class="n">raw_valve_position</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">get_raw_valve_position</span><span class="p">()</span>
             <span class="k">if</span> <span class="n">raw_valve_position</span> <span class="o">==</span> <span class="s">&#39;i&#39;</span><span class="p">:</span>
                 <span class="k">return</span> <span class="n">VALVE_INPUT</span>
             <span class="k">elif</span> <span class="n">raw_valve_position</span> <span class="o">==</span> <span class="s">&#39;o&#39;</span><span class="p">:</span>

docs/code_documentation/_build/html/genindex.html

@@ -465,7 +465,7 @@ <h2 id="G">G</h2>
   </dt>
 
 
-  <dt><a href="pycont.html#pycont.controller.C3000Controller.get_raw_valve_postion">get_raw_valve_postion() (pycont.controller.C3000Controller method)</a>
+  <dt><a href="pycont.html#pycont.controller.C3000Controller.get_raw_valve_position">get_raw_valve_position() (pycont.controller.C3000Controller method)</a>
   </dt>
 
   </dl></td>

docs/code_documentation/_build/html/pycont.html

@@ -226,8 +226,8 @@ <h1>Pycont Package<a class="headerlink" href="#pycont-package" title="Permalink
 </dd></dl>
 
 <dl class="method">
-<dt id="pycont.controller.C3000Controller.get_raw_valve_postion">
-<code class="descname">get_raw_valve_postion</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="reference internal" href="_modules/pycont/controller.html#C3000Controller.get_raw_valve_postion"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pycont.controller.C3000Controller.get_raw_valve_postion" title="Permalink to this definition">¶</a></dt>
+<dt id="pycont.controller.C3000Controller.get_raw_valve_position">
+<code class="descname">get_raw_valve_position</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="reference internal" href="_modules/pycont/controller.html#C3000Controller.get_raw_valve_position"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pycont.controller.C3000Controller.get_raw_valve_position" title="Permalink to this definition">¶</a></dt>
 <dd><p>Gets the raw value of the valve&#8217;s position.</p>
 <dl class="docutils">
 <dt>Returns:</dt>

docs/code_documentation/createsphinxproject.py

@@ -1,5 +1,6 @@
 import os
 
+
 def main():
     print("Please enter the details of the Sphinx project you wish to create.\n")
     projectName = input("Project name: ")
@@ -9,12 +10,13 @@ def main():
     sourceDir = input("Source code directory: ")
 
     try:
-        print ("Creating sphinx project...")
+        print("Creating sphinx project...")
         command = "sphinx-apidoc -F -H {0} -A {1} -V {2} -o {3} {4}".format(projectName, author, version, outputDir, sourceDir)
         print(command)
-        #os.system(command)
-    except Exception as e:
+        # os.system(command)
+    except Exception:
         print("Error when creating project.")
 
+
 if __name__=='__main__':
     main()

docs/code_documentation/makehtmldocs.py

@@ -1,8 +1,10 @@
 import os
 
+
 def main():
     os.system("make clean")
     os.system("make html")
 
+
 if __name__=='__main__':
     main()

pycont/__init__.py

@@ -6,6 +6,7 @@
 """
 from ._version import __version__
 from ._logger import __logger_root_name__
+from .controller import MultiPumpController, C3000Controller
 
 import logging
 logging.getLogger(__logger_root_name__).addHandler(logging.NullHandler())

pycont/_version.py

@@ -1 +1 @@
-__version__ = '0.9.9'
+__version__ = '1.0.0'