Printer Model: RatRIG VCore 31
MCU / Printerboard: Octopus Pro 429 / EBB42 klippy.log Think its Not Necessary
Fill out above information andin all cases attach yourklippy.logfile. Pasting yourprinter.cfgis not needed Be sure to check our Knowledge Base and in particular this and this post
Describe your issue:
Hi,
I need help…
in some maintenance, I want to update Klipper on my MCU…
Fluid use
and the MCU is an Octopus Pro 429 (which can only be upgraded with Micro SD)
For this I am following the guide for Voron printers, but I do NOT get the options indicated in the guide.
Anyone know what might be happening?
Another question that I have, as indicated, I use an EBB42 as a CANBOARD… but I’m not sure if I also have to update it and how. Since if I had to update it, I suppose that I could do it from Fluidd
Blockquotepi@fluiddpi:~/klipper $ git pull
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace “git config” with “git config --global” to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Updating 0c43ae1f…40263652
error: Your local changes to the following files would be overwritten by merge:
docs/G-Codes.md
src/atsam/Kconfig
src/atsamd/Kconfig
src/generic/canserial.c
src/lpc176x/Kconfig
src/rp2040/Kconfig
src/rp2040/Makefile
src/stm32/Kconfig
src/stm32/Makefile
src/stm32/can.c
src/stm32/fdcan.c
src/stm32/stm32g0.c
src/stm32/stm32g4.c
src/stm32/stm32h7.c
src/stm32/stm32h7_adc.c
test/configs/stm32g431.cfg
test/configs/stm32h723.cfg
test/configs/stm32l412.cfg
Please commit your changes or stash them before you merge.
Aborting
pi@fluiddpi:~/klipper $
Blockquote
Some idea of error
Updating 0c43ae1f…40263652
error: Your local changes to the following files would be overwritten by merge:
This means you have made changes to the source files in the Klipper folder and as such these cannot be updated automatically.
You can revert all such changes with git reset --hard
as such it also means you need to redo whatever you changed.