Skip to content

Commit 060b584

Browse files
committed
Merge pull request randymxj#1 from adafruit/master
Merge from original adafruit:master
2 parents ae7a37a + bf50dd3 commit 060b584

File tree

25 files changed

+600
-242
lines changed

25 files changed

+600
-242
lines changed

.gitignore

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Python specific .gitignore
2+
# GitHub recommended entries from https://github.com/github/gitignore
3+
4+
# Byte-compiled / optimized / DLL files
5+
__pycache__/
6+
*.py[cod]
7+
8+
# C extensions
9+
*.so
10+
11+
# Distribution / packaging
12+
.Python
13+
env/
14+
bin/
15+
build/
16+
develop-eggs/
17+
dist/
18+
eggs/
19+
lib/
20+
lib64/
21+
parts/
22+
sdist/
23+
var/
24+
*.egg-info/
25+
.installed.cfg
26+
*.egg
27+
28+
# Installer logs
29+
pip-log.txt
30+
pip-delete-this-directory.txt
31+
32+
# Unit test / coverage reports
33+
htmlcov/
34+
.tox/
35+
.coverage
36+
.cache
37+
nosetests.xml
38+
coverage.xml
39+
40+
# Translations
41+
*.mo
42+
43+
# Mr Developer
44+
.mr.developer.cfg
45+
.project
46+
.pydevproject
47+
48+
# Rope
49+
.ropeproject
50+
51+
# Django stuff:
52+
*.log
53+
*.pot
54+
55+
# Sphinx documentation
56+
docs/_build/

Adafruit_ADS1x15/ads1x15_ex_singleended.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def signal_handler(signal, frame):
1313
ADS1115 = 0x01 # 16-bit ADC
1414

1515
# Select the gain
16-
# gain = 61 # +/- 6.144V
16+
# gain = 6144 # +/- 6.144V
1717
gain = 4096 # +/- 4.096V
1818
# gain = 2048 # +/- 2.048V
1919
# gain = 1024 # +/- 1.024V

Adafruit_BMP085/DEPRECATED.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
This BMP085 sensor library has been deprecated in favor of a new version that supports both the Raspberry Pi and Beaglebone Black.
2+
3+
You can find the new library with installation instructions at this github repository: https://github.com/adafruit/Adafruit_Python_BMP
4+
5+
You can also find a tutorial on using this library at: https://learn.adafruit.com/using-the-bmp085-with-raspberry-pi/using-the-adafruit-bmp-python-library

0 commit comments

Comments
 (0)