docker
/
octoprint-containers
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working: Klipper state ready in octoklipper.

This commit is contained in:
cyteen 2021-01-09 23:36:55 +00:00
parent 5c2272b9fe
commit e95946e160
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@ -19,9 +19,7 @@ services:
restart: always restart: always
environment: environment:
WITH_KLIPPER: "yes" WITH_KLIPPER: "yes"
KLIPPER_HOME: "/octo_printer"
#WITH_SAFEMODE: "yes" #WITH_SAFEMODE: "yes"
#OCTO_PRINTER: "/octo_printer"
OCTO_PRINTER: "/tmp" OCTO_PRINTER: "/tmp"
PRINTER_CFG: "klipper-geeetech-a10-bltouch.cfg" PRINTER_CFG: "klipper-geeetech-a10-bltouch.cfg"
SOCAT_TYPE: "TCP" SOCAT_TYPE: "TCP"

7
klipper/Dockerfile
View File

@ -14,7 +14,7 @@ ENV PRINTER_CFG=${PRINTER_CFG}
ARG KLIPPER_HOME="/octo_printer" ARG KLIPPER_HOME="/octo_printer"
ENV KLIPPER_HOME=${KLIPPER_HOME} ENV KLIPPER_HOME=${KLIPPER_HOME}
ARG KLIPPER_SERIAL="/hostdevice/ttyUSB0" ARG KLIPPER_SERIAL="/hostdevices/ttyUSB0"
ENV KLIPPER_SERIAL=${KLIPPER_SERIAL} ENV KLIPPER_SERIAL=${KLIPPER_SERIAL}
ARG OCTO_PRINTER="/tmp" ARG OCTO_PRINTER="/tmp"
@ -64,7 +64,8 @@ extra-index-url=https://www.piwheels.org/simple'\
RUN useradd -ms /bin/bash klippy && adduser klippy dialout RUN useradd -ms /bin/bash klippy && adduser klippy dialout
# Create the shared volume mount point # Create the shared volume mount point
RUN mkdir -p ${KLIPPER_HOME} && chown -R klippy.klippy ${KLIPPER_HOME} RUN mkdir -p ${KLIPPER_HOME}
RUN chown -R klippy.klippy ${KLIPPER_HOME}
USER klippy USER klippy
@ -97,7 +98,7 @@ COPY klipper_cfg/firmware/config ${SRCDIR}/.config
WORKDIR ${SRCDIR} WORKDIR ${SRCDIR}
RUN make RUN make
#RUN make flash FLASH_DEVICE=/hostdevices/ttyUSB0 #RUN make flash FLASH_DEVICE=${KLIPPER_SERIAL}
RUN cp out/klipper.elf.hex /home/klippy/.config/klipper/firmware/ RUN cp out/klipper.elf.hex /home/klippy/.config/klipper/firmware/

2
klipper/bin/run.sh
View File

@ -18,4 +18,4 @@ sed -i 's,^\(serial: \).*,\1'${KLIPPER_SERIAL}',' ${KLIPPER_HOME}/${PRINTER_CFG}
touch ${KLIPPER_HOME}/klippy.log touch ${KLIPPER_HOME}/klippy.log
echo "*** Starting klipper" echo "*** Starting klipper"
${PYTHONDIR}/bin/python3 ${SRCDIR}/klippy/klippy.py ${KLIPPER_HOME}/${PRINTER_CFG} --logfile ${KLIPPER_HOME}/klippy.log --input-tty ${OCTO_PRINTER}/printer ${PYTHONDIR}/bin/python3 ${SRCDIR}/klippy/klippy.py ${KLIPPER_HOME}/${PRINTER_CFG} --logfile ${KLIPPER_HOME}/klippy.log --input-tty ${OCTO_PRINTER}/printer -a ${KLIPPER_HOME}/klippy_uds

4
octoprint/Dockerfile
View File

@ -125,13 +125,9 @@ ARG SOCAT_DEBUG=""
ENV SOCAT_DEBUG ${SOCAT_DEBUG} ENV SOCAT_DEBUG ${SOCAT_DEBUG}
ARG KLIPPER_HOME="/octo_printer"
ENV KLIPPER_HOME ${KLIPPER_HOME}
ARG OCTO_PRINTER="/tmp" ARG OCTO_PRINTER="/tmp"
ENV OCTO_PRINTER ${OCTO_PRINTER} ENV OCTO_PRINTER ${OCTO_PRINTER}
RUN if [ "${WITH_KLIPPER}" = "yes" ]; then \ RUN if [ "${WITH_KLIPPER}" = "yes" ]; then \
#mkdir -p ${KLIPPER_HOME} && \
mkdir ${OCTO_PRINTER} && chgrp dialout ${OCTO_PRINTER} && \ mkdir ${OCTO_PRINTER} && chgrp dialout ${OCTO_PRINTER} && \
pip3 install \ pip3 install \
https://github.com/AliceGrey/OctoPrintKlipperPlugin/archive/master.zip \ https://github.com/AliceGrey/OctoPrintKlipperPlugin/archive/master.zip \