Skip to content

Commit d111f78

Browse files
authored
Merge pull request #7 from caternuson/iss4
change property names
2 parents 584016d + 34b879b commit d111f78

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

adafruit_lsm9ds0.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ def read_accel_raw(self):
264264
return (raw_x, raw_y, raw_z)
265265

266266
@property
267-
def accelerometer(self):
267+
def acceleration(self):
268268
"""The accelerometer X, Y, Z axis values as a 3-tuple of
269269
m/s^2 values.
270270
"""
@@ -285,7 +285,7 @@ def read_mag_raw(self):
285285
return (raw_x, raw_y, raw_z)
286286

287287
@property
288-
def magnetometer(self):
288+
def magnetic(self):
289289
"""The magnetometer X, Y, Z axis values as a 3-tuple of
290290
gauss values.
291291
"""
@@ -305,7 +305,7 @@ def read_gyro_raw(self):
305305
return (raw_x, raw_y, raw_z)
306306

307307
@property
308-
def gyroscope(self):
308+
def gyro(self):
309309
"""The gyroscope X, Y, Z axis values as a 3-tuple of
310310
degrees/second values.
311311
"""

examples/lsm9ds0_simpletest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
# values every second and print them out.
1717
while True:
1818
# Read acceleration, magnetometer, gyroscope, temperature.
19-
accel_x, accel_y, accel_z = sensor.accelerometer
20-
mag_x, mag_y, mag_z = sensor.magnetometer
21-
gyro_x, gyro_y, gyro_z = sensor.gyroscope
19+
accel_x, accel_y, accel_z = sensor.acceleration
20+
mag_x, mag_y, mag_z = sensor.magnetic
21+
gyro_x, gyro_y, gyro_z = sensor.gyro
2222
temp = sensor.temperature
2323
# Print values.
2424
print('Acceleration (m/s^2): ({0:0.3f},{1:0.3f},{2:0.3f})'.format(accel_x, accel_y, accel_z))

0 commit comments

Comments
 (0)