From 80d487b08d0c873aa795cd64d70bb60d6e92af1d Mon Sep 17 00:00:00 2001 From: Mikhail Shahovalov Date: Thu, 3 Sep 2026 05:10:49 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20moonraker.conf,=20KlipperScreen.conf=20=D0=B8=20sonar.?= =?UTF-8?q?conf=20=D0=B2=20=D0=B1=D1=8D=D0=BA=D0=B0=D0=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Файлы не содержат секретов (API-ключи moonraker хранятся в printer_data/database). В moonraker.conf уже учтена замена устаревшей опции env на virtualenv для [update_manager KlipperScreen]. --- .gitignore | 3 -- KlipperScreen.conf | 22 +++++++++ moonraker.conf | 112 +++++++++++++++++++++++++++++++++++++++++++++ sonar.conf | 17 +++++++ 4 files changed, 151 insertions(+), 3 deletions(-) create mode 100644 KlipperScreen.conf create mode 100644 moonraker.conf create mode 100644 sonar.conf diff --git a/.gitignore b/.gitignore index f261c46..a1d7a64 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,5 @@ autocommit.sh moonraker-sql.db moonraker-obico.cfg moonraker-obico-update.cfg -KlipperScreen.conf -sonar.conf -moonraker.conf telegram.conf .*.*.bkp diff --git a/KlipperScreen.conf b/KlipperScreen.conf new file mode 100644 index 0000000..3ebcec0 --- /dev/null +++ b/KlipperScreen.conf @@ -0,0 +1,22 @@ +# +# MMU "Happy Hare edition" menus +# +[include mmu_klipperscreen.conf] + +# To use this KlipperScreen panel, create a symlink: +# $MOONRAKER_OBICO_HOME/scripts/klipper_screen_obico_panel.py ->$KLIPPER_SCREEN_HOME/panels/obico.py +[menu __main more obico] +name: Obico +icon: network +panel: obico + +#~# --- Do not edit below this line. This section is auto generated --- #~# +#~# +#~# [main] +#~# theme = colorized +#~# print_sort_dir = date_desc +#~# language = ru +#~# +#~# [graph Printer] +#~# extruder = False +#~# diff --git a/moonraker.conf b/moonraker.conf new file mode 100644 index 0000000..f7b346d --- /dev/null +++ b/moonraker.conf @@ -0,0 +1,112 @@ +[server] +host: 0.0.0.0 +port: 7125 +klippy_uds_address: /home/biqu/printer_data/comms/klippy.sock + +[authorization] +trusted_clients: + 192.168.0.0/16 + 10.0.0.0/8 + 127.0.0.0/8 + 169.254.0.0/16 + 172.16.0.0/12 + 192.168.0.0/16 + FC00::/7 + FE80::/10 + ::1/128 +cors_domains: + *.lan + *.local + *://localhost + *://localhost:* + *://my.mainsail.xyz + *://app.fluidd.xyz + +[octoprint_compat] + +[history] + +[file_manager] +enable_object_processing: True + +[update_manager] +channel: dev +refresh_interval: 168 + +[timelapse] + +[update_manager mainsail] +path: /home/biqu/mainsail +repo: mainsail-crew/mainsail +channel: stable +type: web + +[update_manager mainsail-config] +managed_services: klipper +origin: https://github.com/mainsail-crew/mainsail-config.git +path: /home/biqu/mainsail-config +primary_branch: master +type: git_repo + +[update_manager KlipperScreen] +install_script: /home/biqu/KlipperScreen/scripts/KlipperScreen-install.sh +requirements: /home/biqu/KlipperScreen/scripts/KlipperScreen-requirements.txt +virtualenv: /home/biqu/.KlipperScreen-env +managed_services: KlipperScreen +origin: https://github.com/moggieuk/KlipperScreen-Happy-Hare-Edition.git +path: /home/biqu/KlipperScreen +type: git_repo + +# Crowsnest update_manager entry +[update_manager crowsnest] +type: git_repo +path: ~/crowsnest +origin: https://github.com/mainsail-crew/crowsnest.git +managed_services: crowsnest +install_script: tools/pkglist.sh + +# Sonar update_manager entry +[update_manager sonar] +type: git_repo +path: ~/sonar +origin: https://github.com/mainsail-crew/sonar.git +primary_branch: main +managed_services: sonar +system_dependencies: resources/system-dependencies.json + +[update_manager timelapse] +type: git_repo +primary_branch: main +path: ~/moonraker-timelapse +origin: https://github.com/mainsail-crew/moonraker-timelapse.git +managed_services: klipper moonraker + +[update_manager Klipper-Adaptive-Meshing-Purging] +type: git_repo +channel: dev +path: ~/Klipper-Adaptive-Meshing-Purging +origin: https://github.com/kyleisah/Klipper-Adaptive-Meshing-Purging.git +managed_services: klipper +primary_branch: main + +[update_manager klipper_tmc_autotune] +type: git_repo +channel: dev +path: ~/klipper_tmc_autotune +origin: https://github.com/andrewmcgr/klipper_tmc_autotune.git +managed_services: klipper +primary_branch: main +install_script: install.sh + +[update_manager happy-hare] +type: git_repo +path: ~/Happy-Hare +origin: https://github.com/moggieuk/Happy-Hare.git +primary_branch: main +managed_services: klipper + +[mmu_server] +enable_file_preprocessor: True +enable_toolchange_next_pos: True +update_spoolman_location: True + diff --git a/sonar.conf b/sonar.conf new file mode 100644 index 0000000..c4b60d2 --- /dev/null +++ b/sonar.conf @@ -0,0 +1,17 @@ +#### Sonar - A WiFi Keepalive daemon +#### +#### Written by Stephan Wendel aka KwadFan +#### Copyright 2022 +#### https://github.com/mainsail-crew/sonar +#### +#### This File is distributed under GPLv3 +#### + +[sonar] +enable: false # false to disable till next reboot (will stop again if not set to true) +debug_log: false # if set to true, sonar will log every ping with triptime and date/time +persistent_log: false # If true logs in /var/log/sonar.log, false logs to systemd +target: auto # IP Address, URL or auto as ping target +count: 3 # How often should be pinged? +interval: 60 # Ping again after X seconds +restart_threshold: 10 # If failed, restart WiFi after X seconds