Skip to content

Commit 24c910a

Browse files
authored
Merge pull request #33 from adafruit/lsm6ds33_fix
Lsm6ds33 fix
2 parents 01b42bc + e120468 commit 24c910a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+160
-7
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: MIT
4+
15
name: Build CI
26

37
on: [pull_request, push]

.github/workflows/release.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: MIT
4+
15
name: Release Actions
26

37
on:

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: Unlicense
4+
15
*.mpy
26
.idea
37
__pycache__
48
_build
59
*.pyc
610
.env
11+
.python-version
712
build*/
813
bundles
914
*.DS_Store

.pylintrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: Unlicense
4+
15
[MASTER]
26

37
# A comma-separated list of package or module names from where C extensions may

.readthedocs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: Unlicense
4+
15
python:
26
version: 3
37
requirements_file: requirements.txt

CODE_OF_CONDUCT.md

Lines changed: 6 additions & 0 deletions

README.rst

Lines changed: 5 additions & 1 deletion

README.rst.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: MIT

adafruit_clue.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# SPDX-FileCopyrightText: Copyright (c) 2020 Kattni Rembor for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: MIT
14
# The MIT License (MIT)
25
#
36
# Copyright (c) 2020 Kattni Rembor for Adafruit Industries
@@ -65,7 +68,7 @@
6568
import adafruit_apds9960.apds9960
6669
import adafruit_bmp280
6770
import adafruit_lis3mdl
68-
import adafruit_lsm6ds
71+
import adafruit_lsm6ds.lsm6ds33
6972
import adafruit_sht31d
7073
import audiobusio
7174
import audiopwmio
@@ -238,7 +241,7 @@ def __init__(self):
238241

239242
# Define sensors:
240243
# Accelerometer/gyroscope:
241-
self._accelerometer = adafruit_lsm6ds.LSM6DS33(self._i2c)
244+
self._accelerometer = adafruit_lsm6ds.lsm6ds33.LSM6DS33(self._i2c)
242245

243246
# Magnetometer:
244247
self._magnetometer = adafruit_lis3mdl.LIS3MDL(self._i2c)

disabled.pre-commit-config.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# SPDX-FileCopyrightText: 2020 Diego Elio Pettenò
2+
#
3+
# SPDX-License-Identifier: Unlicense
4+
5+
repos:
6+
- repo: https://github.com/python/black
7+
rev: 19.10b0
8+
hooks:
9+
- id: black
10+
- repo: https://github.com/fsfe/reuse-tool
11+
rev: latest
12+
hooks:
13+
- id: reuse
14+
- repo: https://github.com/pre-commit/pre-commit-hooks
15+
rev: v2.3.0
16+
hooks:
17+
- id: check-yaml
18+
- id: end-of-file-fixer
19+
- id: trailing-whitespace
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0

docs/_static/button_a.jpg.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0

docs/_static/button_b.jpg.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0

docs/_static/favicon.ico.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
SPDX-FileCopyrightText: 2018 Phillip Torrone for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0

docs/_static/humidity.jpg.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0

docs/_static/magnetometer.jpg.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0

docs/_static/microphone.jpg.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0

docs/_static/neopixel.jpg.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0

docs/_static/pad_0.jpg.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0

docs/_static/pad_1.jpg.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0

docs/_static/pad_2.jpg.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0

docs/_static/pressure.jpg.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0

docs/_static/proximity.jpg.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0

docs/_static/red_led.jpg.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0

docs/_static/speaker.jpg.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0

docs/_static/white_leds.jpg.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: CC-BY-4.0

docs/api.rst.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: MIT

docs/conf.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# -*- coding: utf-8 -*-
22

3+
# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
4+
#
5+
# SPDX-License-Identifier: MIT
6+
37
import os
48
import sys
59

docs/examples.rst.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: MIT

docs/index.rst.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
2+
3+
SPDX-License-Identifier: MIT

examples/advanced_examples/clue_ams_remote_advanced.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
from adafruit_ble.advertising.standard import SolicitServicesAdvertisement
1919
from adafruit_ble_apple_media import AppleMediaService
2020
from adafruit_ble_apple_media import UnsupportedCommand
21-
from adafruit_clue import clue
2221
from adafruit_bitmap_font import bitmap_font
2322
from adafruit_display_shapes.rect import Rect
23+
from adafruit_clue import clue
2424

2525

2626
# PyLint can't find BLERadio for some reason so special case it here.

examples/clue_ble_color_patchwork.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: Unlicense
14
"""
25
Circuit Python BLE Color Patchwork
36
This demo uses advertising to broadcast a color of the users choice.
@@ -11,10 +14,10 @@
1114
import displayio
1215
from adafruit_display_text import label
1316
import terminalio
14-
from adafruit_clue import clue
1517
from adafruit_ble import BLERadio
1618
from adafruit_ble.advertising.adafruit import AdafruitColor
1719
from adafruit_display_shapes.rect import Rect
20+
from adafruit_clue import clue
1821

1922
MODE_COLOR_SELECT = 0
2023
MODE_SHOW_PATCHWORK = 1

examples/clue_display_sensor_data.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: Unlicense
14
from adafruit_clue import clue
25

36
clue.sea_level_pressure = 1020

examples/clue_height_calculator.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: Unlicense
14
"""Calculate the height of an object. Press button A to reset initial height and then lift the
25
CLUE to find the height."""
36
from adafruit_clue import clue

examples/clue_simpletest.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: Unlicense
14
from adafruit_clue import clue
25

36
clue.sea_level_pressure = 1020

examples/clue_slideshow.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: Unlicense
14
"""Display a series of bitmaps using the buttons to advance through the list. To use: place
25
supported bitmap files on your CIRCUITPY drive, then press the buttons on your CLUE to advance
36
through them.
47
58
Requires the Adafruit CircuitPython Slideshow library!"""
69

7-
from adafruit_clue import clue
810
from adafruit_slideshow import SlideShow, PlayBackDirection
11+
from adafruit_clue import clue
912

1013
slideshow = SlideShow(clue.display, auto_advance=False)
1114

examples/clue_spirit_level.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
# SPDX-FileCopyrightText: 2019 Kattni Rembor, written for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: Unlicense
14
"""CLUE Spirit Level Demo"""
25
import board
36
import displayio
4-
from adafruit_clue import clue
57
from adafruit_display_shapes.circle import Circle
8+
from adafruit_clue import clue
69

710
display = board.DISPLAY
811
clue_group = displayio.Group(max_size=4)

pyproject.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# SPDX-FileCopyrightText: 2020 Diego Elio Pettenò
2+
#
3+
# SPDX-License-Identifier: Unlicense
4+
5+
[tool.black]
6+
target-version = ['py35']

requirements.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
2+
# SPDX-FileCopyrightText: Copyright (c) 2020 Kattni Rembor for Adafruit Industries
3+
#
4+
# SPDX-License-Identifier: MIT
5+
16
Adafruit-Blinka
27
adafruit-circuitpython-busdevice
38
adafruit-circuitpython-register

setup.py.disabled

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
2+
# SPDX-FileCopyrightText: Copyright (c) 2020 Kattni Rembor for Adafruit Industries
3+
#
4+
# SPDX-License-Identifier: MIT
15
"""
26
This library is not deployed to PyPI. It is either a board-specific helper library, or
37
does not make sense for use on or is incompatible with single board computers and Linux.

0 commit comments

Comments
 (0)