Skip to content

Commit 3259519

Browse files
committed
Merge branch 'feature'
2 parents 42a2ee9 + 6a703cc commit 3259519

File tree

206 files changed

+13637
-4445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+13637
-4445
lines changed

.gitignore

Lines changed: 114 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,117 @@ package-lock.json
33
scripts/
44
tests/
55
img/
6+
build/
7+
media/
68
mudpi.config
79
*.log
810
# Python compiled
911
__pycache__/
12+
*.py[cod]
13+
*$py.class
1014

11-
# Virtual Environments
15+
# C extensions
16+
*.so
17+
18+
# Distribution / packaging
19+
.Python
20+
build/
21+
develop-eggs/
22+
dist/
23+
downloads/
24+
eggs/
25+
.eggs/
26+
lib/
27+
lib64/
28+
parts/
29+
sdist/
30+
var/
31+
wheels/
32+
share/python-wheels/
33+
*.egg-info/
34+
.installed.cfg
35+
*.egg
36+
MANIFEST
37+
38+
# PyInstaller
39+
# Usually these files are written by a python script from a template
40+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
41+
*.manifest
42+
*.spec
43+
44+
# Installer logs
45+
pip-log.txt
46+
pip-delete-this-directory.txt
47+
48+
# Unit test / coverage reports
49+
htmlcov/
50+
.tox/
51+
.nox/
52+
.coverage
53+
.coverage.*
54+
.cache
55+
nosetests.xml
56+
coverage.xml
57+
*.cover
58+
*.py,cover
59+
.hypothesis/
60+
.pytest_cache/
61+
cover/
62+
63+
# Translations
64+
*.mo
65+
*.pot
66+
67+
# Django stuff:
68+
*.log
69+
local_settings.py
70+
db.sqlite3
71+
db.sqlite3-journal
72+
73+
# Flask stuff:
74+
instance/
75+
.webassets-cache
76+
77+
# Scrapy stuff:
78+
.scrapy
79+
80+
# Sphinx documentation
81+
docs/_build/
82+
83+
# PyBuilder
84+
.pybuilder/
85+
target/
86+
87+
# Jupyter Notebook
88+
.ipynb_checkpoints
89+
90+
# IPython
91+
profile_default/
92+
ipython_config.py
93+
94+
# pyenv
95+
# For a library or package, you might want to ignore these files since the code is
96+
# intended to run in multiple environments; otherwise, check them in:
97+
# .python-version
98+
99+
# pipenv
100+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
101+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
102+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
103+
# install all needed dependencies.
104+
#Pipfile.lock
105+
106+
# PEP 582; used by e.g. github.com/David-OConnor/pyflow
107+
__pypackages__/
108+
109+
# Celery stuff
110+
celerybeat-schedule
111+
celerybeat.pid
112+
113+
# SageMath parsed files
114+
*.sage.py
115+
116+
# Environments
12117
.env
13118
.venv
14119
env/
@@ -17,6 +122,13 @@ ENV/
17122
env.bak/
18123
venv.bak/
19124

125+
# Spyder project settings
126+
.spyderproject
127+
.spyproject
128+
129+
# Rope project settings
130+
.ropeproject
131+
20132
# IDE configs
21133
.idea/
22-
.DS_Store
134+
.DS_Store

MANIFEST.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
include README.md
2+
include *.json
3+
include *.yaml
4+
include *.yml
5+
include *.config
6+
include *.config.example
7+
include *.sh

README.md

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<p align="center"><img alt="MudPi Smart Garden" title="MudPi Smart Garden" src="https://mudpi.app/img/mudPI_LOGO_small_grad.png" width="200px"></p>
1+
<p align="center"><img alt="MudPi Smart Automation for the Garden & Home" title="MudPi Smart Automation for the Garden & Home" src="https://mudpi.app/img/mudPI_LOGO_small_grad.png" width="200px"></p>
22

3-
# MudPi Smart Garden
4-
> A python library to gather sensor readings, trigger components, control solenoids and more in an event based system that can be run on a raspberry pi.
3+
# MudPi Smart Automation for the Garden & Home
4+
> A python package to gather sensor readings, trigger components, control devices and more in an event based system that can be run on a linux SBC, including Raspberry Pi.
55
66

