merge with github history commit

Author: altjz

.gitignore

@@ -1,2 +1,2 @@
-*.cpp~
-*.h~
+.DS_Store
+.orig

HISTORY.md

@@ -0,0 +1,87 @@
+## [1.5.8] - 2016-05-07
+
+### Fix
+- Speed up Calibration, reduce delay
+- Use writeAngle() Function in MoveTo
+
+## [1.5.7] - 2016-05-07
+
+### Fix
+
+- Update SERVO_OFFST_ADDRESS to MANUAL_OFFSET_ADDRESS
+- Update indent for syntax
+
+### Changes
+
+- Add Calibration.ino into examples
+
+
+## [1.5.6] - 2016-05-06
+
+### Fix
+
+- Update SERIAL_NUMBER_ADDRESS to 100, Update CALIBRATION_STRETCH_FLAG mark value is CONFIRM_FLAG
+
+## [1.5.5] - 2016-05-05
+
+### Fix
+
+- if SERIAL_NUMBER_ADDRESS equal CONFIRM_FLAG 0x80, then Serial Number exist in EEPROM
+
+## [1.5.4] - 2016-05-02
+
+### Fix
+
+- if SERIAL_NUMBER_ADDRESS equal SERIAL_NUMBER_ADDRESS, then Serial Number exist in EEPROM
+
+## [1.5.3] - 2016-05-02
+
+### Changes
+
+- Add readSerialNumber & writeSerialNumber function (Serial Number: Address 1024, size:14)
+
+
+## [1.5.2] - 2016-04-29
+
+### Changes
+
+- Add Example, MoveTest, GetXYZ, Recording Mode
+
+
+## [1.5.2] - 2016-04-29
+
+### Changes
+
+- Cancel v.1.5.0 read offset from EEPROM.
+
+
+## [1.5.0] - 2016-04-14
+
+### Changes
+
+- Initialize servo offset & linear offset from EEPROM to global values, prevent read EEPROM every time
+
+- Use [EEPROM.get()][a4e46a5d] & [EEPROM.put()][275bf48d] to read & write value in EEPROM instead of saveDataToRom()
+
+  [a4e46a5d]: https://www.arduino.cc/en/Reference/EEPROMGet "EEPROM.get()"
+  [275bf48d]: https://www.arduino.cc/en/Reference/EEPROMPut "EEPROM.put()"
+
+- rename function readToAngle to analogToAngle
+- Change Offset address in EEPROM
+
+## [1.4.0] - 2016-04-12
+
+### Changes
+
+- uarm_library.cpp writeServoAngle resume LEFT & RIGHT ANGLE
+
+- ToDo: remove LEFT & RIGHT ANGLE from WriteServoAngle (For Safety)
+
+
+## [1.3.1] - 2016-04-12
+
+### Changes
+
+- uarm_library.cpp writeLeftRightServoAngle() Update the angle between left & right  
+
+- Change Folder examples folder & stretch name From UarmFirmata to UArmFirmata  

README.md

@@ -1,16 +1,40 @@
-# uArm Library
-
-**Compatible**
-
- - uArm Acrylic
- ![uArm Acrylic][1]
- - uArm Metal
-![uArm Metal][2]
-
-Specification Please read Documentation Center /API
-[Developer Center][3]
-
-
-  [1]: http://ufactory.cc/wp-content/uploads/2015/06/Download-Center_10.png
-  [2]: http://ufactory.cc/wp-content/uploads/2015/06/Download-Center_07.png
-  [3]: http://developer.ufactory.cc/quickstart/arduino/
+# uArm Library
+
+**Warning, This Library is for developer, After upload the library, you must recalibrate the uArm**
+
+**Compatible**
+
+ - uArm Metal
+
+Specification Please read Documentation Center /API
+[Developer Center][3]  
+
+## Installation
+
+### Library Manager
+*Recommend*
+
+- Download [Arduino IDE][622f1188]  
+- Import the uArm Library (search uArmLibrary) using Library Manager.
+ If you don't know how to use Library Manager. Please Refer this [Import Library Using Library Manager][4b323740]
+- Upload the example to your uArm
+ If you don't know how to upload Arduino sketch,  We recommend you read this [Arduino Getting Started on Windows][397d20eb] or [Arduino Getting Started on MacOS][2d8a8b7a]
+- You need to recalibrate when you are new to this library. we recommend the GUI Calibration tool.   
+
+
+
+### Manual Installation
+
+- Download [Arduino IDE][622f1188]  
+- Clone the source code into your computer.
+- Open Arduino IDE, import the zip as library. Please refer this [Import a .zip Library][8cd4af00]
+- Upload the example to your uArm
+ If you don't know how to upload Arduino sketch,  We recommend you read this [Arduino Getting Started on Windows][397d20eb] or [Arduino Getting Started on MacOS][2d8a8b7a]
+- You need to recalibrate when you are new to this library. we recommend the GUI Calibration tool.
+
+  [8cd4af00]: https://www.arduino.cc/en/Guide/Libraries#toc4 "Import a .zip Library"
+  [4b323740]: https://www.arduino.cc/en/Guide/Libraries#toc3 "Import Library Using Library Manager"
+  [3]: http://developer.ufactory.cc/quickstart/arduino/
+  [622f1188]: https://www.arduino.cc/en/Main/Software "Arduino IDE"
+  [397d20eb]: https://www.arduino.cc/en/Guide/Windows "Arduino Getting Start on Windows"
+  [2d8a8b7a]: https://www.arduino.cc/en/Guide/MacOSX "Arduino Getting Started on MacOS"