From 869fb8d93bf8df00e902d45a907fd382ed096432 Mon Sep 17 00:00:00 2001 From: sommersoft Date: Sun, 4 Mar 2018 11:42:54 -0600 Subject: [PATCH 1/6] renamed example; no learn guide updates needed --- examples/{display_temperature.py => thermistor_simpletest.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename examples/{display_temperature.py => thermistor_simpletest.py} (100%) diff --git a/examples/display_temperature.py b/examples/thermistor_simpletest.py similarity index 100% rename from examples/display_temperature.py rename to examples/thermistor_simpletest.py From adc4f787848321b3712c461e35c4656304e6310b Mon Sep 17 00:00:00 2001 From: sommersoft Date: Sun, 4 Mar 2018 11:48:09 -0600 Subject: [PATCH 2/6] setup docs folder --- docs/_static/favicon.ico | Bin 0 -> 4414 bytes api.rst => docs/api.rst | 0 conf.py => docs/conf.py | 17 ++++++++++---- docs/examples.rst | 8 +++++++ docs/index.rst | 49 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 docs/_static/favicon.ico rename api.rst => docs/api.rst (100%) rename conf.py => docs/conf.py (89%) create mode 100644 docs/examples.rst create mode 100644 docs/index.rst diff --git a/docs/_static/favicon.ico b/docs/_static/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..5aca98376a1f7e593ebd9cf41a808512c2135635 GIT binary patch literal 4414 zcmd^BX;4#F6n=SG-XmlONeGrD5E6J{RVh+e928U#MG!$jWvO+UsvWh`x&VqGNx*en zx=qox7Dqv{kPwo%fZC$dDwVpRtz{HzTkSs8QhG0)%Y=-3@Kt!4ag|JcIo?$-F|?bXVS9UDUyev>MVZQ(H8K4#;BQW-t2CPorj8^KJrMX}QK zp+e<;4ldpXz~=)2GxNy811&)gt-}Q*yVQpsxr@VMoA##{)$1~=bZ1MmjeFw?uT(`8 z^g=09<=zW%r%buwN%iHtuKSg|+r7HkT0PYN*_u9k1;^Ss-Z!RBfJ?Un4w(awqp2b3 z%+myoFis_lTlCrGx2z$0BQdh+7?!JK#9K9@Z!VrG zNj6gK5r(b4?YDOLw|DPRoN7bdP{(>GEG41YcN~4r_SUHU2hgVtUwZG@s%edC;k7Sn zC)RvEnlq~raE2mY2ko64^m1KQL}3riixh?#J{o)IT+K-RdHae2eRX91-+g!y`8^># z-zI0ir>P%Xon)!@xp-BK2bDYUB9k613NRrY6%lVjbFcQc*pRqiK~8xtkNPLxt}e?&QsTB}^!39t_%Qb)~Ukn0O%iC;zt z<&A-y;3h++)>c1br`5VFM~5(83!HKx$L+my8sW_c#@x*|*vB1yU)_dt3vH;2hqPWx zAl^6@?ipx&U7pf`a*>Yq6C85nb+B=Fnn+(id$W#WB^uHAcZVG`qg;rWB}ubvi(Y>D z$ei>REw$#xp0SHAd^|1hq&9HJ=jKK8^zTH~nk)G?yUcmTh9vUM6Y0LMw4(gYVY$D$ zGl&WY&H<)BbJ&3sYbKjx1j^=3-0Q#f^}(aP1?8^`&FUWMp|rmtpK)bLQ1Zo?^s4jqK=Lfg*9&geMGVQ z#^-*!V`fG@;H&{M9S8%+;|h&Qrxym0Ar>WT4BCVLR8cGXF=JmEYN(sNT(9vl+S|%g z8r7nXQ(95i^`=+XHo|){$vf2$?=`F$^&wFlYXyXg$B{a>$-Fp+V}+D;9k=~Xl~?C4 zAB-;RKXdUzBJE{V&d&%R>aEfFe;vxqI$0@hwVM}gFeQR@j}a>DDxR+n+-*6|_)k%% z*mSpDV|=5I9!&VC&9tD%fcVygWZV!iIo2qFtm#!*(s|@ZT33*Ad;+<|3^+yrp*;oH zBSYLV(H1zTU?2WjrCQoQW)Z>J2a=dTriuvezBmu16`tM2fm7Q@d4^iqII-xFpwHGI zn9CL}QE*1vdj2PX{PIuqOe5dracsciH6OlAZATvE8rj6ykqdIjal2 z0S0S~PwHb-5?OQ-tU-^KTG@XNrEVSvo|HIP?H;7ZhYeZkhSqh-{reE!5di;1zk$#Y zCe7rOnlzFYJ6Z#Hm$GoidKB=2HBCwm`BbZVeZY4ukmG%1uz7p2URs6c9j-Gjj^oQV zsdDb3@k2e`C$1I5ML5U0Qs0C1GAp^?!*`=|Nm(vWz3j*j*8ucum2;r0^-6Aca=Gv) zc%}&;!+_*S2tlnnJnz0EKeRmw-Y!@9ob!XQBwiv}^u9MkaXHvM=!<3YX;+2#5Cj5pp?FEK750S3BgeSDtaE^ zXUM@xoV6yBFKfzvY20V&Lr0yC + + Circuit Playground Express + +.. toctree:: + :caption: Other Links + + Download + CircuitPython Reference Documentation + CircuitPython Support Forum + Discord Chat + Adafruit Learning System + Adafruit Blog + Adafruit Store + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` From bc8af9aa8594c0cf1588d9e6212841697b69b01d Mon Sep 17 00:00:00 2001 From: sommersoft Date: Sun, 4 Mar 2018 11:49:14 -0600 Subject: [PATCH 3/6] updated .travis & .readthedocs yml --- readthedocs.yml => .readthedocs.yml | 0 .travis.yml | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) rename readthedocs.yml => .readthedocs.yml (100%) diff --git a/readthedocs.yml b/.readthedocs.yml similarity index 100% rename from readthedocs.yml rename to .readthedocs.yml diff --git a/.travis.yml b/.travis.yml index 48d3ea3..b49e1f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,15 +16,17 @@ deploy: provider: releases api_key: $GITHUB_TOKEN file_glob: true - file: bundles/* + file: $TRAVIS_BUILD_DIR/bundles/* skip_cleanup: true + overwrite: true on: tags: true install: - - pip install pylint circuitpython-build-tools + - pip install pylint circuitpython-build-tools Sphinx sphinx-rtd-theme script: - pylint adafruit_thermistor.py - ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py) - circuitpython-build-bundles --filename_prefix adafruit-circuitpython-thermistor --library_location . + - cd docs && sphinx-build -E -W -b html . _build/html From b06a8d95bcbb87168c7b87134fb07c8c5840ebc8 Mon Sep 17 00:00:00 2001 From: sommersoft Date: Sun, 4 Mar 2018 11:50:24 -0600 Subject: [PATCH 4/6] updated README --- README.rst | 53 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index aa7ddd2..f55848f 100644 --- a/README.rst +++ b/README.rst @@ -10,6 +10,10 @@ Introduction :target: https://discord.gg/nBQh6qu :alt: Discord +.. image:: https://travis-ci.org/adafruit/Adafruit_CircuitPython_Thermistor.svg?branch=master + :target: https://travis-ci.org/adafruit/Adafruit_CircuitPython_Thermistor + :alt: Build Status + Thermistors are resistors that predictably change resistance with temperature. This driver uses an analog reading and math to determine the temperature. They are commonly used as a low cost way to measure temperature. @@ -46,10 +50,49 @@ Contributions are welcome! Please read our `Code of Conduct `_ before contributing to help this project stay welcoming. -API Reference -============= +Building locally +================ + +To build this library locally you'll need to install the +`circuitpython-build-tools `_ package. + +.. code-block:: shell + + python3 -m venv .env + source .env/bin/activate + pip install circuitpython-build-tools + +Once installed, make sure you are in the virtual environment: + +.. code-block:: shell + + source .env/bin/activate + +Then run the build: + +.. code-block:: shell + + circuitpython-build-bundles --filename_prefix adafruit-circuitpython-thermistor --library_location . + +Sphinx documentation +----------------------- + +Sphinx is used to build the documentation based on rST files and comments in the code. First, +install dependencies (feel free to reuse the virtual environment from above): + +.. code-block:: shell + + python3 -m venv .env + source .env/bin/activate + pip install Sphinx sphinx-rtd-theme + +Now, once you have the virtual environment activated: + +.. code-block:: shell -.. toctree:: - :maxdepth: 2 + cd docs + sphinx-build -E -W -b html . _build/html - api +This will output the documentation to ``docs/_build/html``. Open the index.html in your browser to +view them. It will also (due to -W) error out on any warning like Travis will. This is a good way to +locally verify it will pass. From d86585d9533aee4621185c0d2e2a0ebd7cd6a6b1 Mon Sep 17 00:00:00 2001 From: sommersoft Date: Sun, 4 Mar 2018 11:51:39 -0600 Subject: [PATCH 5/6] updated info docstring --- adafruit_thermistor.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/adafruit_thermistor.py b/adafruit_thermistor.py index 6ea8d6d..41dda9f 100644 --- a/adafruit_thermistor.py +++ b/adafruit_thermistor.py @@ -42,6 +42,9 @@ * Adafruit `10K Precision Epoxy Thermistor - 3950 NTC `_ (Product ID: 372) +* Adafruit `Circuit Playground Express `_ + (Product ID: 3333) + **Software and Dependencies:** * Adafruit CircuitPython firmware: https://github.com/adafruit/circuitpython/releases From f6ca7e3a95dbf3a7ead5ff66949e5ac5000570e0 Mon Sep 17 00:00:00 2001 From: sommersoft Date: Sun, 4 Mar 2018 12:26:17 -0600 Subject: [PATCH 6/6] sphinx fix --- adafruit_thermistor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_thermistor.py b/adafruit_thermistor.py index 41dda9f..6dcbc19 100644 --- a/adafruit_thermistor.py +++ b/adafruit_thermistor.py @@ -21,7 +21,7 @@ # THE SOFTWARE. """ `adafruit_thermistor` - Read temperature with a thermistor -==================================================== +=========================================================== A thermistor is a resistor that varies with temperature. This driver takes the parameters of that resistor and its series resistor to determine the current