Working: Klipper state ready in octoklipper.
This commit is contained in:
parent
5c2272b9fe
commit
e95946e160
|
|
@ -19,9 +19,7 @@ services:
|
|||
restart: always
|
||||
environment:
|
||||
WITH_KLIPPER: "yes"
|
||||
KLIPPER_HOME: "/octo_printer"
|
||||
#WITH_SAFEMODE: "yes"
|
||||
#OCTO_PRINTER: "/octo_printer"
|
||||
OCTO_PRINTER: "/tmp"
|
||||
PRINTER_CFG: "klipper-geeetech-a10-bltouch.cfg"
|
||||
SOCAT_TYPE: "TCP"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ ENV PRINTER_CFG=${PRINTER_CFG}
|
|||
ARG KLIPPER_HOME="/octo_printer"
|
||||
ENV KLIPPER_HOME=${KLIPPER_HOME}
|
||||
|
||||
ARG KLIPPER_SERIAL="/hostdevice/ttyUSB0"
|
||||
ARG KLIPPER_SERIAL="/hostdevices/ttyUSB0"
|
||||
ENV KLIPPER_SERIAL=${KLIPPER_SERIAL}
|
||||
|
||||
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
|
||||
|
||||
# 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
|
||||
|
||||
|
|
@ -97,7 +98,7 @@ COPY klipper_cfg/firmware/config ${SRCDIR}/.config
|
|||
|
||||
WORKDIR ${SRCDIR}
|
||||
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/
|
||||
|
||||
|
|
|
|||
|
|
@ -18,4 +18,4 @@ sed -i 's,^\(serial: \).*,\1'${KLIPPER_SERIAL}',' ${KLIPPER_HOME}/${PRINTER_CFG}
|
|||
touch ${KLIPPER_HOME}/klippy.log
|
||||
|
||||
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
|
||||
|
|
|
|||
|
|
@ -125,13 +125,9 @@ ARG SOCAT_DEBUG=""
|
|||
ENV SOCAT_DEBUG ${SOCAT_DEBUG}
|
||||
|
||||
|
||||
ARG KLIPPER_HOME="/octo_printer"
|
||||
ENV KLIPPER_HOME ${KLIPPER_HOME}
|
||||
|
||||
ARG OCTO_PRINTER="/tmp"
|
||||
ENV OCTO_PRINTER ${OCTO_PRINTER}
|
||||
RUN if [ "${WITH_KLIPPER}" = "yes" ]; then \
|
||||
#mkdir -p ${KLIPPER_HOME} && \
|
||||
mkdir ${OCTO_PRINTER} && chgrp dialout ${OCTO_PRINTER} && \
|
||||
pip3 install \
|
||||
https://github.com/AliceGrey/OctoPrintKlipperPlugin/archive/master.zip \
|
||||
|
|
|
|||
Loading…
Reference in New Issue