Skip to content

Commit 7f453d4

Browse files
AddedGyro
1 parent d5de8d9 commit 7f453d4

File tree

2 files changed

+32
-5
lines changed

2 files changed

+32
-5
lines changed

examples/Modulino_Movement/Basic/Basic.ino

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ ModulinoMovement movement;
55
float x;
66
float y;
77
float z;
8+
float gx;
9+
float gy;
10+
float gz;
811

912
void setup() {
1013
Serial.begin(9600);
@@ -19,11 +22,23 @@ void loop() {
1922
y = movement.getY();
2023
z = movement.getZ();
2124

25+
gx = movement.getGyroX();
26+
gy = movement.getGyroY();
27+
gz = movement.getGyroZ();
28+
2229
Serial.print("Movement data: ");
30+
2331
Serial.print("x ");
24-
Serial.print(x, 3);
32+
Serial.print(x,3);
2533
Serial.print(" y ");
26-
Serial.print(y, 3);
34+
Serial.print(y,3);
2735
Serial.print(" z ");
28-
Serial.println(z, 3);
36+
Serial.print(z,3);
37+
38+
Serial.print("\t\t gx ");
39+
Serial.print(gx,1);
40+
Serial.print(" |gy ");
41+
Serial.print(gy,1);
42+
Serial.print(" |gz ");
43+
Serial.println(gz,1);
2944
}

src/Modulino.h

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,13 +313,15 @@ class ModulinoMovement : public Module {
313313
}
314314
int update() {
315315
if (initialized) {
316-
return _imu->readAcceleration(x, y, z);
316+
int accel = _imu->readAcceleration(x, y, z);
317+
int gyro = _imu->readGyroscope(gx, gy, gz);
318+
return accel && gyro;
317319
}
318320
return 0;
319321
}
320322
int available() {
321323
if (initialized) {
322-
return _imu->accelerationAvailable();
324+
return _imu->accelerationAvailable() && _imu->gyroscopeAvailable();
323325
}
324326
return 0;
325327
}
@@ -332,9 +334,19 @@ class ModulinoMovement : public Module {
332334
float getZ() {
333335
return z;
334336
}
337+
float getGyroX() {
338+
return gx;
339+
}
340+
float getGyroY() {
341+
return gy;
342+
}
343+
float getGyroZ() {
344+
return gz;
345+
}
335346
private:
336347
LSM6DSOXClass* _imu = nullptr;
337348
float x,y,z;
349+
float gx,gy,gz;
338350
int initialized = 0;
339351
};
340352

0 commit comments

Comments
 (0)