fix test.ino

Author: altjz

HISTORY.md

@@ -1,3 +1,8 @@
+## [1.5.11] - 2016-06-07
+
+### Fix
+- Fix Test.ino unused function
+
 ## [1.5.10] - 2016-06-07
 
 ### Fix

examples/Test/Test.ino

@@ -16,7 +16,7 @@
  * Function 7 - 8 :    attach or detach all servos (function 7-8)
  * Function 9     :    uArm calibration
  * Function 10    :    read current coordinate x,y,z
- * Function 11    :    recording mode 
+ * Function 11    :    recording mode
 
 */
 
@@ -27,12 +27,12 @@
 #include "uarm_library.h"
 #include <Servo.h>
 
-// define a uArm 
-//uArmLibrary uArm;  
-int value;        // value is the data recevied 
+// define a uArm
+//uArmLibrary uArm;
+int value;        // value is the data recevied
 
 void setup() {
-  
+
       Wire.begin();        // join i2c bus (address optional for master)
       Serial.begin(9600);  // start serial port at 9600 bps
 }
@@ -45,85 +45,85 @@ void loop() {
 
       char readSerial = Serial.read();
       Serial.println(readSerial);
-      
+
       //----------------------------------  function 1  ------------------------------------
-      // function below is for move uArm from current position to absolute coordinate 
-      // x = 13, y = -13, z = 3 
-      
+      // function below is for move uArm from current position to absolute coordinate
+      // x = 13, y = -13, z = 3
+
       if (readSerial == '1') {
         uarm.moveTo(13,-13,3);
         delay(1000);
        }
-       
+
       //----------------------------------  function 2  ------------------------------------
       // function below is for move uArm from current position to absolute coordinate
-      // x = -13, y = -13, z = 3 
-      
+      // x = -13, y = -13, z = 3
+
       if (readSerial == '2') {
         uarm.moveTo(-13,-13,3);
         delay(1000);
        }
 
       //----------------------------------  function 3  ------------------------------------
-      // function below is for move uArm from current position to relatvie coordinate 
-      // (dot) dx = 4, dy = -3, dz = 2 in 5 seconds 
-      
+      // function below is for move uArm from current position to relatvie coordinate
+      // (dot) dx = 4, dy = -3, dz = 2 in 5 seconds
+
       if (readSerial == '3') {
         uarm.moveTo(1,1,1,RELATIVE,2);
         delay(1000);
        }
-       
+
       //----------------------------------  function 4  ------------------------------------
-      // function below is for move uArm from current position to relatvie coordinate 
-      // (dot) dx = -4, dy = 3, dz = -2 in 5 seconds 
-      
+      // function below is for move uArm from current position to relatvie coordinate
+      // (dot) dx = -4, dy = 3, dz = -2 in 5 seconds
+
       if (readSerial == '4') {
         uarm.moveTo(-4,3,-2,RELATIVE,5);
         delay(1000);
        }
-       
-      //----------------------------------  function 5  ------------------------------------
-      // function below is for move uArm to draw a Rectangle with 10 cm long and 5 cm 
-      // width in 2 seconds for one arm ( 8s totally) 
-      
-      if (readSerial == '5') {
-        uarm.drawRec(10,5,2);
-        delay(1000);
-       }
 
-      //----------------------------------  function 6  ------------------------------------
-      // function below is for move uArm to draw a ellipse with 10 cm long and 10 cm 
-      // width (circle) for full 360 degree in 2 seconds 
-      
-      if (readSerial == '6') {
-        uarm.drawCur(6,6,360,2);
-        delay(1000);
-       }
+      //----------------------------------  function 5  ------------------------------------
+      // function below is for move uArm to draw a Rectangle with 10 cm long and 5 cm
+      // width in 2 seconds for one arm ( 8s totally)
+
+//      if (readSerial == '5') {
+//        uarm.drawRec(10,5,2);
+//        delay(1000);
+//       }
+//
+//      //----------------------------------  function 6  ------------------------------------
+//      // function below is for move uArm to draw a ellipse with 10 cm long and 10 cm
+//      // width (circle) for full 360 degree in 2 seconds
+//
+//      if (readSerial == '6') {
+//        uarm.drawCur(6,6,360,2);
+//        delay(1000);
+//       }
 
       //----------------------------------  function 7  ------------------------------------
       // function below is atach all servos
-      
-      if (readSerial == 'a') {
-        uarm.attachAll();
-      }
+
+//      if (readSerial == 'a') {
+//        uarm.attachAll();
+//      }
 
       //----------------------------------  function 8  ------------------------------------
       // function below is detach all servos
-           
+
       if (readSerial == 'd') {
         uarm.detachAll();
       }
-      
+
       //----------------------------------  function 9  ------------------------------------
       // function below is for calibrate uArm
-          
+
       // if (readSerial == 'c') {
       //   calib.calibrations();
       // }
-      
+
       //----------------------------------  function 10  ------------------------------------
-      // function below is for print current x,y,z absolute location 
-         
+      // function below is for print current x,y,z absolute location
+
       if (readSerial == 'g') {
         Serial.print("The current location is ");
         Serial.print(uarm.getCalX());
@@ -143,7 +143,7 @@ void loop() {
         Serial.print("SERVO_RIGHT_NUM offset:");
         Serial.println(uarm.readServoOffset(SERVO_RIGHT_NUM));
         Serial.print("SERVO_HAND_ROT_NUM offset:");
-        Serial.println(uarm.readServoOffset(SERVO_HAND_ROT_NUM));                        
+        Serial.println(uarm.readServoOffset(SERVO_HAND_ROT_NUM));
       }
 
       if (readSerial == 'o') {
@@ -153,16 +153,16 @@ void loop() {
       if (readSerial == 'f') {
         uarm.pumpOff();
       }
-      
+
       //----------------------------------  function 11  ------------------------------------
       // function below is for record a 20 seconds trajactory for uArm
       // must put recordingMode in a loop
-                 
+
       // if (readSerial == 'r') {
       //   while(1){
       //     uArm.recordingMode(10);
       //   }
       // }
-      
+
   } // close read available
-}
+}

library.properties

@@ -1,5 +1,5 @@
 name=uArmLibrary
-version=1.5.10
+version=1.5.11
 author=UFactory <developer@ufactory.cc>
 maintainer=Joey Song <joey@ufactory.cc>, Alex Tan<alex@ufactory.cc>, Dave Corboy<dave@corboy.com>
 sentence=uArm Library for Arduino

uarm_library.h

@@ -20,7 +20,7 @@
 
 #define UARM_MAJOR_VERSION      1
 #define UARM_MINOR_VERSION      5
-#define UARM_BUGFIX             10
+#define UARM_BUGFIX             11
 
 #define SERVO_ROT_NUM           0
 #define SERVO_LEFT_NUM          1