Skip to content

Commit a26026b

Browse files
committed
merge back with @dcorboy
2 parents 7563831 + 015d42f commit a26026b

18 files changed

Lines changed: 1660 additions & 1813 deletions

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
*.cpp~
2-
*.h~
1+
.DS_Store
2+
.orig

HISTORY.md

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
## [1.5.8] - 2016-05-07
2+
3+
### Fix
4+
- Speed up Calibration, reduce delay
5+
- Use writeAngle() Function in MoveTo
6+
7+
### Changes
8+
9+
- Add Calibration.ino into examples
10+
11+
12+
## [1.5.6] - 2016-05-06
13+
14+
### Fix
15+
16+
- Update SERIAL_NUMBER_ADDRESS to 100, Update CALIBRATION_STRETCH_FLAG mark value is CONFIRM_FLAG
17+
18+
## [1.5.5] - 2016-05-05
19+
20+
### Fix
21+
22+
- if SERIAL_NUMBER_ADDRESS equal CONFIRM_FLAG 0x80, then Serial Number exist in EEPROM
23+
24+
## [1.5.4] - 2016-05-02
25+
26+
### Fix
27+
28+
- if SERIAL_NUMBER_ADDRESS equal SERIAL_NUMBER_ADDRESS, then Serial Number exist in EEPROM
29+
30+
## [1.5.3] - 2016-05-02
31+
32+
### Changes
33+
34+
- Add readSerialNumber & writeSerialNumber function (Serial Number: Address 1024, size:14)
35+
36+
37+
## [1.5.2] - 2016-04-29
38+
39+
### Changes
40+
41+
- Add Example, MoveTest, GetXYZ, Recording Mode
42+
43+
44+
## [1.5.2] - 2016-04-29
45+
46+
### Changes
47+
48+
- Cancel v.1.5.0 read offset from EEPROM.
49+
50+
51+
## [1.5.0] - 2016-04-14
52+
53+
### Changes
54+
55+
- Initialize servo offset & linear offset from EEPROM to global values, prevent read EEPROM every time
56+
57+
- Use [EEPROM.get()][a4e46a5d] & [EEPROM.put()][275bf48d] to read & write value in EEPROM instead of saveDataToRom()
58+
59+
[a4e46a5d]: https://www.arduino.cc/en/Reference/EEPROMGet "EEPROM.get()"
60+
[275bf48d]: https://www.arduino.cc/en/Reference/EEPROMPut "EEPROM.put()"
61+
62+
- rename function readToAngle to analogToAngle
63+
- Change Offset address in EEPROM
64+
65+
## [1.4.0] - 2016-04-12
66+
67+
### Changes
68+
69+
- uarm_library.cpp writeServoAngle resume LEFT & RIGHT ANGLE
70+
71+
- ToDo: remove LEFT & RIGHT ANGLE from WriteServoAngle (For Safety)
72+
73+
74+
## [1.3.1] - 2016-04-12
75+
76+
### Changes
77+
78+
- uarm_library.cpp writeLeftRightServoAngle() Update the angle between left & right
79+
80+
- Change Folder examples folder & stretch name From UarmFirmata to UArmFirmata

README.md

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,40 @@
1-
# uArm Library
2-
3-
**Compatible**
4-
5-
- uArm Acrylic
6-
![uArm Acrylic][1]
7-
- uArm Metal
8-
![uArm Metal][2]
9-
10-
Specification Please read Documentation Center /API
11-
[Developer Center][3]
12-
13-
14-
[1]: http://ufactory.cc/wp-content/uploads/2015/06/Download-Center_10.png
15-
[2]: http://ufactory.cc/wp-content/uploads/2015/06/Download-Center_07.png
16-
[3]: http://developer.ufactory.cc/quickstart/arduino/
1+
# uArm Library
2+
3+
**Warning, This Library is for developer, After upload the library, you must recalibrate the uArm**
4+
5+
**Compatible**
6+
7+
- uArm Metal
8+
9+
Specification Please read Documentation Center /API
10+
[Developer Center][3]
11+
12+
## Installation
13+
14+
### Library Manager
15+
*Recommend*
16+
17+
- Download [Arduino IDE][622f1188]
18+
- Import the uArm Library (search uArmLibrary) using Library Manager.
19+
If you don't know how to use Library Manager. Please Refer this [Import Library Using Library Manager][4b323740]
20+
- Upload the example to your uArm
21+
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]
22+
- You need to recalibrate when you are new to this library. we recommend the GUI Calibration tool.
23+
24+
25+
26+
### Manual Installation
27+
28+
- Download [Arduino IDE][622f1188]
29+
- Clone the source code into your computer.
30+
- Open Arduino IDE, import the zip as library. Please refer this [Import a .zip Library][8cd4af00]
31+
- Upload the example to your uArm
32+
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]
33+
- You need to recalibrate when you are new to this library. we recommend the GUI Calibration tool.
34+
35+
[8cd4af00]: https://www.arduino.cc/en/Guide/Libraries#toc4 "Import a .zip Library"
36+
[4b323740]: https://www.arduino.cc/en/Guide/Libraries#toc3 "Import Library Using Library Manager"
37+
[3]: http://developer.ufactory.cc/quickstart/arduino/
38+
[622f1188]: https://www.arduino.cc/en/Main/Software "Arduino IDE"
39+
[397d20eb]: https://www.arduino.cc/en/Guide/Windows "Arduino Getting Start on Windows"
40+
[2d8a8b7a]: https://www.arduino.cc/en/Guide/MacOSX "Arduino Getting Started on MacOS"

0 commit comments

Comments
 (0)