Skip to content

Commit

Permalink
4.1.0
Browse files Browse the repository at this point in the history
Remove API
Fix Webcam for OctoPrint 1.9.0
Consolidate cpu_info and cpu message sent to SP servers
add mac address info to machine data
update default reconnect intervals
change _get_routed_ip to use new logic
fix spelling error on ai_timer_restart
  • Loading branch information
jneilliii committed May 3, 2023
2 parents 54a2c33 + 8fbe8a1 commit e94a285
Show file tree
Hide file tree
Showing 3 changed files with 165 additions and 2 deletions.
161 changes: 160 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,160 @@
.idea
# 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/
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/
cover/

# 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
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .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

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__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/

# Cython debug symbols
cython_debug/

# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
.idea/
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# SimplyPrint - the all in one cloud platform for your 3D printer(s)

This is the "SimplyPrint Cloud" plugin for OctoPrint, which connects your 3D printer(s) to the [SimplyPrint](https://simplyprint.io/) platform.

SimplyPrint is a new cloud platform, and our mission is to make everything much more simple. Here are some of SimplyPrint's features;

- Good, user friendly interface
- Easy access from both computer and smartphone
- Simple setup; get started in 5-10 minutes with the most user friendly setup guide you've seen (probably ;))
Expand Down
4 changes: 3 additions & 1 deletion octoprint_simplyprint/websocket/system.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import re
import ipaddress
import json
import uuid

import psutil
import requests
import sarge
Expand Down Expand Up @@ -70,7 +72,7 @@ def get_system_info(self) -> Dict[str, Any]:
def _get_python_version(self) -> str:
return ".".join(str(part) for part in sys.version_info[:3])

def get_mac_address():
def get_mac_address(self):
mac_int = uuid.getnode()
mac_hex = "{:012x}".format(mac_int)
mac_address = ":".join(mac_hex[i:i + 2] for i in range(0, 12, 2)).upper()
Expand Down

0 comments on commit e94a285

Please sign in to comment.