Skip to content

Commit 0e29a8b

Browse files
Merge branch 'adafruit:master' into master
2 parents 4b69995 + 747af1c commit 0e29a8b

File tree

8 files changed

+93
-2
lines changed

8 files changed

+93
-2
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# SPDX-FileCopyrightText: 2021 Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: MIT
4+
5+
Thank you for contributing! Before you submit a pull request, please read the following.
6+
7+
Make sure any changes you're submitting are in line with the CircuitPython Design Guide, available here: https://circuitpython.readthedocs.io/en/latest/docs/design_guide.html
8+
9+
If your changes are to documentation, please verify that the documentation builds locally by following the steps found here: https://adafru.it/build-docs
10+
11+
Before submitting the pull request, make sure you've run Pylint and Black locally on your code. You can do this manually or using pre-commit. Instructions are available here: https://adafru.it/check-your-code
12+
13+
Please remove all of this text before submitting. Include an explanation or list of changes included in your PR, as well as, if applicable, a link to any related issues.

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,5 @@ jobs:
7676
python setup.py sdist
7777
python setup.py bdist_wheel --universal
7878
twine check dist/*
79+
- name: Setup problem matchers
80+
uses: adafruit/circuitpython-action-library-ci-problem-matchers@v1
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# SPDX-FileCopyrightText: 2021 Scott Shawcroft for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: MIT
4+
5+
name: Failure help text
6+
7+
on:
8+
workflow_run:
9+
workflows: ["Build CI"]
10+
types:
11+
- completed
12+
13+
jobs:
14+
post-help:
15+
runs-on: ubuntu-latest
16+
if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.event == 'pull_request' }}
17+
steps:
18+
- name: Post comment to help
19+
uses: adafruit/circuitpython-action-library-ci-failed@v1

adafruit_progressbar/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: MIT
44

55
"""
6-
`progressbar_base`
6+
`adafruit_progressbar`
77
================================================================================
88
99
Dynamic progress bar widget for CircuitPython displays

adafruit_progressbar/horizontalprogressbar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class HorizontalProgressBar(ProgressBarBase):
5757
Using the diagrams below, the bar will fill in the following directions::
5858
5959
--------------------------------
60-
| Left-to-right | 1-3 to 2-4 |
60+
| Left-to-right | 1-3 to 2-4 |
6161
--------------------------------
6262
| Right-to-left | 2-4 to 1-3 |
6363
--------------------------------

docs/api.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ API Definition
66
.. If your library file(s) are nested in a directory (e.g. /adafruit_foo/foo.py)
77
.. use this format as the module name: "adafruit_foo.foo"
88
9+
.. automodule:: adafruit_progressbar
10+
:members:
11+
912
.. automodule:: adafruit_progressbar.horizontalprogressbar
1013
:members:
1114
:show-inheritance:

docs/examples.rst

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,53 @@ Example showing how to change the progressbar color while updating the values
1616
.. literalinclude:: ../examples/progressbar_displayio_blinka_color_scale.py
1717
:caption: examples/progressbar_displayio_blinka_color_scale.py
1818
:linenos:
19+
20+
21+
Vertical Simple test
22+
--------------------
23+
24+
Simple test to show a vertical Progress bar
25+
26+
.. literalinclude:: ../examples/progressbar_vertical_simpletest.py
27+
:caption: examples/progressbar_vertical_simpletest.py
28+
:linenos:
29+
30+
31+
MatrixPortal Example
32+
--------------------
33+
34+
Progressbar using the MatrixPortal
35+
36+
.. literalinclude:: ../examples/progressbar_matrixportal.py
37+
:caption: examples/examples/progressbar_matrixportal.py
38+
:linenos:
39+
40+
41+
42+
MagTag Example
43+
---------------
44+
45+
Progressbar using the MagTag
46+
47+
.. literalinclude:: ../examples/progressbar_magtag_simpletest.py
48+
:caption: examples/progressbar_magtag_simpletest.py
49+
:linenos:
50+
51+
52+
DisplayIO Blinka
53+
----------------
54+
55+
Progressbar using DisplayIO in Blinka
56+
57+
.. literalinclude:: ../examples/progressbar_displayio_blinka.py
58+
:caption: examples/progressbar_displayio_blinka.py
59+
:linenos:
60+
61+
Combined ProgressBar
62+
--------------------
63+
64+
Example showing both a Vertical and an Horizontal ProgressBar
65+
66+
.. literalinclude:: ../examples/progressbar_combined.py
67+
:caption: examples/progressbar_combined.py
68+
:linenos:

docs/index.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ Table of Contents
2323
.. toctree::
2424
:caption: Tutorials
2525

26+
ProgressBar Basics <https://learn.adafruit.com/magtag-progress-displays/progressbar-basics>
27+
28+
Adafruit MagTag COVID Vaccination Percent Tracker <https://learn.adafruit.com/adafruit-magtag-covid-vaccination-percent-tracker>
29+
2630

2731
.. toctree::
2832
:caption: Related Products

0 commit comments

Comments
 (0)