zach
/
virtual-klipper-printer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: improve start.sh & provide firmware in homedir

This commit is contained in:
th33xitus 2022-02-09 23:01:12 +01:00
parent 1a93e1bd41
commit 859f3968e4
2 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
docker/start.sh
View File

@ -13,75 +13,70 @@ cd ~ || exit 1
[ ! -d ~/klipper_logs ] && mkdir klipper_logs [ ! -d ~/klipper_logs ] && mkdir klipper_logs
[ ! -d ~/gcode_files ] && mkdir gcode_files [ ! -d ~/gcode_files ] && mkdir gcode_files
### setup klipper setup_klipper(){
if [ ! -d ~/klipper ]; then [ -d ~/klipper ] && return
echo "##### Cloning Klipper ..." echo "##### Cloning Klipper ..."
git clone $klipper_git --single-branch --branch ${klipper_branch} git clone $klipper_git --single-branch --branch ${klipper_branch}
echo "##### Done!" echo "##### Done!"
else }
echo "##### Klipper found! Continue ..."
fi
### build klippy-env build_klipper_env(){
if [ ! -d ~/klippy-env ]; then [ -d ~/klippy-env ] && return
echo "##### Building Klipper virtualenv ..." echo "##### Building Klipper virtualenv ..."
virtualenv -p python3 ~/klippy-env virtualenv -p python3 ~/klippy-env
~/klippy-env/bin/pip install -r ~/klipper/scripts/klippy-requirements.txt ~/klippy-env/bin/pip install -r ~/klipper/scripts/klippy-requirements.txt
echo "##### Done!" echo "##### Done!"
else }
echo "##### Klipper virtualenv found! Continue ..."
fi
### setup moonraker setup_moonraker(){
if [ ! -d ~/moonraker ]; then [ -d ~/moonraker ] && return
echo "##### Cloning Moonraker ..." echo "##### Cloning Moonraker ..."
git clone $moonraker_git --single-branch --branch ${moonraker_branch} git clone $moonraker_git --single-branch --branch ${moonraker_branch}
echo "##### Done!" echo "##### Done!"
else }
echo "##### Moonraker found! Continue ..."
fi
### build moonraker-env build_moonraker_env(){
if [ ! -d ~/moonraker-env ]; then [ -d ~/moonraker-env ] && return
echo "##### Building Moonraker virtualenv ..." echo "##### Building Moonraker virtualenv ..."
virtualenv -p python3 ~/moonraker-env virtualenv -p python3 ~/moonraker-env
~/moonraker-env/bin/pip install -r ~/moonraker/scripts/moonraker-requirements.txt ~/moonraker-env/bin/pip install -r ~/moonraker/scripts/moonraker-requirements.txt
echo "##### Done!" echo "##### Done!"
else }
echo "##### Moonraker virtualenv found! Continue ..."
fi
### build simulavr firmware build_firmware(){
if [ ! -f ~/klipper/simulavr.elf ]; then [ -f ~/simulavr.elf ] && return
echo "##### Building Klipper firmware ..." echo "##### Building Klipper firmware ..."
[ ! -d ~/klipper ] && setup_klipper
cd ~/klipper || exit 1 cd ~/klipper || exit 1
cp $simulavr_cfg .config && make PYTHON=python3 cp $simulavr_cfg .config && make PYTHON=python3
cp out/klipper.elf simulavr.elf cp out/klipper.elf ~/simulavr.elf
rm -f .config && make clean rm -f .config && make clean
cd ~ || exit 1 cd ~ || exit 1
echo "##### Done!" echo "##### Done!"
else }
echo "##### Klipper firmware already built! Continue ..."
fi
### setup simulavr setup_simulavr(){
if [ ! -d ~/simulavr ]; then [ -d ~/simulavr ] && return
echo "##### Cloning Simulavr ..." echo "##### Cloning Simulavr ..."
git clone $simulavr_git git clone $simulavr_git
echo "##### Done!" echo "##### Done!"
else }
echo "##### Simulavr found! Continue ..."
fi
## build simulavr python module build_simulavr(){
if [ ! -d ~/simulavr/build ]; then [ -d ~/simulavr/build ] && return
echo "##### Building Simulavr ..." echo "##### Building Simulavr ..."
cd ~/simulavr || exit 1 cd ~/simulavr || exit 1
make clean && make python && make build make clean && make python && make build
echo "##### Done!" echo "##### Done!"
else }
echo "##### Simulavr already built! Continue ..."
fi setup_klipper
build_klipper_env
setup_moonraker
build_moonraker_env
build_firmware
setup_simulavr
build_simulavr
sudo -S rm /bin/systemctl sudo -S rm /bin/systemctl
sudo -S ln -s /usr/bin/supervisorctl /bin/systemctl sudo -S ln -s /usr/bin/supervisorctl /bin/systemctl

2
docker/supervisord.conf
View File

@ -18,7 +18,7 @@ serverurl=unix:///tmp/supervisor.sock
file=/tmp/supervisor.sock file=/tmp/supervisor.sock
[program:simulavr] [program:simulavr]
command=bash -c 'sleep 10 && /home/printer/klipper/scripts/avrsim.py -m atmega644 -s 20000000 -b 250000 /home/printer/klipper/simulavr.elf' command=bash -c 'sleep 10 && /home/printer/klipper/scripts/avrsim.py -m atmega644 -s 20000000 -b 250000 /home/printer/simulavr.elf'
environment=PYTHONPATH=/home/printer/simulavr/build/pysimulavr/ environment=PYTHONPATH=/home/printer/simulavr/build/pysimulavr/
user=printer user=printer
process_name=simulavr process_name=simulavr