diff --git a/octoprint-klipper/CHANGELOG.md b/octoprint-klipper/CHANGELOG.md index 90414824..e07ad1dc 100644 --- a/octoprint-klipper/CHANGELOG.md +++ b/octoprint-klipper/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +[0.7.2] + +- Use main file instead of symlink for Klipper launch +- Include numpy and matplotlib for Klipper + [0.7.1] - Update base image diff --git a/octoprint-klipper/Dockerfile b/octoprint-klipper/Dockerfile index 7db140c4..3ffb5ab4 100644 --- a/octoprint-klipper/Dockerfile +++ b/octoprint-klipper/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM="fredrikbaberg/addon-octoprint-next-amd64:0.4.0" +ARG BUILD_FROM="fredrikbaberg/addon-octoprint-next-amd64:0.4.2" FROM ${BUILD_FROM} AS octoklipper @@ -44,12 +44,10 @@ RUN echo "Install build dependencies." && \ py3-virtualenv \ libffi-dev \ gcc-avr \ - # python2-dev && \ + freetype-dev \ # ncurses-dev \ - # gcc-avr \ # binutils-avr \ # avr-libc \ - # freetype-dev \ # fribidi-dev \ # harfbuzz-dev \ # jpeg-dev \ @@ -67,6 +65,7 @@ RUN echo "Install build dependencies." && \ avrdude \ libgpiod \ git \ + libpng \ && \ echo "Setup virtual environment." && \ # virtualenv --python=python3 /root/klippy-env && \ @@ -75,6 +74,8 @@ RUN echo "Install build dependencies." && \ /root/klippy-env/bin/python -m pip install ${PIP_FLAGS} --upgrade pip && \ echo "Install Klipper" && \ pip install ${PIP_FLAGS} -r /root/klipper/scripts/klippy-requirements.txt && \ + echo "Install numpy and matplotlib" && \ + /root/klippy-env/bin/python -m pip install ${PIP_FLAGS} numpy matplotlib && \ echo "Compile for Linux MCU" && \ cd /root/klipper && \ make && \ diff --git a/octoprint-klipper/config.json b/octoprint-klipper/config.json index 66c7886b..0dd513a1 100644 --- a/octoprint-klipper/config.json +++ b/octoprint-klipper/config.json @@ -1,6 +1,6 @@ { "name": "OctoPrint Klipper", - "version": "0.7.1", + "version": "0.7.2", "slug": "octoprint-klipper", "description": "OctoPrint with Klipper add-on for Home Assistant", "arch": ["armhf", "armv7", "amd64"], diff --git a/octoprint-klipper/rootfs/etc/services.d/klipper/run b/octoprint-klipper/rootfs/etc/services.d/klipper/run index e0cba7c2..c39b87af 100644 --- a/octoprint-klipper/rootfs/etc/services.d/klipper/run +++ b/octoprint-klipper/rootfs/etc/services.d/klipper/run @@ -4,7 +4,7 @@ bashio::log.info "Starting Klipper." KLIPPER_PYTHON=/root/klippy-env/bin/python KLIPPY=/root/klipper/klippy/klippy.py -KLIPPER_CFG=${HOME}/printer.cfg +KLIPPER_CFG=/data/klipper/printer.cfg KLIPPY_LOGFILE=/tmp/klippy.log touch ${KLIPPY_LOGFILE}