Skip to content

Commit

Permalink
Merge branch 'release/2.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
MaJerle committed Dec 7, 2019
2 parents 66865b3 + cfe31d0 commit 81dcae8
Show file tree
Hide file tree
Showing 69 changed files with 3,392 additions and 526 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@
*.sct
*.MajerleT
*.tjuln
*.tilen
*.dbgconf
*.uvguix
*.uvoptx
*.__i
*.i
*.txt
!docs/*.txt
RTE/

# IAR Settings
Expand Down Expand Up @@ -73,6 +75,7 @@ bld/
[Bb]in/
[Oo]bj/
[Ll]og/
_build/

# Visual Studio 2015/2017 cache/options directory
.vs/
Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "third_party/Embedded_Libs"]
path = third_party/Embedded_Libs
url = https://github.com/MaJerle/Embedded_Libs
[submodule "third_party/embedded-libs"]
path = third_party/embedded-libs
url = https://github.com/MaJerle/embedded-libs
3 changes: 2 additions & 1 deletion dev/VisualStudio/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "scan_devices.h"

/* Create new 1-Wire instance */
extern const ow_ll_drv_t ow_ll_drv_win32;
ow_t ow;
ow_rom_t rom_ids[20];
size_t rom_found;
Expand All @@ -17,7 +18,7 @@ int
main(void) {
printf("Starting OneWire application..\r\n");

ow_init(&ow, NULL); /* Initialize 1-Wire library and set user argument to 1 */
ow_init(&ow, &ow_ll_drv_win32, NULL); /* Initialize 1-Wire library and set user argument to 1 */

/* Get onewire devices connected on 1-wire port */
while (1) {
Expand Down
4 changes: 3 additions & 1 deletion dev/VisualStudio/ow_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* This file is part of OneWire library.
*
* Author: Tilen MAJERLE <tilen@majerle.eu>
* Version: v1.2.0
* Version: v2.0.0
*/
#ifndef OW_HDR_CONFIG_H
#define OW_HDR_CONFIG_H
Expand All @@ -38,6 +38,8 @@
extern "C" {
#endif /* __cplusplus */

#define OW_CFG_OS 1

#include "ow/ow_config_default.h"

#ifdef __cplusplus
Expand Down
20 changes: 20 additions & 0 deletions docs/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Minimal makefile for Sphinx documentation
#

# You can set these variables from the command line, and also
# from the environment for the first two.
SPHINXOPTS ?=
SPHINXBUILD ?= sphinx-build
SOURCEDIR = .
BUILDDIR = _build

# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

.PHONY: help Makefile

# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
6 changes: 6 additions & 0 deletions docs/api-reference/devices/ds18x20.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.. _api_device_ds18x20:

DS18x20 temperature sensor
==========================

.. doxygengroup:: OW_DEVICE_DS18x20
12 changes: 12 additions & 0 deletions docs/api-reference/devices/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.. _api_device_drivers:

Device drivers
==============

List of all supported device drivers

.. toctree::
:maxdepth: 2
:glob:

*
14 changes: 14 additions & 0 deletions docs/api-reference/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.. _api_reference:

API reference
=============

List of all the modules:

.. toctree::
:maxdepth: 2
:glob:

*
*/index

6 changes: 6 additions & 0 deletions docs/api-reference/ow.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.. _api_ow:

OneWire-UART
============

.. doxygengroup:: OW
6 changes: 6 additions & 0 deletions docs/api-reference/ow_config.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.. _api_ow_config:

Configuration
=============

.. doxygengroup:: OW_CONFIG
6 changes: 6 additions & 0 deletions docs/api-reference/ow_ll.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.. _api_ow_ll:

Low-level functions
===================

.. doxygengroup:: OW_LL
9 changes: 9 additions & 0 deletions docs/api-reference/ow_sys.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.. _api_ow_sys:

System functions
================

System function are used in conjunction with thread safety.
Please check :ref:`thread_safety` section for more information

.. doxygengroup:: OW_SYS
105 changes: 105 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
# Configuration file for the Sphinx documentation builder.
#
# This file only contains a selection of the most common options. For a full
# list see the documentation:
# https://www.sphinx-doc.org/en/master/usage/configuration.html

# -- Path setup --------------------------------------------------------------

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#
# import os
# import sys
# sys.path.insert(0, os.path.abspath('.'))
from sphinx.builders.html import StandaloneHTMLBuilder
import subprocess, os

# Run doxygen first
# read_the_docs_build = os.environ.get('READTHEDOCS', None) == 'True'
# if read_the_docs_build:
subprocess.call('doxygen doxy_ow.doxy', shell=True)
# -- Project information -----------------------------------------------------

project = 'OneWire UART'
copyright = '2019, Tilen Majerle'
author = 'Tilen MAJERLE'

# The full version, including alpha/beta/rc tags
release = '2.0.0'

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

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.intersphinx',
'sphinx.ext.autosectionlabel',
'sphinx.ext.todo',
'sphinx.ext.coverage',
'sphinx.ext.mathjax',
'sphinx.ext.ifconfig',
'sphinx.ext.viewcode',

'breathe',
]

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

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This pattern also affects html_static_path and html_extra_path.
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']

highlight_language = 'c'

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

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'sphinx_rtd_theme'
html_theme_options = {
'canonical_url': '',
'analytics_id': '', # Provided by Google in your dashboard
'display_version': True,
'prev_next_buttons_location': 'bottom',
'style_external_links': False,

'logo_only': False,

# Toc options
'collapse_navigation': True,
'sticky_navigation': True,
'navigation_depth': 4,
'includehidden': True,
'titles_only': False
}
html_logo = 'static/images/logo_tm.png'
github_url = 'https://github.com/MaJerle/onewire-uart'

# 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_css_files = [
'css/common.css',
'css/custom.css',
]

master_doc = 'index'

#
# Breathe configuration
#
#
#
breathe_projects = {
"onewire_uart": "_build/xml/"
}
breathe_default_project = "onewire_uart"
breathe_default_members = ('members', 'undoc-members')

0 comments on commit 81dcae8

Please sign in to comment.