Skip to content

Commit 9a7b504

Browse files
Merge pull request #24 from zacharytomlinson/chore-chore-chore-i-hate-my-life
A lot of nice stuff....
2 parents 27f7c54 + a0958ac commit 9a7b504

39 files changed

+1506
-520
lines changed

.github/ISSUE_TEMPLATE/bug.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,11 @@ Write down what you thought would happen.
3333

3434
- SASPy version used:
3535
- Python version used:
36-
- O.S. runing the code:
36+
- O.S. running the code:
3737
- VLT Vendor and Model:
38+
39+
**Connection Method (check one please)**
40+
- [ ] Prolific USB Cable
41+
- [ ] Raspberry miniUART
42+
- [ ] RS-232 to TTL (Like MAX3323)
43+
- [ ] Other: <!-- Write here -->

.readthedocs.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version: 2
99
build:
1010
os: ubuntu-22.04
1111
tools:
12-
python: "3.12"
12+
python: "3.10"
1313
# You can also specify other tool versions:
1414
# nodejs: "19"
1515
# rust: "1.64"
@@ -20,13 +20,13 @@ sphinx:
2020
configuration: docs/conf.py
2121

2222
# Optionally build your docs in additional formats such as PDF and ePub
23-
# formats:
24-
# - pdf
25-
# - epub
23+
formats:
24+
- pdf
25+
2626

