doc: Separate common settings

This commit is contained in:
Laurens Valk
2019-04-19 16:45:12 +02:00
parent 1a4cdfaf50
commit 6278f2410d
75 changed files with 39 additions and 93 deletions
+3 -3
View File
@@ -5,8 +5,8 @@
SPHINXOPTS = -W
SPHINXBUILD = sphinx-build
SPHINXPROJ = Pybricks
SOURCEDIR = source
BUILDDIR = build
SOURCEDIR = ev3dev
BUILDDIR = "$(SOURCEDIR)"/build
# Put it first so that "make" without argument is like "make help".
help:
@@ -17,5 +17,5 @@ help:
# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(MAKE) -C source/_images `[ "$@" = "clean" ] && echo clean || echo all`
@$(MAKE) -C "$(SOURCEDIR)"/_images `[ "$@" = "clean" ] && echo clean || echo all`
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+4 -4
View File
@@ -44,7 +44,7 @@ extensions = [
]
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
templates_path = ['../common/_templates']
# The suffix(es) of source filenames.
# You can specify multiple suffix as a list of string:
@@ -134,7 +134,7 @@ else:
'disclaimer': _DISCLAIMER,
}
html_logo = 'images/pybricks-logo-small.png'
html_logo = '../common/images/pybricks-logo-small.png'
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
@@ -152,7 +152,7 @@ html_theme_options = {
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
html_static_path = ['../common/_static']
# Custom sidebar templates, must be a dictionary that maps document names
# to template names.
@@ -224,7 +224,7 @@ latex_documents = [
(master_doc, ''.join([project, '-v', version, '.tex']), _TITLE, author, 'manual'),
]
latex_logo = 'images/pybricks-logo-large.png'
latex_logo = '../common/images/pybricks-logo-large.png'
# -- Options for manual page output ---------------------------------------

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

+15
View File
@@ -0,0 +1,15 @@
SRC_DIR = .
OUT_DIR = ../images
SVG := $(wildcard $(SRC_DIR)/*.svg)
PNG := $(patsubst $(SRC_DIR)/%.svg,$(OUT_DIR)/%.png,$(SVG))
DIR := ${CURDIR}
all: $(PNG)
clean:
rm -f $(PNG)
$(OUT_DIR)/%.png: $(SRC_DIR)/%.svg
inkscape --file=$(DIR)/$< --export-area-drawing --export-png=$(DIR)/$@

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 52 KiB

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 109 KiB

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

Before

Width:  |  Height:  |  Size: 116 KiB

After

Width:  |  Height:  |  Size: 116 KiB

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 81 KiB

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 86 KiB

Before

Width:  |  Height:  |  Size: 87 KiB

After

Width:  |  Height:  |  Size: 87 KiB

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

+8
View File
@@ -0,0 +1,8 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# Pybricks documentation build configuration file
#
import os
import sys
exec(open(os.path.abspath("../common/conf.py")).read())
+3
View File
@@ -0,0 +1,3 @@
*.png
!pybricks-logo-large.png
!pybricks-logo-small.png

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 49 KiB

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 53 KiB

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 70 KiB

+4
View File
@@ -0,0 +1,4 @@
:mod:`robotics` -- Robotics module
===========================================
.. automodule:: robotics
+1
View File
@@ -0,0 +1 @@
.. include:: ../common/signaltypes.rst
+1
View File
@@ -0,0 +1 @@
.. include:: ../common/tools.rst
-86
View File
@@ -1,86 +0,0 @@
Motor Essentials
=====================
Intro
Encoded Motors
----------------
.. _duty:
Duty cycle
^^^^^^^^^^
TODO
Angle encoder
^^^^^^^^^^^^^
TODO
.. _ratio:
Gear ratio
^^^^^^^^^^
TODO
::
Example for one gear train: gears=[12, 36]
____________
| |
| motor |
|____________|
||
|| 12t 36t
|||||| ||||||||||||||
||
||
output axle
Example with multiple gear trains: gears=[[12, 20, 36], [20, 40], [20, 8, 40]]
_____________
| |
| motor |
|____________|
||
|| 12t 20t 36t
|||||| ||||||||||| ||||||||||||||
||
||
|||||||| |||||||||||||||||
20t || 40t
||
|||||||| ||| |||||||||||||||||
20t 8t || 40t
||
output axle
.. _maneuvers:
Motor maneuvers
---------------
Reference signal
^^^^^^^^^^^^^^^^
Automatic control
^^^^^^^^^^^^^^^^^
.. _pid:
PID Parameters
^^^^^^^^^^^^^^
TODO
.. _defaultpars:
Default motor parameters
------------------------
TODO