Skip to content

Commit 29275bf

Browse files
committed
v1.5.6 fix SERIAL_NUMBER_ADDRESS CONFIRM_FLAG
1 parent 4b25d57 commit 29275bf

4 files changed

Lines changed: 10 additions & 4 deletions

File tree

HISTORY.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## [1.5.6] - 2016-05-06
2+
3+
### Fix
4+
5+
- Update SERIAL_NUMBER_ADDRESS to 100, Update CALIBRATION_STRETCH_FLAG mark value is CONFIRM_FLAG
6+
17
## [1.5.5] - 2016-05-05
28

39
### Fix

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.5.5
2+
version=1.5.6
33
author=UFactory <developer@ufactory.cc>
44
maintainer=Joey Song <joey@ufactory.cc>, Alex Tan<alex@ufactory.cc>
55
sentence=uArm Library for Arduino

uarm_library.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ void uArmClass::calAngles(double x, double y, double z, double& theta_1, double&
355355
** Height from -180 to 150
356356
**/
357357
void uArmClass::writeStretch(double armStretch, double armHeight){
358-
if(EEPROM.read(CALIBRATION_STRETCH_FLAG) != CALIBRATION_STRETCH_FLAG) {
358+
if(EEPROM.read(CALIBRATION_STRETCH_FLAG) != CONFIRM_FLAG) {
359359
alert(3, 200, 200);
360360
return;
361361
}

uarm_library.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#define UARM_MAJOR_VERSION 1
2424
#define UARM_MINOR_VERSION 5
25-
#define UARM_BUGFIX 5
25+
#define UARM_BUGFIX 6
2626

2727
#define SERVO_ROT_NUM 0
2828
#define SERVO_LEFT_NUM 1
@@ -85,7 +85,7 @@
8585
#define LINEAR_SLOPE_START_ADDRESS 50
8686
#define OFFSET_START_ADDRESS 30
8787
#define OFFSET_STRETCH_START_ADDRESS 20
88-
#define SERIAL_NUMBER_ADDRESS 1024
88+
#define SERIAL_NUMBER_ADDRESS 100
8989

9090
#define CONFIRM_FLAG 0x80
9191

0 commit comments

Comments
 (0)