Skip to content

Commit c6c3d2c

Browse files
committed
Adds some commentary and cleans up trailing whitespace
1 parent e2e7365 commit c6c3d2c

2 files changed

Lines changed: 96 additions & 65 deletions

File tree

Marlin/uArmParams.h

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
******************************************************************************
33
* @file uArmParams.h
4-
* @author David.Long
4+
* @author David.Long
55
* @email xiaokun.long@ufactory.cc
66
* @date 2017-03-15
77
******************************************************************************
@@ -48,11 +48,24 @@
4848

4949

5050
#define MATH_PI 3.141592653589793238463
51-
#define MATH_TRANS 57.2958
52-
#define MATH_L1 106.6 //90.00
53-
#define MATH_L2 13.2 //21.17
54-
#define MATH_LOWER_ARM 142.07 //148.25
55-
#define MATH_UPPER_ARM 158.81 //158.8 //160.2
51+
52+
// this is just 180/PI, i.e. degrees per radian
53+
#define MATH_TRANS 57.2958
54+
55+
// these seem to be offset constants
56+
// MATH_L1 seems to correspond to the height of the shoulder joint
57+
#define MATH_L1 106.6 //90.00
58+
59+
// MATH_L2 seems to be the X offset of the shoulder joint from the Z rotation
60+
// axis
61+
#define MATH_L2 13.2 //21.17
62+
63+
// MATH_LOWER_ARM is the length of the lower arm in mm
64+
#define MATH_LOWER_ARM 142.07 //148.25
65+
66+
// MATH_UPPER_ARM is the length of the upper arm in mm
67+
#define MATH_UPPER_ARM 158.81 //158.8 //160.2
68+
5669
//#define MATH_FRONT_HEADER 69//(29.4+38.6)//43.75) //25.00// the distance between wrist to the front point we use
5770
#define MATH_UPPER_LOWER MATH_UPPER_ARM/MATH_LOWER_ARM
5871

@@ -61,7 +74,7 @@
6174
#define WORKING 1
6275
#define GRABBING 2
6376

64-
#define PUMP_GRABBING_CURRENT 70
77+
#define PUMP_GRABBING_CURRENT 70
6578

6679
#define RESULT_BUFFER_SIZE 128
6780

0 commit comments

Comments
 (0)