77
## Documentation
@@ -16,8 +16,12 @@ Install MudPi using the [Installer](https://github.com/mudpi/installer) that wil
1616
For examples and guides on how to setup and use MudPi check out the [free guides available.](https://mudpi.app/guides)
1717

1818

19+
## Funding
20+
MudPi core is open source and has a bunch of free resources built around it. Being a solo developer it has become quite a lot to maintain the various areas of the project. It makes me happy seeing how MudPi has helped many people worldwide. I would like to continue working on MudPi and put even more time into the project to take on bigger ambitions. However it has come to a point that MudPi is taking more time to build with little to no income to help justify it. I really could use help from the community to continue building MudPi. If you like my work and MudPi please consider [helping me fund the project and keep the lights on.](https://www.patreon.com/mudpi)
21+
22+
1923
## Contributing
20-
Any contributions you can make will be greatly appreciated. If you are interested in contributing please get in touch with me and submit a pull request. There is much more I would like to add support for, however being a single developer limits my scope. Therefore mainly bugs will be accepted as issues.
24+
Any contributions you can make will be greatly appreciated. If you are interested in contributing please get in touch with me and submit a pull request. There is much more I would like to add support for, however being a single developer limits my scope. Therefore mainly bugs will be accepted as issues.
2125

2226

2327
## Versioning
@@ -32,8 +36,8 @@ Breaking.Major.Minor
3236
* Discord - [Join](https://discord.gg/daWg2YH)
3337
* [Twitter.com/MudpiApp](https://twitter.com/mudpiapp)
3438

35-
## Hardware Tested On
36-
These are the devices and sensors I tested and used with MudPi successfully. Many sensors are similar so it will work with a range more than what is listed below.
39+
<!-- ## Hardware Tested On
40+
These are the devices and sensors I tested and used with MudPi successfully. Many sensors are similar so it will work with a range more than what is listed below.
3741
3842
**Devices**
3943
* [Raspberry Pi 2 Model B+](https://www.raspberrypi.org/products/raspberry-pi-2-model-b/)
@@ -53,25 +57,27 @@ These are the devices and sensors I tested and used with MudPi successfully. Man
5357
* [DS18B20 Temperature Sensors](https://www.amazon.com/gp/product/B018KFX5X0/ref=oh_aui_detailpage_o08_s00?ie=UTF8&psc=1)
5458
* [DHT11 Temperature/Humidity Sensor](https://www.amazon.com/gp/product/B01DKC2GQ0/ref=oh_aui_detailpage_o07_s05?ie=UTF8&psc=1)
5559
* [DHT22 Temperature/Humidity Sensor](https://www.dfrobot.com/product-1102.html)
60+
* [T9602 Temperature/Humidity Sensor](https://www.amphenol-sensors.com/en/telaire/humidity/527-humidity-sensors/3224-t9602)
5661
* [Rain Sensor](https://www.amazon.com/gp/product/B01D9JK2F6/ref=oh_aui_detailpage_o03_s00?ie=UTF8&psc=1)
5762
* [Ambient Light Sensor](https://www.dfrobot.com/product-1004.html)
5863
* [DFROBOT Analog Capacitive Soil Moisture Sensor](https://www.amazon.com/gp/product/B01GHY0N4K/ref=oh_aui_detailpage_o01_s00?ie=UTF8&psc=1)
5964
* [Soil Moisture Sensor](https://www.sparkfun.com/products/13322)
6065
6166
**Components**
6267
* [4 Channel DC 5V Relay](https://www.amazon.com/gp/product/B00KTEN3TM/ref=oh_aui_detailpage_o08_s00?ie=UTF8&psc=1)
68+
* [8 Channel DC 5V Relay](https://www.amazon.co.uk/SODIAL-Channel-Module-Arduino-Electronic/dp/B00IIDXYTA)
6369
* [LCD 16 x 2 Display I2C](https://www.dfrobot.com/product-135.html)
6470
* [LCD 16 x 2 Display I2C - PCF8574](https://www.amazon.com/Arducam-Display-Controller-Character-Backlight/dp/B019D9TYMI)
6571
* [LCD 20 x 4 Display I2C](https://www.dfrobot.com/product-590.html)
6672
* [USB to TTL USB 2.0 Serial Module UART](https://www.amazon.com/gp/product/B07CWKHTLH/ref=oh_aui_detailpage_o04_s00?ie=UTF8&psc=1)
6773
68-
Let me know if you are able to confirm tests on any other devices. Note: This is not a complete list.
74+
Let me know if you are able to confirm tests on any other devices. Note: This is not a complete list. -->
6975

70-
Also check out my [custom circuit boards design around MudPi](https://mudpi.app/boards)
76+
## MudPi Hardware
77+
There are [custom circuit boards designed around MudPi available.](https://mudpi.app/boards)
7178

7279
## License
7380
This project is licensed under the BSD-4-Clause License - see the [LICENSE.md](LICENSE.md) file for details
7481

7582

7683
<img alt="MudPi Smart Garden" title="MudPi Smart Garden" src="https://mudpi.app/img/mudPI_LOGO_small_flat.png" width="50px">
77-

action.py

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

config_load.py

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

controls/arduino/button_control.py

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

controls/arduino/control.py

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

0 commit comments

Comments
 (0)