Skip to content

Commit 3448d23

Browse files
sandeepmistrycalvinatintel
sandeepmistry
authored and
calvinatintel
committed
Remove enums for ranges and duration, auto calibrate/set offset now enables offset, rename interrupt routines to interrupts/noInterrupts
keywords.txt updates
1 parent 63a01dd commit 3448d23

File tree

10 files changed

+1213
-315
lines changed

10 files changed

+1213
-315
lines changed

‎libraries/CurieIMU/examples/Accelerometer/Accelerometer.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void setup() {
3333
CurieIMU.begin();
3434

3535
// Set the accelerometer range to 2G
36-
CurieIMU.setAccelerometerRange(CURIE_IMU_ACCELEROMETER_RANGE_2G);
36+
CurieIMU.setAccelerometerRange(2);
3737
}
3838

3939
void loop() {

‎libraries/CurieIMU/examples/AccelerometerOrientation/AccelerometerOrientation.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void setup() {
3636
CurieIMU.begin();
3737

3838
// Set the accelerometer range to 2G
39-
CurieIMU.setAccelerometerRange(CURIE_IMU_ACCELEROMETER_RANGE_2G);
39+
CurieIMU.setAccelerometerRange(2);
4040
}
4141

4242
void loop() {

‎libraries/CurieIMU/examples/Gyro/Gyro.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void setup() {
3333
CurieIMU.begin();
3434

3535
// Set the accelerometer range to 250 degrees/second
36-
CurieIMU.setGyroRange(CURIE_IMU_GYRO_RANGE_250);
36+
CurieIMU.setGyroRange(250);
3737
}
3838

3939
void loop() {

‎libraries/CurieIMU/examples/RawImuDataSerial/RawImuDataSerial.ino‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ void setup() {
8484

8585
// The board must be resting in a horizontal position for
8686
// the following calibration procedure to work correctly!
87-
Serial.print("Starting Gyroscope calibration...");
87+
Serial.print("Starting Gyroscope calibration and enabling offset compensation...");
8888
CurieIMU.autoCalibrateGyroOffset();
8989
Serial.println(" Done");
9090

91-
Serial.print("Starting Acceleration calibration...");
91+
Serial.print("Starting Acceleration calibration and enabling offset compensation...");
9292
CurieIMU.autoCalibrateAccelerometerOffset(X_AXIS, 0);
9393
CurieIMU.autoCalibrateAccelerometerOffset(Y_AXIS, 0);
9494
CurieIMU.autoCalibrateAccelerometerOffset(Z_AXIS, 1);
@@ -106,13 +106,6 @@ void setup() {
106106
Serial.print(CurieIMU.getGyroOffset(Y_AXIS));
107107
Serial.print("\t"); // 0
108108
Serial.println(CurieIMU.getGyroOffset(Z_AXIS));
109-
110-
Serial.println("Enabling Gyroscope/Acceleration offset compensation");
111-
CurieIMU.enableGyroOffset(true);
112-
CurieIMU.enableAccelerometerOffset(true);
113-
114-
Serial.println(CurieIMU.accelerometerOffsetEnabled());
115-
Serial.println(CurieIMU.gyroOffsetEnabled());
116109
}
117110

118111
// configure Arduino LED for activity indicator

‎libraries/CurieIMU/examples/ShockDetect/ShockDetect.ino‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ void setup() {
3434
CurieIMU.attachInterrupt(eventCallback);
3535

3636
/* Enable Shock Detection */
37-
CurieIMU.setDetectionThreshold(CURIE_IMU_SHOCK, 192); // 1.5g
38-
CurieIMU.setDetectionDuration(CURIE_IMU_SHOCK, CURIE_IMU_TAP_SHOCK_DURATION_50MS); // 50ms
39-
CurieIMU.enableInterrupt(CURIE_IMU_SHOCK, true);
37+
CurieIMU.setDetectionThreshold(CURIE_IMU_SHOCK, 1500); // 1.5g = 1500 mg
38+
CurieIMU.setDetectionDuration(CURIE_IMU_SHOCK, 50); // 50ms
39+
CurieIMU.interrupts(CURIE_IMU_SHOCK);
4040

4141
Serial.println("IMU initialisation complete, waiting for events...");
4242
}

‎libraries/CurieIMU/examples/StepCount/StepCount.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void setup() {
5252
// attach the eventCallback function as the
5353
// step event handler:
5454
CurieIMU.attachInterrupt(eventCallback);
55-
CurieIMU.enableInterrupt(CURIE_IMU_STEP, true); // turn on step detection
55+
CurieIMU.interrupts(CURIE_IMU_STEP); // turn on step detection
5656

5757
Serial.println("IMU initialisation complete, waiting for events...");
5858
}

‎libraries/CurieIMU/examples/TapDetect/TapDetect.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ void setup() {
3232
CurieIMU.attachInterrupt(eventCallback);
3333

3434
// Increase Accelerometer range to allow detection of stronger taps (< 4g)
35-
CurieIMU.setAccelerometerRange(CURIE_IMU_ACCELEROMETER_RANGE_4G);
35+
CurieIMU.setAccelerometerRange(4);
3636

3737
// Reduce threshold to allow detection of weaker taps (>= 750mg)
38-
CurieIMU.setDetectionThreshold(CURIE_IMU_TAP, 6); // (6 x 125mg)
38+
CurieIMU.setDetectionThreshold(CURIE_IMU_TAP, 750); // (750mg)
3939

4040
// Set the time window for 2 taps to be registered as a double-tap (<= 250 milliseconds)
41-
CurieIMU.setDetectionDuration(CURIE_IMU_DOUBLE_TAP, CURIE_IMU_DOUBLE_TAP_DURATION_250MS);
41+
CurieIMU.setDetectionDuration(CURIE_IMU_DOUBLE_TAP, 250);
4242

4343
// Enable Double-Tap detection
44-
CurieIMU.enableInterrupt(CURIE_IMU_DOUBLE_TAP, true);
44+
CurieIMU.interrupts(CURIE_IMU_DOUBLE_TAP);
4545

4646
Serial.println("IMU initialisation complete, waiting for events...");
4747
}

‎libraries/CurieIMU/keywords.txt‎

Lines changed: 23 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ setAccelerometerRange KEYWORD1
2727
autoCalibrateGyroOffset KEYWORD1
2828
autoCalibrateAccelerometerOffset KEYWORD1
2929

30-
enableGyroOffset KEYWORD1
31-
enableAccelerometerOffset KEYWORD1
30+
noGyroOffset KEYWORD1
31+
noAccelerometerOffset KEYWORD1
3232
gyroOffsetEnabled KEYWORD1
3333
accelerometerOffsetEnabled KEYWORD1
3434

@@ -44,8 +44,9 @@ setDetectionThreshold KEYWORD1
4444
getDetectionDuration KEYWORD1
4545
setDetectionDuration KEYWORD1
4646

47-
enableInterrupt KEYWORD1
48-
interruptEnabled KEYWORD1
47+
interrupts KEYWORD1
48+
noInterrupts KEYWORD1
49+
interruptsEnabled KEYWORD1
4950

5051
getInterruptBits KEYWORD1
5152
getInterruptStatus KEYWORD1
@@ -80,111 +81,26 @@ CurieIMU KEYWORD2
8081
# Constants (LITERAL1)
8182
#######################################
8283

83-
CURIE_IMU_ACCELEROMETER_RATE_25_2HZ LITERAL1
84-
CURIE_IMU_ACCELEROMETER_RATE_25HZ LITERAL1
85-
CURIE_IMU_ACCELEROMETER_RATE_50HZ LITERAL1
86-
CURIE_IMU_ACCELEROMETER_RATE_100HZ LITERAL1
87-
CURIE_IMU_ACCELEROMETER_RATE_200HZ LITERAL1
88-
CURIE_IMU_ACCELEROMETER_RATE_400HZ LITERAL1
89-
CURIE_IMU_ACCELEROMETER_RATE_800HZ LITERAL1
90-
CURIE_IMU_ACCELEROMETER_RATE_1600HZ LITERAL1
91-
92-
CURIE_IMU_GYRO_RATE_25HZ LITERAL1
93-
CURIE_IMU_GYRO_RATE_50HZ LITERAL1
94-
CURIE_IMU_GYRO_RATE_100HZ LITERAL1
95-
CURIE_IMU_GYRO_RATE_200HZ LITERAL1
96-
CURIE_IMU_GYRO_RATE_400HZ LITERAL1
97-
CURIE_IMU_GYRO_RATE_800HZ LITERAL1
98-
CURIE_IMU_GYRO_RATE_1600HZ LITERAL1
99-
CURIE_IMU_GYRO_RATE_3200HZ LITERAL1
100-
101-
CURIE_IMU_GYRO_RANGE_2000 LITERAL1
102-
CURIE_IMU_GYRO_RANGE_1000 LITERAL1
103-
CURIE_IMU_GYRO_RANGE_500 LITERAL1
104-
CURIE_IMU_GYRO_RANGE_250 LITERAL1
105-
CURIE_IMU_GYRO_RANGE_125 LITERAL1
106-
107-
CURIE_IMU_ACCELEROMETER_RANGE_2G LITERAL1
108-
CURIE_IMU_ACCELEROMETER_RANGE_4G LITERAL1
109-
CURIE_IMU_ACCELEROMETER_RANGE_8G LITERAL1
110-
CURIE_IMU_ACCELEROMETER_RANGE_16G LITERAL1
84+
X_AXIS LITERAL1
85+
Y_AXIS LITERAL1
86+
Z_AXIS LITERAL1
87+
88+
POSITIVE LITERAL1
89+
NEGATIVE LITERAL1
90+
91+
CURIE_IMU_FREEFALL LITERAL1
92+
CURIE_IMU_SHOCK LITERAL1
93+
CURIE_IMU_MOTION LITERAL1
94+
CURIE_IMU_ZERO_MOTION LITERAL1
95+
CURIE_IMU_STEP LITERAL1
96+
CURIE_IMU_TAP LITERAL1
97+
CURIE_IMU_TAP_SHOCK LITERAL1
98+
CURIE_IMU_TAP_QUIET LITERAL1
99+
CURIE_IMU_DOUBLE_TAP LITERAL1
100+
CURIE_IMU_FIFO_FULL LITERAL1
101+
CURIE_IMU_DATA_READY LITERAL1
111102

112103
CURIE_IMU_STEP_MODE_NORMAL LITERAL1
113104
CURIE_IMU_STEP_MODE_SENSITIVE LITERAL1
114105
CURIE_IMU_STEP_MODE_ROBUST LITERAL1
115106
CURIE_IMU_STEP_MODE_UNKNOWN LITERAL1
116-
117-
CURIE_IMU_DOUBLE_TAP_DURATION_50MS LITERAL1
118-
CURIE_IMU_DOUBLE_TAP_DURATION_100MS LITERAL1
119-
CURIE_IMU_DOUBLE_TAP_DURATION_150MS LITERAL1
120-
CURIE_IMU_DOUBLE_TAP_DURATION_200MS LITERAL1
121-
CURIE_IMU_DOUBLE_TAP_DURATION_250MS LITERAL1
122-
CURIE_IMU_DOUBLE_TAP_DURATION_375MS LITERAL1
123-
CURIE_IMU_DOUBLE_TAP_DURATION_500MS LITERAL1
124-
CURIE_IMU_DOUBLE_TAP_DURATION_700MS LITERAL1
125-
126-
127-
CURIE_IMU_ZERO_MOTION_DURATION_1_28S LITERAL1
128-
CURIE_IMU_ZERO_MOTION_DURATION_2_56S LITERAL1
129-
CURIE_IMU_ZERO_MOTION_DURATION_3_84S LITERAL1
130-
CURIE_IMU_ZERO_MOTION_DURATION_5_12S LITERAL1
131-
CURIE_IMU_ZERO_MOTION_DURATION_6_40S LITERAL1
132-
CURIE_IMU_ZERO_MOTION_DURATION_7_68S LITERAL1
133-
CURIE_IMU_ZERO_MOTION_DURATION_8_96S LITERAL1
134-
CURIE_IMU_ZERO_MOTION_DURATION_10_24S LITERAL1
135-
CURIE_IMU_ZERO_MOTION_DURATION_11_52S LITERAL1
136-
CURIE_IMU_ZERO_MOTION_DURATION_12_80S LITERAL1
137-
CURIE_IMU_ZERO_MOTION_DURATION_14_08S LITERAL1
138-
CURIE_IMU_ZERO_MOTION_DURATION_15_36S LITERAL1
139-
CURIE_IMU_ZERO_MOTION_DURATION_16_64S LITERAL1
140-
CURIE_IMU_ZERO_MOTION_DURATION_17_92S LITERAL1
141-
CURIE_IMU_ZERO_MOTION_DURATION_19_20S LITERAL1
142-
CURIE_IMU_ZERO_MOTION_DURATION_20_48S LITERAL1
143-
CURIE_IMU_ZERO_MOTION_DURATION_25_60S LITERAL1
144-
CURIE_IMU_ZERO_MOTION_DURATION_30_72S LITERAL1
145-
CURIE_IMU_ZERO_MOTION_DURATION_35_84S LITERAL1
146-
CURIE_IMU_ZERO_MOTION_DURATION_40_96S LITERAL1
147-
CURIE_IMU_ZERO_MOTION_DURATION_46_08S LITERAL1
148-
CURIE_IMU_ZERO_MOTION_DURATION_51_20S LITERAL1
149-
CURIE_IMU_ZERO_MOTION_DURATION_56_32S LITERAL1
150-
CURIE_IMU_ZERO_MOTION_DURATION_61_44S LITERAL1
151-
CURIE_IMU_ZERO_MOTION_DURATION_66_56S LITERAL1
152-
CURIE_IMU_ZERO_MOTION_DURATION_71_68S LITERAL1
153-
CURIE_IMU_ZERO_MOTION_DURATION_76_80S LITERAL1
154-
CURIE_IMU_ZERO_MOTION_DURATION_81_92S LITERAL1
155-
CURIE_IMU_ZERO_MOTION_DURATION_87_04S LITERAL1
156-
CURIE_IMU_ZERO_MOTION_DURATION_92_16S LITERAL1
157-
CURIE_IMU_ZERO_MOTION_DURATION_97_28S LITERAL1
158-
CURIE_IMU_ZERO_MOTION_DURATION_102_40S LITERAL1
159-
CURIE_IMU_ZERO_MOTION_DURATION_112_64S LITERAL1
160-
CURIE_IMU_ZERO_MOTION_DURATION_122_88S LITERAL1
161-
CURIE_IMU_ZERO_MOTION_DURATION_133_12S LITERAL1
162-
CURIE_IMU_ZERO_MOTION_DURATION_143_36S LITERAL1
163-
CURIE_IMU_ZERO_MOTION_DURATION_153_60S LITERAL1
164-
CURIE_IMU_ZERO_MOTION_DURATION_163_84S LITERAL1
165-
CURIE_IMU_ZERO_MOTION_DURATION_174_08S LITERAL1
166-
CURIE_IMU_ZERO_MOTION_DURATION_184_32S LITERAL1
167-
CURIE_IMU_ZERO_MOTION_DURATION_194_56S LITERAL1
168-
CURIE_IMU_ZERO_MOTION_DURATION_204_80S LITERAL1
169-
CURIE_IMU_ZERO_MOTION_DURATION_215_04S LITERAL1
170-
CURIE_IMU_ZERO_MOTION_DURATION_225_28S LITERAL1
171-
CURIE_IMU_ZERO_MOTION_DURATION_235_52S LITERAL1
172-
CURIE_IMU_ZERO_MOTION_DURATION_245_76S LITERAL1
173-
CURIE_IMU_ZERO_MOTION_DURATION_256_00S LITERAL1
174-
CURIE_IMU_ZERO_MOTION_DURATION_266_24S LITERAL1
175-
CURIE_IMU_ZERO_MOTION_DURATION_276_48S LITERAL1
176-
CURIE_IMU_ZERO_MOTION_DURATION_286_72S LITERAL1
177-
CURIE_IMU_ZERO_MOTION_DURATION_296_96S LITERAL1
178-
CURIE_IMU_ZERO_MOTION_DURATION_307_20S LITERAL1
179-
CURIE_IMU_ZERO_MOTION_DURATION_317_44S LITERAL1
180-
CURIE_IMU_ZERO_MOTION_DURATION_327_68S LITERAL1
181-
CURIE_IMU_ZERO_MOTION_DURATION_337_92S LITERAL1
182-
CURIE_IMU_ZERO_MOTION_DURATION_348_16S LITERAL1
183-
CURIE_IMU_ZERO_MOTION_DURATION_358_40S LITERAL1
184-
CURIE_IMU_ZERO_MOTION_DURATION_368_64S LITERAL1
185-
CURIE_IMU_ZERO_MOTION_DURATION_378_88S LITERAL1
186-
CURIE_IMU_ZERO_MOTION_DURATION_389_12S LITERAL1
187-
CURIE_IMU_ZERO_MOTION_DURATION_399_36S LITERAL1
188-
CURIE_IMU_ZERO_MOTION_DURATION_409_60S LITERAL1
189-
CURIE_IMU_ZERO_MOTION_DURATION_419_84S LITERAL1
190-
CURIE_IMU_ZERO_MOTION_DURATION_430_08S LITERAL1

0 commit comments

Comments
 (0)