diff --git a/.gitignore b/.gitignore index e27e959..f261c46 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,7 @@ moonraker-sql.db moonraker-obico.cfg moonraker-obico-update.cfg KlipperScreen.conf +sonar.conf +moonraker.conf +telegram.conf .*.*.bkp diff --git a/moonraker.conf b/moonraker.conf deleted file mode 100644 index faff747..0000000 --- a/moonraker.conf +++ /dev/null @@ -1,120 +0,0 @@ -[server] -host: 0.0.0.0 -port: 7125 -klippy_uds_address: /home/biqu/printer_data/comms/klippy.sock - -[authorization] -trusted_clients: - 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 - 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 - -[timelapse] -#snapshoturl: http://192.168.1.31/capture -#output_path: /mnt/microsd/video -#frame_path: /mnt/microsd/video/tmp/ -ffmpeg_binary_path: /usr/bin/ffmpeg - -[update_manager] -channel: stable -refresh_interval: 168 - -[power MainPower] -type: klipper_device -object_name: output_pin ps_on -initial_state: on - -[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 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 mainsail-config] -type: git_repo -primary_branch: master -path: ~/mainsail-config -origin: https://github.com/mainsail-crew/mainsail-config.git -managed_services: klipper - -[update_manager mainsail] -type: web -channel: stable -repo: mainsail-crew/mainsail -path: ~/mainsail - -# 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 -install_script: tools/install.sh - -[update_manager katapult] -type: git_repo -origin: https://github.com/Arksine/katapult.git -path: ~/katapult -is_system_service: False - -[update_manager KlipperScreen] -type: git_repo -path: ~/KlipperScreen -origin: https://github.com/KlipperScreen/KlipperScreen.git -virtualenv: ~/.KlipperScreen-env -requirements: scripts/KlipperScreen-requirements.txt -system_dependencies: scripts/system-dependencies.json -managed_services: KlipperScreen - -[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 moonraker-telegram-bot] -install_script: scripts/install.sh -requirements: scripts/requirements.txt -env: /home/biqu/moonraker-telegram-bot-env/bin/python -origin: https://github.com/nlef/moonraker-telegram-bot.git -path: /home/biqu/moonraker-telegram-bot -type: git_repo diff --git a/printer.cfg b/printer.cfg index 5ebdeae..ce839fc 100644 --- a/printer.cfg +++ b/printer.cfg @@ -129,7 +129,7 @@ pid_kd: 278.281 [probe] x_offset: 0 y_offset: 0 -z_offset: -0.890 +#z_offset: -0.890 lift_speed: 15 #10 speed: 3.0 #5 samples: 3 @@ -197,7 +197,6 @@ algorithm: bicubic [include macros/main.cfg] -[include moonraker_obico_macros.cfg] #*# <---------------------- SAVE_CONFIG ----------------------> #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated. @@ -210,16 +209,19 @@ algorithm: bicubic #*# [bed_mesh default] #*# version = 1 #*# points = -#*# 0.010937, -0.010313, 0.022500 -#*# 0.036562, 0.007812, 0.023750 -#*# 0.033437, 0.001562, 0.022500 +#*# -0.006875, -0.011875, -0.006875 +#*# 0.012812, 0.002812, -0.003438 +#*# 0.023125, 0.008750, 0.015937 #*# x_count = 3 #*# y_count = 3 #*# mesh_x_pps = 2 #*# mesh_y_pps = 2 #*# algo = lagrange #*# tension = 0.2 -#*# min_x = 133.45799999999997 -#*# max_x = 217.19799999999998 -#*# min_y = 146.587 -#*# max_y = 202.78699999999998 +#*# min_x = 154.289 +#*# max_x = 195.529 +#*# min_y = 154.83499999999998 +#*# max_y = 195.33499999999998 +#*# +#*# [probe] +#*# z_offset = -0.820 diff --git a/sonar.conf b/sonar.conf deleted file mode 100644 index 0c71ab1..0000000 --- a/sonar.conf +++ /dev/null @@ -1,17 +0,0 @@ -#### 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 ever ping with triptime and date/time -persistant_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_treshold: 10 # If failed, restart WiFi after X seconds diff --git a/telegram.conf b/telegram.conf deleted file mode 100644 index 131e036..0000000 --- a/telegram.conf +++ /dev/null @@ -1,22 +0,0 @@ -# Please refer to the wiki(https://github.com/nlef/moonraker-telegram-bot/wiki) for detailed information on how to configure the bot - -[bot] -server: localhost -bot_token: 6179338772:AAGjgcT186TxlyuUM6lYfeymKLBaSYy-TZw -chat_id: 438453744 - -[camera] -host: http://localhost/webcam2/?action=stream #http://192.168.1.33:81/stream -flip_vertically: true -flip_horizontally: true - -[progress_notification] -percent: 5 -height: 5 -time: 30 - -#[timelapse] -#cleanup: true -#height: 0.2 -#time: 5 -#target_fps: 30