diff --git a/3dprinter-klipper/rootfs/etc/caddy/Caddyfile b/3dprinter-klipper/rootfs/etc/caddy/Caddyfile index ea51cdd..deaf315 100644 --- a/3dprinter-klipper/rootfs/etc/caddy/Caddyfile +++ b/3dprinter-klipper/rootfs/etc/caddy/Caddyfile @@ -1,10 +1,10 @@ -{ - # debug - log { - format console - output file /var/log/caddy/caddy.log - } - auto_https disable_redirects -} - -import sites-enabled/*.caddy +{ + # debug + log { + format console + output file /var/log/caddy/caddy.log + } + auto_https disable_redirects +} + +import sites-enabled/*.caddy diff --git a/3dprinter-klipper/rootfs/etc/caddy/env b/3dprinter-klipper/rootfs/etc/caddy/env index ee0e2e0..49daa0e 100644 --- a/3dprinter-klipper/rootfs/etc/caddy/env +++ b/3dprinter-klipper/rootfs/etc/caddy/env @@ -1,2 +1,2 @@ -XDG_CONFIG_HOME="/data/config" -XDG_DATA_HOME="/data/config" +XDG_CONFIG_HOME="/data/config" +XDG_DATA_HOME="/data/config" diff --git a/3dprinter-klipper/rootfs/etc/cont-init.d/klippy.sh b/3dprinter-klipper/rootfs/etc/cont-init.d/klippy.sh index 6ae768f..10bca85 100755 --- a/3dprinter-klipper/rootfs/etc/cont-init.d/klippy.sh +++ b/3dprinter-klipper/rootfs/etc/cont-init.d/klippy.sh @@ -1,46 +1,46 @@ -#!/usr/bin/with-contenv bashio - -SRC_PATH=$ADDON_SRC_PATH/klipper -VENV_PATH=$ADDON_VENV_PATH/klipper -CONFIG_PATH=$ADDON_CONFIG_PATH/moonraker/config - -# Get Klipper source. -if [ ! -d "$SRC_PATH" ]; then - bashio::log "Get Klipper source" - git clone https://github.com/Klipper3d/klipper "$SRC_PATH" -else - echo "Klipper already installed" -fi -# Install Klipper in virtual environment. -if [ ! -d "$VENV_PATH" ]; then - bashio::log "Prepare Klippy-env" - virtualenv "$VENV_PATH" - "$VENV_PATH"/bin/python -m pip install --upgrade pip - "$VENV_PATH"/bin/pip install -r "$SRC_PATH"/scripts/klippy-requirements.txt -else - bashio::log "Klippy env already installed" -fi -# Make sure config file(s) exists. -if [ ! -d "$CONFIG_PATH" ]; then - mkdir -p "$CONFIG_PATH" - cp -R /etc/klipper/config/* "$CONFIG_PATH" - ## Create log folder and file - mkdir -p $ADDON_CONFIG_PATH/moonraker/logs - touch $ADDON_CONFIG_PATH/moonraker/logs/klippy.log -fi - -# Build and add host process, if set. -if bashio::config.true 'host_mcu'; then - bashio::log "Enable host process." - BIN_PATH=$ADDON_CONFIG_PATH/bin - if [ ! -f "$BIN_PATH"/klipper_mcu_host ]; then - mkdir -p "$BIN_PATH" - cp /etc/klipper/config_host_mcu "$SRC_PATH"/.config - cd "$SRC_PATH" || exit - make - cp out/klipper.elf "$BIN_PATH"/klipper_mcu_host - fi - rm -f /etc/services.d/klipper_host/down -else - touch /etc/services.d/klipper_host/down -fi +#!/usr/bin/with-contenv bashio + +SRC_PATH=$ADDON_SRC_PATH/klipper +VENV_PATH=$ADDON_VENV_PATH/klipper +CONFIG_PATH=$ADDON_CONFIG_PATH/moonraker/config + +# Get Klipper source. +if [ ! -d "$SRC_PATH" ]; then + bashio::log "Get Klipper source" + git clone https://github.com/Klipper3d/klipper "$SRC_PATH" +else + echo "Klipper already installed" +fi +# Install Klipper in virtual environment. +if [ ! -d "$VENV_PATH" ]; then + bashio::log "Prepare Klippy-env" + virtualenv "$VENV_PATH" + "$VENV_PATH"/bin/python -m pip install --upgrade pip + "$VENV_PATH"/bin/pip install -r "$SRC_PATH"/scripts/klippy-requirements.txt +else + bashio::log "Klippy env already installed" +fi +# Make sure config file(s) exists. +if [ ! -d "$CONFIG_PATH" ]; then + mkdir -p "$CONFIG_PATH" + cp -R /etc/klipper/config/* "$CONFIG_PATH" + ## Create log folder and file + mkdir -p $ADDON_CONFIG_PATH/moonraker/logs + touch $ADDON_CONFIG_PATH/moonraker/logs/klippy.log +fi + +# Build and add host process, if set. +if bashio::config.true 'host_mcu'; then + bashio::log "Enable host process." + BIN_PATH=$ADDON_CONFIG_PATH/bin + if [ ! -f "$BIN_PATH"/klipper_mcu_host ]; then + mkdir -p "$BIN_PATH" + cp /etc/klipper/config_host_mcu "$SRC_PATH"/.config + cd "$SRC_PATH" || exit + make + cp out/klipper.elf "$BIN_PATH"/klipper_mcu_host + fi + rm -f /etc/services.d/klipper_host/down +else + touch /etc/services.d/klipper_host/down +fi diff --git a/3dprinter-klipper/rootfs/etc/cont-init.d/moonraker.sh b/3dprinter-klipper/rootfs/etc/cont-init.d/moonraker.sh index 8098813..c5c7e2e 100755 --- a/3dprinter-klipper/rootfs/etc/cont-init.d/moonraker.sh +++ b/3dprinter-klipper/rootfs/etc/cont-init.d/moonraker.sh @@ -1,29 +1,29 @@ -#!/usr/bin/with-contenv bashio - -SRC_PATH=$ADDON_SRC_PATH/moonraker -VENV_PATH=$ADDON_VENV_PATH/moonraker -CONFIG_PATH=$ADDON_CONFIG_PATH/moonraker/config - -# Get Moonraker source. -if [ ! -d "$SRC_PATH" ]; then - bashio::log "Get Moonraker source" - git clone https://github.com/Arksine/moonraker.git "$SRC_PATH" -fi -# Install Moonraker in virtual environment. -if [ ! -d "$VENV_PATH" ]; then - bashio::log "Prepare Moonraker-env" - virtualenv "$VENV_PATH" - "$VENV_PATH"/bin/python -m pip install --upgrade pip - "$VENV_PATH"/bin/pip install -r "$SRC_PATH"/scripts/moonraker-requirements.txt - "$VENV_PATH"/bin/pip install msgspec uvloop -else - bashio::log "Moonraker env already installed" -fi -# Make sure config exists. -if [ ! -f "$CONFIG_PATH"/moonraker.conf ]; then - mkdir -p "$CONFIG_PATH" - cp /etc/klipper/config/moonraker.conf "$CONFIG_PATH"/moonraker.conf - ## Create log folder and file - mkdir -p $ADDON_CONFIG_PATH/moonraker/logs - touch $ADDON_CONFIG_PATH/moonraker/logs/moonraker.log -fi +#!/usr/bin/with-contenv bashio + +SRC_PATH=$ADDON_SRC_PATH/moonraker +VENV_PATH=$ADDON_VENV_PATH/moonraker +CONFIG_PATH=$ADDON_CONFIG_PATH/moonraker/config + +# Get Moonraker source. +if [ ! -d "$SRC_PATH" ]; then + bashio::log "Get Moonraker source" + git clone https://github.com/Arksine/moonraker.git "$SRC_PATH" +fi +# Install Moonraker in virtual environment. +if [ ! -d "$VENV_PATH" ]; then + bashio::log "Prepare Moonraker-env" + virtualenv "$VENV_PATH" + "$VENV_PATH"/bin/python -m pip install --upgrade pip + "$VENV_PATH"/bin/pip install -r "$SRC_PATH"/scripts/moonraker-requirements.txt + "$VENV_PATH"/bin/pip install msgspec uvloop +else + bashio::log "Moonraker env already installed" +fi +# Make sure config exists. +if [ ! -f "$CONFIG_PATH"/moonraker.conf ]; then + mkdir -p "$CONFIG_PATH" + cp /etc/klipper/config/moonraker.conf "$CONFIG_PATH"/moonraker.conf + ## Create log folder and file + mkdir -p $ADDON_CONFIG_PATH/moonraker/logs + touch $ADDON_CONFIG_PATH/moonraker/logs/moonraker.log +fi diff --git a/3dprinter-klipper/rootfs/etc/cont-init.d/proxy.sh b/3dprinter-klipper/rootfs/etc/cont-init.d/proxy.sh index 4876519..162d47b 100755 --- a/3dprinter-klipper/rootfs/etc/cont-init.d/proxy.sh +++ b/3dprinter-klipper/rootfs/etc/cont-init.d/proxy.sh @@ -1,21 +1,21 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Add-on: 3dprinter-octoprint -# Configures proxy -# ============================================================================== - -# Generate proxy configuration -bashio::var.json \ - addon_hostname "$(bashio::addon.hostname)" \ - addon_ip "$(bashio::addon.ip_address)" \ - trusted_proxies "$(bashio::config 'trusted_proxies')" \ - camera_url "$(bashio::config 'camera_url')" \ - ingress_port "^$(bashio::addon.ingress_port)" \ - fluidd_src "$ADDON_SRC_PATH/fluidd" \ - mainsail_src "$ADDON_SRC_PATH/mainsail" \ - | tempio \ - -template /usr/share/tempio/caddy/Caddyfile.gtpl \ - -out /etc/caddy/sites-enabled/moonraker.caddy - -# Make sure config is correctly formatted. -caddy fmt --overwrite /etc/caddy/Caddyfile +#!/usr/bin/with-contenv bashio +# ============================================================================== +# Add-on: 3dprinter-octoprint +# Configures proxy +# ============================================================================== + +# Generate proxy configuration +bashio::var.json \ + addon_hostname "$(bashio::addon.hostname)" \ + addon_ip "$(bashio::addon.ip_address)" \ + trusted_proxies "$(bashio::config 'trusted_proxies')" \ + camera_url "$(bashio::config 'camera_url')" \ + ingress_port "^$(bashio::addon.ingress_port)" \ + fluidd_src "$ADDON_SRC_PATH/fluidd" \ + mainsail_src "$ADDON_SRC_PATH/mainsail" \ + | tempio \ + -template /usr/share/tempio/caddy/Caddyfile.gtpl \ + -out /etc/caddy/sites-enabled/moonraker.caddy + +# Make sure config is correctly formatted. +caddy fmt --overwrite /etc/caddy/Caddyfile diff --git a/3dprinter-klipper/rootfs/etc/cont-init.d/simuavr.sh b/3dprinter-klipper/rootfs/etc/cont-init.d/simuavr.sh index 25e751d..0af56c3 100755 --- a/3dprinter-klipper/rootfs/etc/cont-init.d/simuavr.sh +++ b/3dprinter-klipper/rootfs/etc/cont-init.d/simuavr.sh @@ -1,30 +1,30 @@ -#!/usr/bin/with-contenv bashio - -SRC_PATH=$ADDON_SRC_PATH/simulavr - -if bashio::config.false 'simulavr'; then - bashio::log "Keep Simulavr disabled." - touch /etc/services.d/simulavr/down - return -else - rm -f /etc/services.d/simulavr/down -fi - -# Install Simuavr -if [ ! -d "$SRC_PATH" ]; then - echo "Get SimulAVR source" - git clone git://git.savannah.nongnu.org/simulavr.git "$SRC_PATH" - cd "$SRC_PATH" || exit - make python - make build -fi - -# Add simulavr process -BIN_PATH=$ADDON_CONFIG_PATH/bin -if [ ! -f "$BIN_PATH"/klipper_mcu_simulavr ]; then - mkdir -p "$BIN_PATH" - cp /etc/klipper/config_simulavr "$ADDON_SRC_PATH"/klipper/.config - cd "$ADDON_SRC_PATH"/klipper || exit - make - cp out/klipper.elf "$BIN_PATH"/klipper_mcu_simulavr.elf -fi +#!/usr/bin/with-contenv bashio + +SRC_PATH=$ADDON_SRC_PATH/simulavr + +if bashio::config.false 'simulavr'; then + bashio::log "Keep Simulavr disabled." + touch /etc/services.d/simulavr/down + return +else + rm -f /etc/services.d/simulavr/down +fi + +# Install Simuavr +if [ ! -d "$SRC_PATH" ]; then + echo "Get SimulAVR source" + git clone git://git.savannah.nongnu.org/simulavr.git "$SRC_PATH" + cd "$SRC_PATH" || exit + make python + make build +fi + +# Add simulavr process +BIN_PATH=$ADDON_CONFIG_PATH/bin +if [ ! -f "$BIN_PATH"/klipper_mcu_simulavr ]; then + mkdir -p "$BIN_PATH" + cp /etc/klipper/config_simulavr "$ADDON_SRC_PATH"/klipper/.config + cd "$ADDON_SRC_PATH"/klipper || exit + make + cp out/klipper.elf "$BIN_PATH"/klipper_mcu_simulavr.elf +fi diff --git a/3dprinter-klipper/rootfs/etc/klipper/config_host_mcu b/3dprinter-klipper/rootfs/etc/klipper/config_host_mcu index 3e30d40..001fe3e 100644 --- a/3dprinter-klipper/rootfs/etc/klipper/config_host_mcu +++ b/3dprinter-klipper/rootfs/etc/klipper/config_host_mcu @@ -1,32 +1,32 @@ -# CONFIG_LOW_LEVEL_OPTIONS is not set -# CONFIG_MACH_AVR is not set -# CONFIG_MACH_ATSAM is not set -# CONFIG_MACH_ATSAMD is not set -# CONFIG_MACH_LPC176X is not set -# CONFIG_MACH_STM32 is not set -# CONFIG_MACH_HC32F460 is not set -# CONFIG_MACH_RP2040 is not set -# CONFIG_MACH_PRU is not set -# CONFIG_MACH_AR100 is not set -CONFIG_MACH_LINUX=y -# CONFIG_MACH_SIMU is not set -CONFIG_BOARD_DIRECTORY="linux" -CONFIG_CLOCK_FREQ=50000000 -CONFIG_LINUX_SELECT=y -CONFIG_USB_VENDOR_ID=0x1d50 -CONFIG_USB_DEVICE_ID=0x614e -CONFIG_USB_SERIAL_NUMBER="12345" -CONFIG_WANT_GPIO_BITBANGING=y -CONFIG_WANT_DISPLAYS=y -CONFIG_WANT_SENSORS=y -CONFIG_WANT_LIS2DW=y -CONFIG_WANT_SOFTWARE_I2C=y -CONFIG_WANT_SOFTWARE_SPI=y -CONFIG_NEED_SENSOR_BULK=y -CONFIG_CANBUS_FREQUENCY=1000000 -CONFIG_HAVE_GPIO=y -CONFIG_HAVE_GPIO_ADC=y -CONFIG_HAVE_GPIO_SPI=y -CONFIG_HAVE_GPIO_I2C=y -CONFIG_HAVE_GPIO_HARD_PWM=y -CONFIG_INLINE_STEPPER_HACK=y +# CONFIG_LOW_LEVEL_OPTIONS is not set +# CONFIG_MACH_AVR is not set +# CONFIG_MACH_ATSAM is not set +# CONFIG_MACH_ATSAMD is not set +# CONFIG_MACH_LPC176X is not set +# CONFIG_MACH_STM32 is not set +# CONFIG_MACH_HC32F460 is not set +# CONFIG_MACH_RP2040 is not set +# CONFIG_MACH_PRU is not set +# CONFIG_MACH_AR100 is not set +CONFIG_MACH_LINUX=y +# CONFIG_MACH_SIMU is not set +CONFIG_BOARD_DIRECTORY="linux" +CONFIG_CLOCK_FREQ=50000000 +CONFIG_LINUX_SELECT=y +CONFIG_USB_VENDOR_ID=0x1d50 +CONFIG_USB_DEVICE_ID=0x614e +CONFIG_USB_SERIAL_NUMBER="12345" +CONFIG_WANT_GPIO_BITBANGING=y +CONFIG_WANT_DISPLAYS=y +CONFIG_WANT_SENSORS=y +CONFIG_WANT_LIS2DW=y +CONFIG_WANT_SOFTWARE_I2C=y +CONFIG_WANT_SOFTWARE_SPI=y +CONFIG_NEED_SENSOR_BULK=y +CONFIG_CANBUS_FREQUENCY=1000000 +CONFIG_HAVE_GPIO=y +CONFIG_HAVE_GPIO_ADC=y +CONFIG_HAVE_GPIO_SPI=y +CONFIG_HAVE_GPIO_I2C=y +CONFIG_HAVE_GPIO_HARD_PWM=y +CONFIG_INLINE_STEPPER_HACK=y diff --git a/3dprinter-klipper/rootfs/etc/services.d/klipper_host/run b/3dprinter-klipper/rootfs/etc/services.d/klipper_host/run index fee22e8..e86d562 100755 --- a/3dprinter-klipper/rootfs/etc/services.d/klipper_host/run +++ b/3dprinter-klipper/rootfs/etc/services.d/klipper_host/run @@ -1,10 +1,10 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Add-on: 3dprinter-Klipper -# Runs Host Sim MCU -# ============================================================================== - -bashio::log.info "Starting Host MCU..." - -## Run your program -exec "$ADDON_CONFIG_PATH"/bin/klipper_mcu_host +#!/usr/bin/with-contenv bashio +# ============================================================================== +# Add-on: 3dprinter-Klipper +# Runs Host Sim MCU +# ============================================================================== + +bashio::log.info "Starting Host MCU..." + +## Run your program +exec "$ADDON_CONFIG_PATH"/bin/klipper_mcu_host diff --git a/3dprinter-klipper/rootfs/etc/services.d/klippy/run b/3dprinter-klipper/rootfs/etc/services.d/klippy/run index 062c730..b500c0b 100755 --- a/3dprinter-klipper/rootfs/etc/services.d/klippy/run +++ b/3dprinter-klipper/rootfs/etc/services.d/klippy/run @@ -1,19 +1,19 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Add-on: 3dprinter-Klipper -# Runs Klippy -# ============================================================================== - -bashio::log.info "Starting Klippy..." - - -if bashio::config.true 'host_mcu'; then - while [ ! -e /tmp/klipper_host_mcu ] - do - bashio::log "Wait for klipper_host_mcu" - sleep 5 - done -fi - -## Run your program -exec "$ADDON_VENV_PATH"/klipper/bin/python "$ADDON_SRC_PATH"/klipper/klippy/klippy.py "$ADDON_CONFIG_PATH"/moonraker/config/printer.cfg -a /tmp/klippy_uds -l "$ADDON_CONFIG_PATH"/moonraker/logs/klippy.log +#!/usr/bin/with-contenv bashio +# ============================================================================== +# Add-on: 3dprinter-Klipper +# Runs Klippy +# ============================================================================== + +bashio::log.info "Starting Klippy..." + + +if bashio::config.true 'host_mcu'; then + while [ ! -e /tmp/klipper_host_mcu ] + do + bashio::log "Wait for klipper_host_mcu" + sleep 5 + done +fi + +## Run your program +exec "$ADDON_VENV_PATH"/klipper/bin/python "$ADDON_SRC_PATH"/klipper/klippy/klippy.py "$ADDON_CONFIG_PATH"/moonraker/config/printer.cfg -a /tmp/klippy_uds -l "$ADDON_CONFIG_PATH"/moonraker/logs/klippy.log diff --git a/3dprinter-klipper/rootfs/etc/services.d/moonraker/run b/3dprinter-klipper/rootfs/etc/services.d/moonraker/run index 73a7913..97b2098 100755 --- a/3dprinter-klipper/rootfs/etc/services.d/moonraker/run +++ b/3dprinter-klipper/rootfs/etc/services.d/moonraker/run @@ -1,14 +1,14 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Add-on: 3dprinter-Klipper -# Runs Moonraker -# ============================================================================== - -bashio::log.info "Starting Moonraker..." - -## Preparations, create log folder and file -mkdir -p "$ADDON_CONFIG_PATH"/moonraker/logs -touch "$ADDON_CONFIG_PATH"/moonraker/logs/moonraker.log - -## Run your program -exec "$ADDON_VENV_PATH"/moonraker/bin/python "$ADDON_SRC_PATH"/moonraker/moonraker/moonraker.py -d "$ADDON_CONFIG_PATH"/moonraker -v +#!/usr/bin/with-contenv bashio +# ============================================================================== +# Add-on: 3dprinter-Klipper +# Runs Moonraker +# ============================================================================== + +bashio::log.info "Starting Moonraker..." + +## Preparations, create log folder and file +mkdir -p "$ADDON_CONFIG_PATH"/moonraker/logs +touch "$ADDON_CONFIG_PATH"/moonraker/logs/moonraker.log + +## Run your program +exec "$ADDON_VENV_PATH"/moonraker/bin/python "$ADDON_SRC_PATH"/moonraker/moonraker/moonraker.py -d "$ADDON_CONFIG_PATH"/moonraker -v diff --git a/3dprinter-klipper/rootfs/etc/services.d/proxy/run b/3dprinter-klipper/rootfs/etc/services.d/proxy/run index 911d49a..eb858f3 100755 --- a/3dprinter-klipper/rootfs/etc/services.d/proxy/run +++ b/3dprinter-klipper/rootfs/etc/services.d/proxy/run @@ -1,9 +1,9 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Add-on: 3dprinter-octoprint -# Runs the reverse proxy. -# ============================================================================== - -bashio::log.info "Starting proxy..." - -exec caddy run --config /etc/caddy/Caddyfile --envfile /etc/caddy/env +#!/usr/bin/with-contenv bashio +# ============================================================================== +# Add-on: 3dprinter-octoprint +# Runs the reverse proxy. +# ============================================================================== + +bashio::log.info "Starting proxy..." + +exec caddy run --config /etc/caddy/Caddyfile --envfile /etc/caddy/env diff --git a/3dprinter-klipper/rootfs/etc/services.d/simulavr/run b/3dprinter-klipper/rootfs/etc/services.d/simulavr/run index aea11ca..bbcb11b 100755 --- a/3dprinter-klipper/rootfs/etc/services.d/simulavr/run +++ b/3dprinter-klipper/rootfs/etc/services.d/simulavr/run @@ -1,11 +1,11 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Add-on: 3dprinter-Klipper -# Runs Host SimulAVR MCU -# ============================================================================== - -bashio::log.info "Starting SimulAVR MCU..." - -## Run your program -export PYTHONPATH=$ADDON_SRC_PATH/simulavr/build/pysimulavr -exec "$ADDON_SRC_PATH"/klipper/scripts/avrsim.py "$ADDON_CONFIG_PATH"/bin/klipper_mcu_simulavr.elf +#!/usr/bin/with-contenv bashio +# ============================================================================== +# Add-on: 3dprinter-Klipper +# Runs Host SimulAVR MCU +# ============================================================================== + +bashio::log.info "Starting SimulAVR MCU..." + +## Run your program +export PYTHONPATH=$ADDON_SRC_PATH/simulavr/build/pysimulavr +exec "$ADDON_SRC_PATH"/klipper/scripts/avrsim.py "$ADDON_CONFIG_PATH"/bin/klipper_mcu_simulavr.elf