2727
# Optional but recommended, declare the Python requirements required
2828
# to build your documentation
2929
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
3030
python:
3131
install:
32-
- requirements: requirements.txt
32+
- requirements: docs/requirements.txt

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# SASPY
2+
[![Documentation Status](https://readthedocs.org/projects/saspy/badge/?version=latest)](https://saspy.readthedocs.io/en/latest/?badge=latest)
3+
24
<p align="center">
35
<img src="https://github.com/zacharytomlinson/saspy/assets/15037424/e8a8efc8-e83f-44f9-9ca1-7543a280e6b3" width="300" height="auto">
46
</p>
@@ -10,7 +12,7 @@ This project, once reached a stable release, will be published on [PyPi](https:/
1012
# Documentation
1113
Since this library is still under heavy development (but at least is working !) comments are still not complete and there is a draft of documentation into `docs/` folder.
1214

13-
We are working hard to deliver also a readthedocs url.
15+
All the latest documentation regarding this library can be found on [Read The Docs](https://saspy.readthedocs.io/)
1416

1517
In the meantime feel free to checkout the [WiKi of this project](https://github.com/zacharytomlinson/saspy/wiki) where you are gonna find response and solutions to common problems we faced during our journey
1618

config.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ connection:
22
serial_port: /dev/ttyUSB0
33
timeout: 2
44
baudrate: 19200
5+
infinite: False
56

67
events:
7-
poll_timeout: 0.2
8-
poll_address: 0x80
8+
poll_timeout: 0.5
9+
poll_address: 0x82 # Standard Poll Address - On most the machines | Try 0x80 if 82 dont work
910

1011
debug:
1112
level: DEBUG # CRITICAL | ERROR | WARNING | INFO | DEBUG | NOTSET
@@ -14,7 +15,7 @@ security:
1415
key: 44
1516

1617
machine:
17-
pos_id: B374A402
18-
reg_key: 0000000000000000000000000000000000000000
19-
asset_number: 01000000
18+
pos_id: "B374A402"
19+
reg_key: "0000000000000000000000000000000000000000"
20+
asset_number: "15cd5b07" # Asset Magic Number - Works on every machine !
2021
denomination: 0.01

docs/Makefile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Minimal makefile for Sphinx documentation
2+
#
3+
4+
# You can set these variables from the command line, and also
5+
# from the environment for the first two.
6+
SPHINXOPTS ?=
7+
SPHINXBUILD ?= sphinx-build
8+
SOURCEDIR = .
9+
BUILDDIR = _build
10+
11+
# Put it first so that "make" without argument is like "make help".
12+
help:
13+
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
14+
15+
.PHONY: help Makefile
16+
17+
# Catch-all target: route all unknown targets to Sphinx using the new
18+
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
19+
%: Makefile
20+
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/conf.py

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,58 @@
1-
# docs/conf.py
1+
# Configuration file for the Sphinx documentation builder.
2+
#
3+
# This file only contains a selection of the most common options. For a full
4+
# list see the documentation:
5+
# https://www.sphinx-doc.org/en/master/usage/configuration.html
26

3-
# Add the following content
7+
# -- Path setup --------------------------------------------------------------
8+
9+
# If extensions (or modules to document with autodoc) are in another directory,
10+
# add these directories to sys.path here. If the directory is relative to the
11+
# documentation root, use os.path.abspath to make it absolute, like shown here.
12+
#
413
import os
514
import sys
615
sys.path.insert(0, os.path.abspath('..'))
716

17+
18+
# -- Project information -----------------------------------------------------
19+
820
project = 'SASPy'
9-
author = 'Zachary Tomlinson, Antonio D\'Angelo'
21+
copyright = "2024, Zachary Tomlinson, Antonio D'Angelo"
22+
author = "Zachary Tomlinson, Antonio D'Angelo"
23+
24+
# The full version, including alpha/beta/rc tags
25+
release = '2.0.0'
26+
27+
28+
# -- General configuration ---------------------------------------------------
1029

30+
# Add any Sphinx extension module names here, as strings. They can be
31+
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
32+
# ones.
1133
extensions = [
1234
'sphinx.ext.autodoc',
13-
]
35+
'sphinx.ext.coverage',
36+
'sphinx.ext.napoleon'
37+
]
38+
39+
# Add any paths that contain templates here, relative to this directory.
40+
templates_path = ['_templates']
41+
42+
# List of patterns, relative to source directory, that match files and
43+
# directories to ignore when looking for source files.
44+
# This pattern also affects html_static_path and html_extra_path.
45+
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
46+
47+
48+
# -- Options for HTML output -------------------------------------------------
49+
50+
# The theme to use for HTML and HTML Help pages. See the documentation for
51+
# a list of builtin themes.
52+
#
53+
html_theme = 'sphinx_rtd_theme'
54+
55+
# Add any paths that contain custom static files (such as style sheets) here,
56+
# relative to this directory. They are copied after the builtin static files,
57+
# so a file named "default.css" will overwrite the builtin "default.css".
58+
html_static_path = ['_static']

docs/config.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

docs/config_handler.rst

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/example.rst

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/index.rst

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,27 @@
1-
.. sas documentation master file, created by
2-
sphinx-quickstart on Tue Jan 25 12:34:56 2024.
1+
Welcome to SASPy's documentation!
2+
===================================
33

4-
Welcome to the SASpy documentation!
5-
====================================
4+
.. image:: saspy-logo.jpeg
5+
:align: center
6+
:width: 300
67

7-
.. toctree::
8-
:maxdepth: 2
8+
|
9+
| **SASPy** is a Python library for handling your beloved VLTs via SAS Protocol.
10+
11+
At moment is compatible with SAS v6.02+
12+
13+
Check out the :ref:`wiki-home`. section for more information about connections and common problems.
914

10-
config_handler
11-
error_handler
12-
sas
13-
models
15+
.. note::
16+
This project is under active development.
1417

15-
Indices and tables
16-
==================
1718

18-
* :ref:`genindex`
19-
* :ref:`modindex`
20-
* :ref:`search`
19+
.. toctree::
20+
:maxdepth: 1
21+
:caption: Table of Contents
22+
:name: mastertoc
23+
:glob:
24+
25+
Home <self>
26+
Wiki <wiki/WikiHome>
27+
The Library <sas-lib/main>

0 commit comments

Comments
 (0)