Merge branch 'master' of https://github.com/tjohn327/raspberry_pi_ups

tjohn327 · Aug 8, 2020 · 9a0dbda · 9a0dbda
2 parents d9edc08 + a0da319
commit 9a0dbda
Show file tree

Hide file tree

Showing 43 changed files with 304,027 additions and 69 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,137 @@
+<<<<<<< HEAD
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+=======
+/.vs
+>>>>>>> 9b649e3487e2e2e398a0459c583209f845195f20
diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
diff --git a/.vs/raspberry_pi_ups/v16/.suo b/.vs/raspberry_pi_ups/v16/.suo
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git a/Assests/PowerPIGuide.png b/Assests/PowerPIGuide.png
diff --git a/Assests/PowerPi_R3_1.step b/Assests/PowerPi_R3_1.step
diff --git a/Assests/dashboard_R3.PNG b/Assests/dashboard_R3.PNG
diff --git a/Assests/dashboards.png b/Assests/dashboards.png
diff --git a/Assests/final.jpg b/Assests/final.jpg
diff --git a/Assests/nodered_import.png b/Assests/nodered_import.png
diff --git a/Assests/ups_3view.png b/Assests/ups_3view.png
diff --git a/Assests/ups_R3_1.png b/Assests/ups_R3_1.png