liz/hacdc-klipper
liz/hacdc-klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some finishing touches I hope

Browse Source
This commit is contained in:
Elizabeth Cray 2024-08-05 22:15:04 -04:00
parent 8983526714
commit 065e262b0e
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dirs/printer_data/systemd/klipper.env
View File

@ -1 +1 @@
KLIPPER_ARGS="/home/pi/PRINTERNAME/klipper/klippy/klippy.py /home/pi/PRINTERNAME/printer_data/onfig/printer.cfg -l /home/pi/taz/printer_data_taz/logs/klippy.log -I /home/pi/taz/printer_data_taz/comms/klippy.serial -a /home/pi/taz/printer_data_taz/comms/klippy.sock" KLIPPER_ARGS="/home/pi/PRINTERNAME/klipper/klippy/klippy.py /home/pi/PRINTERNAME/printer_data/config/printer.cfg -l /home/pi/PRINTERNAME/printer_data/logs/klippy.log -I /home/pi/PRINTERNAME/printer_data/comms/klippy.serial -a /home/pi/PRINTERNAME/printer_data/comms/klippy.sock"

31
setup.sh
View File

@ -21,6 +21,11 @@ source ./ColorEchoForShell/dist/ColorEcho.bash
# Pull Klipper # Pull Klipper
git submodule update --init --recursive git submodule update --init --recursive
# Install packages
echo.Cyan "Installing required packageas"
for PACKAGE in `cat $ROOT_DIR/config/apt-packages`; do
sudo apt install -y $PACKAGE
done
# Name Printer # Name Printer
# Todo: avoid duplications # Todo: avoid duplications
@ -115,10 +120,25 @@ wget -q -O mainsail.zip https://github.com/mainsail-crew/mainsail/releases/lates
unzip -o mainsail.zip -d $PRINTER_NAME/mainsail unzip -o mainsail.zip -d $PRINTER_NAME/mainsail
rm mainsail.zip rm mainsail.zip
# Setup python env
echo.Cyan "Setup Python Virtual Environment"
cd $ROOT_DIR/$PRINTER_NAME
/usr/bin/virtualenv klippy-env
$ROOT_DIR/$PRINTER_NAME/klippy-env/bin/pip install -r $ROOT_DIR/$PRINTER_NAME/klipper/scripts/klippy-requirements.txt
# Configure Systemd Environment Files
echo.Cyan "Config Systemd Envs"
cd $ROOT_DIR/$PRINTER_NAME/printer_data/systemd
for ENV in *.env; do
cat "$ENV" | replace "/home/pi" "$HOME" | replace "PRINTERNAME" "$PRINTER_NAME" | replace "PRINTERDATA" "$PRINTER_NAME"> "$ENV.tmp"
rm "$ENV"
mv "$ENV.tmp" "$ENV"
done
# Copy To Final Location # Copy To Final Location
echo.Cyan "Run Copy" echo.Cyan "Run Copy"
mkdir -p $HOME/$PRINTER_NAME mkdir -p $HOME/$PRINTER_NAME
cp -r $PRINTER_NAME/* $HOME/$PRINTER_NAME cp -r $ROOT_DIR/$PRINTER_NAME/* $HOME/$PRINTER_NAME
# Create Empty dirs # Create Empty dirs
dirs=(logs gcodes certs backup mainsail-config) dirs=(logs gcodes certs backup mainsail-config)
@ -127,16 +147,7 @@ for d in ${dirs[@]}; do
done done
# Configure System Services # Configure System Services
# cd $ROOT_DIR/config/services
# TODO: Add Crowsnest Support # TODO: Add Crowsnest Support
# FILES=(moonraker klipper)
# for f in ${FILES[@]}; do
# echo.ICyan "Configuring ${f}"
# sed -i -e "s/PRINTERNAME/$PRINTER_NAME/g" "${f}.service"
# sed -i -e "s/pi/$USER/g" "${f}.service"
# done
cd $ROOT_DIR/config/services cd $ROOT_DIR/config/services
SERVICES=() SERVICES=()
for f in *.service; do for f in *.service; do