Skip to content

Commit f88b765

Browse files
authored
Merge pull request #3 from sommersoft/new_docs
Improve Ref Docs
2 parents 50684f4 + c3fc3cd commit f88b765

10 files changed

+148
-20
lines changed
File renamed without changes.

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ deploy:
1616
provider: releases
1717
api_key: $GITHUB_TOKEN
1818
file_glob: true
19-
file: bundles/*
19+
file: $TRAVIS_BUILD_DIR/bundles/*
2020
skip_cleanup: true
21+
overwrite: true
2122
on:
2223
tags: true
2324

2425
install:
25-
- pip install pylint circuitpython-build-tools
26+
- pip install pylint circuitpython-build-tools Sphinx sphinx-rtd-theme
2627

2728
script:
2829
- pylint adafruit_lsm9ds0.py
2930
- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py)
3031
- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-lsm9ds0 --library_location .
32+
- cd docs && sphinx-build -E -W -b html . _build/html

README.rst

Lines changed: 49 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ Introduction
1010
:target: https://discord.gg/nBQh6qu
1111
:alt: Discord
1212
13+
.. image:: https://travis-ci.org/adafruit/Adafruit_CircuitPython_LSM9DS0.svg?branch=master
14+
:target: https://travis-ci.org/adafruit/Adafruit_CircuitPython_LSM9DS0
15+
:alt: Build Status
16+
1317
CircuitPython module for the LSM9DS0 accelerometer, magnetometer, gyroscope.
1418

1519
Dependencies
@@ -26,7 +30,7 @@ This is easily achieved by downloading
2630
Usage Example
2731
=============
2832

29-
See examples/simpletest.py for a demo of the usage.
33+
See examples/lsm9ds0_simpletest.py for a demo of the usage.
3034

3135
Contributing
3236
============
@@ -35,10 +39,49 @@ Contributions are welcome! Please read our `Code of Conduct
3539
<https://github.com/adafruit/Adafruit_CircuitPython_lsm9ds0/blob/master/CODE_OF_CONDUCT.md>`_
3640
before contributing to help this project stay welcoming.
3741

38-
API Reference
39-
=============
42+
Building locally
43+
================
44+
45+
To build this library locally you'll need to install the
46+
`circuitpython-build-tools <https://github.com/adafruit/circuitpython-build-tools>`_ package.
47+
48+
.. code-block:: shell
49+
50+
python3 -m venv .env
51+
source .env/bin/activate
52+
pip install circuitpython-build-tools
53+
54+
Once installed, make sure you are in the virtual environment:
55+
56+
.. code-block:: shell
57+
58+
source .env/bin/activate
59+
60+
Then run the build:
61+
62+
.. code-block:: shell
63+
64+
circuitpython-build-bundles --filename_prefix adafruit-circuitpython-lsm9ds0 --library_location .
65+
66+
Sphinx documentation
67+
-----------------------
68+
69+
Sphinx is used to build the documentation based on rST files and comments in the code. First,
70+
install dependencies (feel free to reuse the virtual environment from above):
71+
72+
.. code-block:: shell
73+
74+
python3 -m venv .env
75+
source .env/bin/activate
76+
pip install Sphinx sphinx-rtd-theme
77+
78+
Now, once you have the virtual environment activated:
79+
80+
.. code-block:: shell
4081
41-
.. toctree::
42-
:maxdepth: 2
82+
cd docs
83+
sphinx-build -E -W -b html . _build/html
4384
44-
api
85+
This will output the documentation to ``docs/_build/html``. Open the index.html in your browser to
86+
view them. It will also (due to -W) error out on any warning like Travis will. This is a good way to
87+
locally verify it will pass.

adafruit_lsm9ds0.py

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,28 @@
2525
2626
CircuitPython module for the LSM9DS0 accelerometer, magnetometer, gyroscope.
2727
Based on the driver from:
28-
https://github.com/adafruit/Adafruit_LSM9DS0
28+
https://github.com/adafruit/Adafruit_LSM9DS0
2929
3030
See examples/simpletest.py for a demo of the usage.
3131
3232
* Author(s): Tony DiCola
33+
34+
Implementation Notes
35+
--------------------
36+
37+
**Hardware:**
38+
39+
* Adafruit `9-DOF Accel/Mag/Gyro+Temp Breakout Board - LSM9DS0
40+
<https://www.adafruit.com/product/2021>`_ (Product ID: 2021)
41+
42+
* FLORA `9-DOF Accelerometer/Gyroscope/Magnetometer - LSM9DS0
43+
<https://www.adafruit.com/product/2020>`_ (Product ID: 2020)
44+
45+
**Software and Dependencies:**
46+
47+
* Adafruit CircuitPython firmware for the ESP8622 and M0-based boards:
48+
https://github.com/adafruit/circuitpython/releases
49+
* Adafruit's Bus Device library: https://github.com/adafruit/Adafruit_CircuitPython_BusDevice
3350
"""
3451
try:
3552
import struct
@@ -153,7 +170,7 @@ def __init__(self):
153170

154171
@property
155172
def accel_range(self):
156-
"""Get and set the accelerometer range. Must be a value of:
173+
"""The accelerometer range. Must be a value of:
157174
- ACCELRANGE_2G
158175
- ACCELRANGE_4G
159176
- ACCELRANGE_6G
@@ -184,7 +201,7 @@ def accel_range(self, val):
184201

185202
@property
186203
def mag_gain(self):
187-
"""Get and set the magnetometer gain. Must be a value of:
204+
"""The magnetometer gain. Must be a value of:
188205
- MAGGAIN_2GAUSS
189206
- MAGGAIN_4GAUSS
190207
- MAGGAIN_8GAUSS
@@ -212,7 +229,7 @@ def mag_gain(self, val):
212229

213230
@property
214231
def gyro_scale(self):
215-
"""Get and set the gyroscope scale. Must be a value of:
232+
"""The gyroscope scale. Must be a value of:
216233
- GYROSCALE_245DPS
217234
- GYROSCALE_500DPS
218235
- GYROSCALE_2000DPS
@@ -248,7 +265,7 @@ def read_accel_raw(self):
248265

249266
@property
250267
def accelerometer(self):
251-
"""Get the accelerometer X, Y, Z axis values as a 3-tuple of
268+
"""The accelerometer X, Y, Z axis values as a 3-tuple of
252269
m/s^2 values.
253270
"""
254271
raw = self.read_accel_raw()
@@ -269,7 +286,7 @@ def read_mag_raw(self):
269286

270287
@property
271288
def magnetometer(self):
272-
"""Get the magnetometer X, Y, Z axis values as a 3-tuple of
289+
"""The magnetometer X, Y, Z axis values as a 3-tuple of
273290
gauss values.
274291
"""
275292
raw = self.read_mag_raw()
@@ -289,7 +306,7 @@ def read_gyro_raw(self):
289306

290307
@property
291308
def gyroscope(self):
292-
"""Get the gyroscope X, Y, Z axis values as a 3-tuple of
309+
"""The gyroscope X, Y, Z axis values as a 3-tuple of
293310
degrees/second values.
294311
"""
295312
raw = self.read_mag_raw()
@@ -308,7 +325,7 @@ def read_temp_raw(self):
308325

309326
@property
310327
def temperature(self):
311-
"""Get the temperature of the sensor in degrees Celsius."""
328+
"""The temperature of the sensor in degrees Celsius."""
312329
# This is just a guess since the starting point (21C here) isn't documented :(
313330
temp = self.read_temp_raw()
314331
temp = 21.0 + temp/8

docs/_static/favicon.ico

4.31 KB
Binary file not shown.

api.rst renamed to docs/api.rst

File renamed without changes.

conf.py renamed to docs/conf.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import os
44
import sys
5-
sys.path.insert(0, os.path.abspath('.'))
5+
sys.path.insert(0, os.path.abspath('..'))
66

77
# -- General configuration ------------------------------------------------
88

@@ -20,15 +20,15 @@
2020
# autodoc module docs will fail to generate with a warning.
2121
autodoc_mock_imports = ["adafruit_bus_device", "micropython"]
2222

23-
intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'BusDevice': ('https://circuitpython.readthedocs.io/projects/bus_device/en/latest/', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)}
23+
intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'BusDevice': ('https://circuitpython.readthedocs.io/projects/busdevice/en/latest/', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)}
2424

2525
# Add any paths that contain templates here, relative to this directory.
2626
templates_path = ['_templates']
2727

2828
source_suffix = '.rst'
2929

3030
# The master toctree document.
31-
master_doc = 'README'
31+
master_doc = 'index'
3232

3333
# General information about the project.
3434
project = u'Adafruit LSM9DS0 Library'
@@ -54,7 +54,7 @@
5454
# List of patterns, relative to source directory, that match files and
5555
# directories to ignore when looking for source files.
5656
# This patterns also effect to html_static_path and html_extra_path
57-
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
57+
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', '.env', 'CODE_OF_CONDUCT.md']
5858

5959
# The reST default role (used for this markup: `text`) to use for all
6060
# documents.
@@ -71,6 +71,9 @@
7171
# If true, `todo` and `todoList` produce output, else they produce nothing.
7272
todo_include_todos = False
7373

74+
# If this is True, todo emits a warning for each TODO entries. The default is False.
75+
todo_emit_warnings = True
76+
7477

7578
# -- Options for HTML output ----------------------------------------------
7679

@@ -95,6 +98,12 @@
9598
# so a file named "default.css" will overwrite the builtin "default.css".
9699
html_static_path = ['_static']
97100

101+
# The name of an image file (relative to this directory) to use as a favicon of
102+
# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
103+
# pixels large.
104+
#
105+
html_favicon = '_static/favicon.ico'
106+
98107
# Output file base name for HTML help builder.
99108
htmlhelp_basename = 'AdafruitLSM9DS0Librarydoc'
100109

docs/examples.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Simple test
2+
------------
3+
4+
Ensure your device works with this simple test.
5+
6+
.. literalinclude:: ../examples/lsm9ds0_simpletest.py
7+
:caption: examples/lsm9ds0_simpletest.py
8+
:linenos:

docs/index.rst

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
.. include:: ../README.rst
2+
3+
Table of Contents
4+
=================
5+
6+
.. toctree::
7+
:maxdepth: 4
8+
:hidden:
9+
10+
self
11+
12+
.. toctree::
13+
:caption: Examples
14+
15+
examples
16+
17+
.. toctree::
18+
:caption: API Reference
19+
:maxdepth: 3
20+
21+
api
22+
23+
.. toctree::
24+
:caption: Tutorials
25+
26+
.. toctree::
27+
:caption: Related Products
28+
29+
Adafruit 9-DOF Accel/Mag/Gyro+Temp Breakout Board - LSM9DS0 <https://www.adafruit.com/product/2021>
30+
31+
FLORA 9-DOF Accelerometer/Gyroscope/Magnetometer - LSM9DS0 <https://www.adafruit.com/product/2020>
32+
33+
.. toctree::
34+
:caption: Other Links
35+
36+
Download <https://github.com/adafruit/Adafruit_CircuitPython_LSM9DS0/releases/latest>
37+
CircuitPython Reference Documentation <https://circuitpython.readthedocs.io>
38+
CircuitPython Support Forum <https://forums.adafruit.com/viewforum.php?f=60>
39+
Discord Chat <https://adafru.it/discord>
40+
Adafruit Learning System <https://learn.adafruit.com>
41+
Adafruit Blog <https://blog.adafruit.com>
42+
Adafruit Store <https://www.adafruit.com>
43+
44+
Indices and tables
45+
==================
46+
47+
* :ref:`genindex`
48+
* :ref:`modindex`
49+
* :ref:`search`
File renamed without changes.

0 commit comments

Comments
 (0)