Skip to content

Commit

Permalink
Merge pull request #3 from sommersoft/new_docs
Browse files Browse the repository at this point in the history
Improve Ref Docs
  • Loading branch information
tannewt authored Mar 5, 2018
2 parents dfbbede + 590495d commit f78e1c7
Show file tree
Hide file tree
Showing 9 changed files with 139 additions and 14 deletions.
File renamed without changes.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@ deploy:
provider: releases
api_key: $GITHUB_TOKEN
file_glob: true
file: bundles/*
file: $TRAVIS_BUILD_DIR/bundles/*
skip_cleanup: true
overwrite: true
on:
tags: true

install:
- pip install pylint circuitpython-build-tools
- pip install pylint circuitpython-build-tools Sphinx sphinx-rtd-theme

script:
- pylint adafruit_vc0706.py
- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py)
- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-vc0706 --library_location .
- cd docs && sphinx-build -E -W -b html . _build/html
58 changes: 50 additions & 8 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ Introduction
:target: https://discord.gg/nBQh6qu
:alt: Discord
VC0706 serial TTL camera module. Allows basic image capture and download of
image data from the camera over a serial connection. See examples for demo
of saving image to a SD card (must be wired up separately).
.. image:: https://travis-ci.org/adafruit/Adafruit_CircuitPython_VC0706.svg?branch=master
:target: https://travis-ci.org/adafruit/Adafruit_CircuitPython_VC0706
:alt: Build Status

CircuitPython module for use with the `VC0706 serial TTL camera <https://www.adafruit.com/product/397>`_. Allows basic image capture and download of image data from the camera over a serial connection. See examples for demo
of saving image to a SD card (must be wired up separately) or internally.

Dependencies
=============
Expand All @@ -36,10 +39,49 @@ Contributions are welcome! Please read our `Code of Conduct
<https://github.com/adafruit/Adafruit_CircuitPython_vc0706/blob/master/CODE_OF_CONDUCT.md>`_
before contributing to help this project stay welcoming.

API Reference
=============
Building locally
================

To build this library locally you'll need to install the
`circuitpython-build-tools <https://github.com/adafruit/circuitpython-build-tools>`_ package.

.. code-block:: shell
python3 -m venv .env
source .env/bin/activate
pip install circuitpython-build-tools
Once installed, make sure you are in the virtual environment:

.. code-block:: shell
source .env/bin/activate
Then run the build:

.. code-block:: shell
circuitpython-build-bundles --filename_prefix adafruit-circuitpython-vc0706 --library_location .
Sphinx documentation
-----------------------

Sphinx is used to build the documentation based on rST files and comments in the code. First,
install dependencies (feel free to reuse the virtual environment from above):

.. code-block:: shell
python3 -m venv .env
source .env/bin/activate
pip install Sphinx sphinx-rtd-theme
Now, once you have the virtual environment activated:

.. code-block:: shell
.. toctree::
:maxdepth: 2
cd docs
sphinx-build -E -W -b html . _build/html
api
This will output the documentation to ``docs/_build/html``. Open the index.html in your browser to
view them. It will also (due to -W) error out on any warning like Travis will. This is a good way to
locally verify it will pass.
13 changes: 13 additions & 0 deletions adafruit_vc0706.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,19 @@
of saving image to a SD card (must be wired up separately).
* Author(s): Tony DiCola
Implementation Notes
--------------------
**Hardware:**
* Adafruit `TTL Serial JPEG Camera with NTSC Video
<https://www.adafruit.com/product/397>`_ (Product ID: 397)
**Software and Dependencies:**
* Adafruit CircuitPython firmware for the ESP8622 and M0-based boards:
https://github.com/adafruit/circuitpython/releases
"""
import busio
from micropython import const
Expand Down
Binary file added docs/_static/favicon.ico
Binary file not shown.
File renamed without changes.
17 changes: 13 additions & 4 deletions conf.py → docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import os
import sys
sys.path.insert(0, os.path.abspath('.'))
sys.path.insert(0, os.path.abspath('..'))

# -- General configuration ------------------------------------------------

Expand All @@ -28,7 +28,7 @@
source_suffix = '.rst'

# The master toctree document.
master_doc = 'README'
master_doc = 'index'

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

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

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


# -- Options for HTML output ----------------------------------------------

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

# The name of an image file (relative to this directory) to use as a favicon of
# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
#
html_favicon = '_static/favicon.ico'

# Output file base name for HTML help builder.
htmlhelp_basename = 'AdafruitVC0706Librarydoc'

Expand Down Expand Up @@ -131,7 +140,7 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
(master_doc, 'adafruitVC0706library', u'Adafruit VC0706 Library Documentation',
(master_doc, 'AdafruitVC0706library', u'Adafruit VC0706 Library Documentation',
[author], 1)
]

Expand Down
12 changes: 12 additions & 0 deletions docs/examples.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Simple test
------------

Ensure your device works with this simple test.

.. literalinclude:: ../examples/snapshot_internal.py
:caption: examples/snapshot_internal.py
:linenos:

.. literalinclude:: ../examples/snapshot.py
:caption: examples/snapshot.py
:linenos:
47 changes: 47 additions & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
.. include:: ../README.rst

Table of Contents
=================

.. toctree::
:maxdepth: 4
:hidden:

self

.. toctree::
:caption: Examples

examples

.. toctree::
:caption: API Reference
:maxdepth: 3

api

.. toctree::
:caption: Tutorials

.. toctree::
:caption: Related Products

TTL Serial JPEG Camera with NTSC Video <https://www.adafruit.com/product/397>

.. toctree::
:caption: Other Links

Download <https://github.com/adafruit/Adafruit_CircuitPython_VC0706/releases/latest>
CircuitPython Reference Documentation <https://circuitpython.readthedocs.io>
CircuitPython Support Forum <https://forums.adafruit.com/viewforum.php?f=60>
Discord Chat <https://adafru.it/discord>
Adafruit Learning System <https://learn.adafruit.com>
Adafruit Blog <https://blog.adafruit.com>
Adafruit Store <https://www.adafruit.com>

Indices and tables
==================

* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`

0 comments on commit f78e1c7

Please sign in to comment.