Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add an experimental camera mode to PrusaLink #848

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ include requirements-pi.txt
graft prusa/link/data
graft prusa/link/templates
graft prusa/link/static
graft prusa/link/static_cam
graft image_builder
global-exclude *~
global-exclude *.swp
Expand Down
2 changes: 1 addition & 1 deletion image_builder/image_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ def build_image():
run_over_ssh("sudo apt-get install -y uuid")
run_over_ssh("sudo apt-get install -y git python3-pip pigpio libcap-dev "
"libmagic1 libturbojpeg0 libatlas-base-dev libffi-dev "
"cmake iptables python3-libcamera")
"cmake iptables python3-libcamera python3-gi")

print("Installing PrusaLink")
# Caution: not tied to requirements-pi.txt
Expand Down
8 changes: 5 additions & 3 deletions prusa/link/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ def main():
nargs='?',
default="start",
type=str,
help="daemon action (start|stop|restart|status) (default: start)")
help="daemon action (start|stop|restart|status|start_camera) "
"(default: start)")
parser.add_argument("-f",
"--foreground",
action="store_true",
Expand Down Expand Up @@ -217,13 +218,14 @@ def main():
print("Restarting service with pid", pid)
stop(pid)

elif args.command == "start":
elif args.command in ("start", "start_camera"):
pass
elif not args.foreground:
parser.error("Unknown command %s")
return 1

daemon = Daemon(config, argv)
daemon = Daemon(config, argv,
is_camera=args.command == "start_camera")
if args.foreground:
log.info("Starting service on foreground.")
return daemon.run(False)
Expand Down
18 changes: 12 additions & 6 deletions prusa/link/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,8 @@ def __init__(self, settings_file):
self.service_local = Model(
self.get_section('service::local',
(('enable', int, 1), ('username', str, ''),
('digest', str, ''), ('api_key', str, ''))))
('digest', str, ''), ('api_key', str, ''),
('auth', bool, True))))

Settings.instance = self

Expand All @@ -333,14 +334,19 @@ def update_sections(self, connect_skip=False):
self.set_section('service::connect', self.service_connect)
self.set_section('service::local', self.service_local)

def is_wizard_needed(self):
def is_wizard_needed(self, camera_mode=False):
"""
Is there a reason for the wizard to be shown?
"""
interested_in = [
self.printer["type"], self.service_local["username"],
self.service_local["digest"],
]
interested_in = []

if self.service_local["auth"]:
interested_in.extend([
self.service_local["username"],
self.service_local["digest"],
])
if not camera_mode:
interested_in.append(self.printer["type"])
return not all(interested_in)

def use_connect(self):
Expand Down
9 changes: 7 additions & 2 deletions prusa/link/daemon.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

from .config import Settings
from .printer_adapter import prusa_link
from .printer_adapter.prusa_cam import PrusaCam
from .printer_adapter.prusa_link import PrusaLink
from .web import WebServer, init_web_app
from .web.lib.core import app
Expand All @@ -20,13 +21,14 @@ class Daemon:
instance = None

# pylint: disable=too-few-public-methods
def __init__(self, config, argv: List):
def __init__(self, config, argv: List, is_camera=False):
if Daemon.instance:
raise RuntimeError("Daemon can be only one.")

self.cfg = config
self.argv = argv
self.settings = None
self.is_camera = is_camera

self.http = None
self.prusa_link = None
Expand All @@ -48,7 +50,10 @@ def run(self, daemon=True):
# Log daemon stuff as printer_adapter
adapter_logger = logging.getLogger(prusa_link.__name__)
try:
self.prusa_link = PrusaLink(self.cfg, self.settings)
if self.is_camera:
self.prusa_link = PrusaCam(self.cfg, self.settings)
else:
self.prusa_link = PrusaLink(self.cfg, self.settings)
except Exception: # pylint: disable=broad-except
adapter_logger.exception("Adapter was not start")
self.http.stop()
Expand Down
15 changes: 15 additions & 0 deletions prusa/link/data/add-ap0.service-template
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[Unit]
Description=Add ap0 interface
Requires=sys-subsystem-net-devices-wlan0.device
Before=dhcpcd.service
Before=wpa_supplicant.service
Restart=on-failure
StartLimitIntervalSec=1
StartLimitBurst=5

[Service]
Type=oneshot
ExecStart=/usr/sbin/iw dev {device} interface add ap0 type __ap

[Install]
WantedBy=multi-user.target
Loading
Loading