Skip to content

Adding SD Card Upload support for Creator Pro 2 #83

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.

Sign up for GitHub

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

Open
msmthng wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Adding SD Card Upload support for Creator Pro 2 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa6d758
adopting file uploading path for ffcp2
msmthng Feb 17, 2023
e1bef99
update ffp2 compatibility state
msmthng Feb 17, 2023
6411517
Update __init__.py
msmthng Mar 2, 2023
a40f6a7
Update README.md
msmthng Mar 2, 2023
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ feedback.
|Creator 3 |No (no USB port) |No (no USB port) |No (no USB port) |
|Creator Max |? |? |? |
|Creator Pro |No (Use GPX plugin) |No (Use GPX plugin) |No (Use GPX plugin) |
|Creator Pro 2 |No (Use GPX plugin) |Yes |Yes (IDEX in development) |
|Creator Pro 2 |Yes |Yes |Yes (printing with 1 extruder, IDEX in development) |
|Dreamer |Yes |? |? |
|Dreamer NX |Yes |? |? |
|Finder v1 |Yes |Yes |Yes |
Expand Down
28 changes: 25 additions & 3 deletions octoprint_flashforge/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ class FlashForgePlugin(octoprint.plugin.SettingsPlugin,
0x00ff: {"name": "PowerSpec Ultra 3DPrinter (A)"}}}
FILE_PACKET_SIZE = 1024

SPECIAL_SD_HANDLING = ["Creator Pro 2"]


def __init__(self):
import logging
Expand Down Expand Up @@ -361,10 +363,15 @@ def upload_to_sd(self, printer, filename, path, sd_upload_started, sd_upload_suc

if not self._serial_obj:
return

self._logger.debug("upload_to_sd")


def process_upload():
error = ""
errormsg = "Unable to upload to SD card"

self._logger.debug("M28 Upload Handler")

# TODO: should be able to remove this if we can detect and notify if a print job is running when we connect
# to the printer or if the job is started manually on the printer display because we should never get this far
Expand All @@ -381,15 +388,27 @@ def process_upload():

# make sure heaters are off
ok, answer = self._serial_obj.sendcommand(b"M104 S0 T0")


self._logger.debug("M28 Upload Handler M104 send")

if not ok:
error = "{}: {}".format(errormsg, answer)
errormsg += " - printer busy."
else:
self._serial_obj.sendcommand(b"M104 S0 T1")
self._serial_obj.sendcommand(b"M140 S0")

ok, answer = self._serial_obj.sendcommand(b"M28 %d 0:/user/%s" % (file_size, remote_name.encode()), 5000)
self._logger.debug(self._printer_profile['name'])
self._logger.debug(self.SPECIAL_SD_HANDLING)
if self._printer_profile['name'] in self.SPECIAL_SD_HANDLING:
self._logger.debug("M28 FFCP2 Handling")
ok, answer = self._serial_obj.sendcommand(b"M28 %d 1:%s" % (file_size, remote_name.encode()), 5000)
else:
self._logger.debug("M28 Standard Handling")
ok, answer = self._serial_obj.sendcommand(b"M28 %d 0:/user/%s" % (file_size, remote_name.encode()), 5000)

if not ok or b"open failed" in answer:
self._logger.debug("could not create file on printer sd card")
error = "{}: {}".format(errormsg, answer)
errormsg += " - could not create file on printer SD card."

Expand Down Expand Up @@ -439,7 +458,10 @@ def process_upload():
self._serial_obj.makeexclusive(False)
self._serial_obj.enable_keep_alive(True)
# NB M23 select will also trigger a print on FlashForge
self._comm.selectFile("0:/user/%s\r\n" % remote_name, True)
if self._printer_profile['name'] in self.SPECIAL_SD_HANDLING:
self._comm.selectFile("1:%s\r\n" % remote_name, True)
else:
self._comm.selectFile("0:/user/%s\r\n" % remote_name, True)
# TODO: need to set the correct file size for the progress indicator


Expand Down