Skip to content

Commit fa70419

Browse files
committed
v1.7.3
1 parent 7ec9197 commit fa70419

7 files changed

Lines changed: 21 additions & 3 deletions

File tree

HISTORY.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# uArm Arduino Library Release Note
22

3+
## [1.7.3] - 2016-07-07
4+
5+
### Fix
6+
- Fix write serial number CONFIRM_FLAG
7+
- uArm won't move if no LINEAR Calibration
8+
39
## [1.7.2] - 2016-06-30
410

511
### Fix

PROTOCOL.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ REPORT_LIBRARY_VERSION | 0x23 | 0
104104

105105
### Request READ_ANGLE Message
106106

107+
107108
Sequence | Type | Command/Data | Bytes | Remark
108109
-------- | ------------ | ------------ | ----- | ------------------------------------------------------------------
109110
1 | START_SYSEX | 0xF0 | 1 |
@@ -116,6 +117,7 @@ Sequence | Type | Command/Data | Bytes | Remark
116117

117118
### Request WRITE_ANGLE Message
118119

120+
119121
Sequence | Type | Command/Data | Bytes | Remark
120122
-------- | ------------ | -------------------------- | ----- | ------------------------------------------------------------------
121123
1 | START_SYSEX | 0xF0 | 1 |
@@ -127,8 +129,10 @@ Sequence | Type | Command/Data | Bytes | Remark
127129
7 | END_SYSEX | 0xF7 | 1 |
128130
-------- | ------------ | ------------ | 9 | ------------------------------------------------------------------
129131

132+
130133
### Request READ_COORDS Message
131134

135+
132136
Sequence | Type | Command/Data | Bytes | Remark
133137
-------- | ------------ | ------------ | ----- | ------------------------------------------------------------------
134138
1 | START_SYSEX | 0xF0 | 1 |
@@ -139,6 +143,7 @@ Sequence | Type | Command/Data | Bytes | Remark
139143

140144
### Request WRITE_COORDS Message
141145

146+
142147
Sequence | Type | Command/Data | Bytes | Remark
143148
-------- | -------------- | ------------------------------- | ----- | ----------------------------------------------------------------------------------------------------
144149
1 | START_SYSEX | 0xF0 | 1 |
@@ -157,6 +162,7 @@ Sequence | Type | Command/Data | Bytes | Remark
157162

158163
### Request READ_DIGITAL Message
159164

165+
160166
Sequence | Type | Command/Data | Bytes | Remark
161167
-------- | ------------ | ------------ | ----- | ------------------------------------------------------------------
162168
1 | START_SYSEX | 0xF0 | 1 |

docs/doxy.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ WARN_LOGFILE =
771771
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
772772
# Note: If this tag is empty the current directory is searched.
773773

774-
INPUT = ../README.MD ../HISTORY.MD ../src ../examples
774+
INPUT = ../README.MD ../HISTORY.MD ../PROTOCOL.md ../src ../examples
775775
#INPUT = ../
776776

777777
# This tag can be used to specify the character encoding of the source files

examples/UArmProtocol/UArmProtocol.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ boolean handleSysex(byte command, byte argc, byte *argv)
320320
for(byte i=0; i<14; i++){
321321
EEPROM.write(SERIAL_NUMBER_ADDRESS+i+1, argv[i+1]);
322322
}
323+
EEPROM.write(SERIAL_NUMBER_ADDRESS, CONFIRM_FLAG);
323324
return true;
324325
}
325326
//0X21 READ_SERIAL_NUMBER

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=uArmLibrary
2-
version=1.7.2
2+
version=1.7.3
33
author=UFactory <developer@ufactory.cc>
44
maintainer=Joey Song <joey@ufactory.cc>, Alex Tan<alex@ufactory.cc>, Dave Corboy<dave@corboy.com>
55
sentence=uArm Library for Arduino

src/uarm_library.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,11 @@ void uArmClass::interpolate(double start_val, double end_val, double *interp_val
542542
\return SUCCESS, FAILED
543543
*/
544544
int uArmClass::move_to(double x, double y, double z, double hand_angle, byte relative_flags, double time, byte path_type, byte ease_type, boolean enable_hand) {
545+
if (EEPROM.read(CALIBRATION_LINEAR_FLAG) != CONFIRM_FLAG)
546+
{
547+
alert(50, 10, 10);
548+
return FAILED;
549+
}
545550
float limit = sqrt((x*x + y*y));
546551
if (limit > 32)
547552
{

version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[firmware]
2-
version=1.7.2
2+
version=1.7.3

0 commit comments

Comments
 (0)