Skip to content

Commit a1a4f15

Browse files
TG-TechieTG-Techie
committed
fixed conflicts?
2 parents dd77d20 + 8c31952 commit a1a4f15

File tree

9 files changed

+167
-86
lines changed

9 files changed

+167
-86
lines changed

‎.github/workflows/build.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Build CI
2+
3+
on: [pull_request, push]
4+
5+
jobs:
6+
test:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: Dump GitHub context
10+
env:
11+
GITHUB_CONTEXT: ${{ toJson(github) }}
12+
run: echo "$GITHUB_CONTEXT"
13+
- name: Translate Repo Name For Build Tools filename_prefix
14+
id: repo-name
15+
run: |
16+
echo ::set-output name=repo-name::$(
17+
echo ${{ github.repository }} |
18+
awk -F '\/' '{ print tolower($2) }' |
19+
tr '_' '-'
20+
)
21+
- name: Set up Python 3.6
22+
uses: actions/setup-python@v1
23+
with:
24+
python-version: 3.6
25+
- name: Versions
26+
run: |
27+
python3 --version
28+
- name: Checkout Current Repo
29+
uses: actions/checkout@v1
30+
with:
31+
submodules: true
32+
- name: Checkout tools repo
33+
uses: actions/checkout@v2
34+
with:
35+
repository: adafruit/actions-ci-circuitpython-libs
36+
path: actions-ci
37+
- name: Install deps
38+
run: |
39+
source actions-ci/install.sh
40+
- name: Library version
41+
run: git describe --dirty --always --tags
42+
- name: PyLint
43+
run: |
44+
pylint $( find . -path './adafruit*.py' )
45+
([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name,bad-whitespace examples/*.py)
46+
- name: Build assets
47+
run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location .
48+
- name: Build docs
49+
working-directory: docs
50+
run: sphinx-build -E -W -b html . _build/html

‎.github/workflows/release.yml

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
name: Release Actions
2+
3+
on:
4+
release:
5+
types: [published]
6+
7+
jobs:
8+
upload-release-assets:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Dump GitHub context
12+
env:
13+
GITHUB_CONTEXT: ${{ toJson(github) }}
14+
run: echo "$GITHUB_CONTEXT"
15+
- name: Translate Repo Name For Build Tools filename_prefix
16+
id: repo-name
17+
run: |
18+
echo ::set-output name=repo-name::$(
19+
echo ${{ github.repository }} |
20+
awk -F '\/' '{ print tolower($2) }' |
21+
tr '_' '-'
22+
)
23+
- name: Set up Python 3.6
24+
uses: actions/setup-python@v1
25+
with:
26+
python-version: 3.6
27+
- name: Versions
28+
run: |
29+
python3 --version
30+
- name: Checkout Current Repo
31+
uses: actions/checkout@v1
32+
with:
33+
submodules: true
34+
- name: Checkout tools repo
35+
uses: actions/checkout@v2
36+
with:
37+
repository: adafruit/actions-ci-circuitpython-libs
38+
path: actions-ci
39+
- name: Install deps
40+
run: |
41+
source actions-ci/install.sh
42+
- name: Build assets
43+
run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location .
44+
- name: Upload Release Assets
45+
# the 'official' actions version does not yet support dynamically
46+
# supplying asset names to upload. @csexton's version chosen based on
47+
# discussion in the issue below, as its the simplest to implement and
48+
# allows for selecting files with a pattern.
49+
# https://github.com/actions/upload-release-asset/issues/4
50+
#uses: actions/[email protected]
51+
uses: csexton/release-asset-action@master
52+
with:
53+
pattern: "bundles/*"
54+
github-token: ${{ secrets.GITHUB_TOKEN }}
55+
56+
upload-pypi:
57+
runs-on: ubuntu-latest
58+
steps:
59+
- uses: actions/checkout@v1
60+
- name: Check For setup.py
61+
id: need-pypi
62+
run: |
63+
echo ::set-output name=setup-py::$( find . -wholename './setup.py' )
64+
- name: Set up Python
65+
if: contains(steps.need-pypi.outputs.setup-py, 'setup.py')
66+
uses: actions/setup-python@v1
67+
with:
68+
python-version: '3.x'
69+
- name: Install dependencies
70+
if: contains(steps.need-pypi.outputs.setup-py, 'setup.py')
71+
run: |
72+
python -m pip install --upgrade pip
73+
pip install setuptools wheel twine
74+
- name: Build and publish
75+
if: contains(steps.need-pypi.outputs.setup-py, 'setup.py')
76+
env:
77+
TWINE_USERNAME: ${{ secrets.pypi_username }}
78+
TWINE_PASSWORD: ${{ secrets.pypi_password }}
79+
run: |
80+
python setup.py sdist
81+
twine upload dist/*

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ __pycache__
44
_build
55
*.pyc
66
.env
7-
build*
87
bundles
98
*.DS_Store
109
.eggs

‎.travis.yml

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

‎README.rst

Lines changed: 30 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Introduction
1010
:target: https://discord.gg/nBQh6qu
1111
:alt: Discord
1212
13-
.. image:: https://travis-ci.com/adafruit/Adafruit_CircuitPython_FocalTouch.svg?branch=master
14-
:target: https://travis-ci.com/adafruit/Adafruit_CircuitPython_FocalTouch
13+
.. image:: https://github.com/adafruit/Adafruit_CircuitPython_FocalTouch/workflows/Build%20CI/badge.svg
14+
:target: https://github.com/adafruit/Adafruit_CircuitPython_FocalTouch/actions/
1515
:alt: Build Status
1616

1717
CircuitPython driver for common low-cost FocalTech capacitive touch chips.
@@ -28,6 +28,31 @@ Please ensure all dependencies are available on the CircuitPython filesystem.
2828
This is easily achieved by downloading
2929
`the Adafruit library and driver bundle <https://github.com/adafruit/Adafruit_CircuitPython_Bundle>`_.
3030

31+
Installing from PyPI
32+
====================
33+
34+
On supported GNU/Linux systems like the Raspberry Pi, you can install the driver locally `from
35+
PyPI <https://pypi.org/project/adafruit-circuitpython-focaltouch/>`_. To install for current user:
36+
37+
.. code-block:: shell
38+
39+
pip3 install adafruit-circuitpython-focaltouch
40+
41+
To install system-wide (this may be required in some cases):
42+
43+
.. code-block:: shell
44+
45+
sudo pip3 install adafruit-circuitpython-focaltouch
46+
47+
To install in a virtual environment in your current project:
48+
49+
.. code-block:: shell
50+
51+
mkdir project-name && cd project-name
52+
python3 -m venv .env
53+
source .env/bin/activate
54+
pip3 install adafruit-circuitpython-focaltouch
55+
3156
Usage Example
3257
=============
3358

@@ -59,49 +84,7 @@ Contributions are welcome! Please read our `Code of Conduct
5984
<https://github.com/adafruit/Adafruit_CircuitPython_FocalTouch/blob/master/CODE_OF_CONDUCT.md>`_
6085
before contributing to help this project stay welcoming.
6186

62-
Building locally
63-
================
64-
65-
To build this library locally you'll need to install the
66-
`circuitpython-build-tools <https://github.com/adafruit/circuitpython-build-tools>`_ package.
67-
68-
.. code-block:: shell
69-
70-
python3 -m venv .env
71-
source .env/bin/activate
72-
pip install circuitpython-build-tools
73-
74-
Once installed, make sure you are in the virtual environment:
75-
76-
.. code-block:: shell
77-
78-
source .env/bin/activate
79-
80-
Then run the build:
81-
82-
.. code-block:: shell
83-
84-
circuitpython-build-bundles --filename_prefix adafruit-circuitpython-focaltouch --library_location .
85-
86-
Sphinx documentation
87-
-----------------------
88-
89-
Sphinx is used to build the documentation based on rST files and comments in the code. First,
90-
install dependencies (feel free to reuse the virtual environment from above):
91-
92-
.. code-block:: shell
93-
94-
python3 -m venv .env
95-
source .env/bin/activate
96-
pip install Sphinx sphinx-rtd-theme
97-
98-
Now, once you have the virtual environment activated:
99-
100-
.. code-block:: shell
101-
102-
cd docs
103-
sphinx-build -E -W -b html . _build/html
87+
Documentation
88+
=============
10489

105-
This will output the documentation to ``docs/_build/html``. Open the index.html in your browser to
106-
view them. It will also (due to -W) error out on any warning like Travis will. This is a good way to
107-
locally verify it will pass.
90+
For information on building library documentation, please check out `this guide <https://learn.adafruit.com/creating-and-sharing-a-circuitpython-library/sharing-our-docs-on-readthedocs#sphinx-5-1>`_.

‎adafruit_focaltouch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def __init__(self, i2c, address=_FT6206_DEFAULT_I2C_ADDR, debug=False):
8787
self._i2c = I2CDevice(i2c, address)
8888
self._debug = debug
8989

90-
chip_data = self._read(_FT6XXX_REG_LIBH, 9)
90+
chip_data = self._read(_FT6XXX_REG_LIBH, 8)
9191
lib_ver, chip_id, _, _, firm_id, _, vend_id = struct.unpack('>HBBBBBB', chip_data)
9292

9393
if vend_id != 0x11:

‎docs/examples.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ Simple tests
33

44
Ensure your device works with these simple tests.
55

6-
.. literalinclude:: ../examples/print_touches.py
7-
:caption: examples/print_touches.py
6+
.. literalinclude:: ../examples/focaltouch_print_touches.py
7+
:caption: examples/focaltouch_print_touches.py
88
:linenos:
99

10-
.. literalinclude:: ../examples/simple_paint.py
11-
:caption: examples/simple_paint.py
12-
:linenos:
10+
.. literalinclude:: ../examples/focaltouch_paint_simpletest.py
11+
:caption: examples/focaltouch_paint_simpletest.py
12+
:linenos:

‎examples/simple_paint.py renamed to ‎examples/focaltouch_paint_simpletest.py

File renamed without changes.

‎examples/print_touches.py renamed to ‎examples/focaltouch_print_touches.py

File renamed without changes.

0 commit comments

Comments
 (0)