diff --git a/printer_data/config/crowsnest.conf b/3dsprinter_data/config/crowsnest.conf similarity index 95% rename from printer_data/config/crowsnest.conf rename to 3dsprinter_data/config/crowsnest.conf index 9829b07..ada3651 100644 --- a/printer_data/config/crowsnest.conf +++ b/3dsprinter_data/config/crowsnest.conf @@ -29,7 +29,7 @@ [crowsnest] -log_path: /home/jeka/printer_data/logs/crowsnest.log +log_path: /home/jeka/3dsprinter_data/logs/crowsnest.log log_level: verbose # Valid Options are quiet/verbose/debug delete_log: false # Deletes log on every restart, if set to true no_proxy: false @@ -40,7 +40,7 @@ mode: ustreamer # ustreamer - Provides mjpg and snapshot enable_rtsp: false # If camera-streamer is used, this enables also usage of an rtsp server rtsp_port: 8554 # Set different ports for each device! port: 8080 # HTTP/MJPG Stream/Snapshot Port -device: /dev/video0 # See Log for available ... +device: /dev/video1 # See Log for available ... resolution: 640x480 # widthxheight format max_fps: 15 # If Hardware Supports this it will be forced, otherwise ignored/coerced. #custom_flags: # You can run the Stream Services with custom flags. diff --git a/printer_data/config/crowsnest.conf.2024-07-05-2151 b/3dsprinter_data/config/crowsnest.conf.2024-07-05-2151 similarity index 100% rename from printer_data/config/crowsnest.conf.2024-07-05-2151 rename to 3dsprinter_data/config/crowsnest.conf.2024-07-05-2151 diff --git a/printer_data/config/macros.cfg b/3dsprinter_data/config/macros.cfg similarity index 100% rename from printer_data/config/macros.cfg rename to 3dsprinter_data/config/macros.cfg diff --git a/printer_data/config/moonraker.conf b/3dsprinter_data/config/moonraker.conf similarity index 96% rename from printer_data/config/moonraker.conf rename to 3dsprinter_data/config/moonraker.conf index 86f5a17..e56326a 100644 --- a/printer_data/config/moonraker.conf +++ b/3dsprinter_data/config/moonraker.conf @@ -1,7 +1,7 @@ [server] host: 0.0.0.0 port: 7125 -klippy_uds_address: /home/jeka/printer_data/comms/klippy.sock +klippy_uds_address: /home/jeka/3dsprinter_data/comms/klippy.sock [authorization] trusted_clients: @@ -52,6 +52,13 @@ path: ~/crowsnest origin: https://github.com/mainsail-crew/crowsnest.git install_script: tools/pkglist.sh +[update_manager klipper-backup-3dsprinter] +type: git_repo +path: ~/klipper-backup-3dsprinter +origin: https://github.com/Staubgeborener/klipper-backup.git +managed_services: moonraker +primary_branch: main + [update_manager klipper-macros] type: git_repo origin: https://github.com/jschuh/klipper-macros.git @@ -60,13 +67,6 @@ primary_branch: main is_system_service: False managed_services: klipper -[update_manager klipper-backup-3dsprinter] -type: git_repo -path: ~/klipper-backup-3dsprinter -origin: https://github.com/Staubgeborener/klipper-backup.git -managed_services: moonraker -primary_branch: main - [power printer] type: gpio pin: gpiochip1/gpio26 diff --git a/printer_data/config/moonraker.conf.backup b/3dsprinter_data/config/moonraker.conf.backup similarity index 100% rename from printer_data/config/moonraker.conf.backup rename to 3dsprinter_data/config/moonraker.conf.backup diff --git a/printer_data/config/printer.cfg b/3dsprinter_data/config/printer.cfg similarity index 98% rename from printer_data/config/printer.cfg rename to 3dsprinter_data/config/printer.cfg index ec39269..b92ae1d 100644 --- a/printer_data/config/printer.cfg +++ b/3dsprinter_data/config/printer.cfg @@ -2,7 +2,7 @@ [include fluidd.cfg] [virtual_sdcard] -path: /home/jeka/printer_data/gcodes +path: /home/jeka/3dsprinter_data/gcodes on_error_gcode: CANCEL_PRINT [include macros.cfg] diff --git a/printer_data/config/shell_command.cfg b/3dsprinter_data/config/shell_command.cfg similarity index 100% rename from printer_data/config/shell_command.cfg rename to 3dsprinter_data/config/shell_command.cfg diff --git a/printer_data/config/telegram.conf b/3dsprinter_data/config/telegram.conf similarity index 81% rename from printer_data/config/telegram.conf rename to 3dsprinter_data/config/telegram.conf index f681308..8046fc3 100644 --- a/printer_data/config/telegram.conf +++ b/3dsprinter_data/config/telegram.conf @@ -1,12 +1,12 @@ # Please refer to the wiki(https://github.com/nlef/moonraker-telegram-bot/wiki) for detailed information on how to configure the bot [bot] -server: 192.168.47.5:7125 +server: 192.168.47.44:7125 bot_token: 7093071502:AAFGW5ygvu9oRgsZsS0CpU8-hy8x_oaxlsc chat_id: 158812314 [camera] -host: http://192.168.47.5:7575/webcam/?action=stream +host: http://192.168.47.44/webcam/?action=stream [progress_notification]