Merge pull request #66 from soundanalogous/dev

Update AdvancedFirmata
soundanalogous · Aug 14, 2014 · 17ddd94 · 17ddd94
2 parents 9b6ea7b + 7351e13
commit 17ddd94
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/docs/classes/BO.io.Stepper.html b/docs/classes/BO.io.Stepper.html
@@ -332,8 +332,8 @@ <h4>Parameters:</h4>
 
                     <div class="param-description">
                         <p>The type of driver (<code>Stepper.DRIVER</code>,
-<code>Stepper.DRIVER_HIGH_CURRENT,</code>Stepper.TWO<em>WIRE<code>, or
-</code>Stepper.FOUR</em>WIRE`).</p>
+<code>Stepper.DRIVER_HIGH_CURRENT</code>, <code>Stepper.TWO_WIRE</code>, or
+<code>Stepper.FOUR_WIRE</code>).</p>
                     </div>
 
 

diff --git a/docs/data.json b/docs/data.json
@@ -1575,7 +1575,7 @@
                 },
                 {
                     "name": "driverType.",
-                    "description": "The type of driver (`Stepper.DRIVER`,\n`Stepper.DRIVER_HIGH_CURRENT, `Stepper.TWO_WIRE`, or\n`Stepper.FOUR_WIRE`).",
+                    "description": "The type of driver (`Stepper.DRIVER`,\n`Stepper.DRIVER_HIGH_CURRENT`, `Stepper.TWO_WIRE`, or\n`Stepper.FOUR_WIRE`).",
                     "type": "Number"
                 },
                 {

diff --git a/docs/files/src_io_Stepper.js.html b/docs/files/src_io_Stepper.js.html
@@ -212,7 +212,7 @@ <h1 class="file-heading">File: src/io/Stepper.js</h1>
      * @param {IOBoard} board A reference to the IOBoard instance that the 
      * stepper is attached to.
      * @param {Number} driverType. The type of driver (&#x60;Stepper.DRIVER&#x60;,
-     * &#x60;Stepper.DRIVER_HIGH_CURRENT, &#x60;Stepper.TWO_WIRE&#x60;, or
+     * &#x60;Stepper.DRIVER_HIGH_CURRENT&#x60;, &#x60;Stepper.TWO_WIRE&#x60;, or
      * &#x60;Stepper.FOUR_WIRE&#x60;).
      * @param {Number} numStepsPerRev The number of steps to make 1 revolution. 
      * @param {Pin} directionPin If dirver interface, the pin used to control 

diff --git a/firmware/AdvancedFirmata/AdvancedFirmata.ino b/firmware/AdvancedFirmata/AdvancedFirmata.ino
@@ -558,8 +558,8 @@ void sysexCallback(byte command, byte argc, byte *argv)
         Serial.write(1);  // to do: determine appropriate value 
       }
       if (IS_PIN_DIGITAL(pin)) {
-        Firmata.write(STEPPER);
-        Firmata.write(21); //21 bits used for number of steps
+        Serial.write(STEPPER);
+        Serial.write(21); //21 bits used for number of steps
       }      
       Serial.write(127);
     }

diff --git a/firmware/AdvancedFirmata/FirmataStepper.cpp b/firmware/AdvancedFirmata/FirmataStepper.cpp
diff --git a/firmware/AdvancedFirmata/FirmataStepper.h b/firmware/AdvancedFirmata/FirmataStepper.h
diff --git a/firmware/AdvancedFirmata/README.md b/firmware/AdvancedFirmata/README.md
diff --git a/src/io/Stepper.js b/src/io/Stepper.js
@@ -38,7 +38,7 @@ BO.io.Stepper = (function () {
      * @param {IOBoard} board A reference to the IOBoard instance that the 
      * stepper is attached to.
      * @param {Number} driverType. The type of driver (`Stepper.DRIVER`,
-     * `Stepper.DRIVER_HIGH_CURRENT, `Stepper.TWO_WIRE`, or
+     * `Stepper.DRIVER_HIGH_CURRENT`, `Stepper.TWO_WIRE`, or
      * `Stepper.FOUR_WIRE`).
      * @param {Number} numStepsPerRev The number of steps to make 1 revolution. 
      * @param {Pin} directionPin If dirver interface, the pin used to control