Skip to content

Commit f40b846

Browse files
BlackNetBlackNet
committed
Autocommit from 2025-01-31 19:44:01
Klipper on commit: 0114d72 Moonraker on commit: 7e3c86e Mainsail version: v2.13.2
1 parent a79de44 commit f40b846

34 files changed

+3206
-47
lines changed

‎.moonraker.conf.bkp

+29-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ trusted_clients =
1212
169.254.0.0/16
1313
172.16.0.0/12
1414
192.168.0.0/16
15-
100.75.228.29
15+
100.75.228.30
1616
100.87.93.65
1717
100.126.37.42
1818
100.82.60.125
@@ -146,3 +146,31 @@ origin = https://github.com/Arksine/katapult.git
146146
path = ~/katapult
147147
is_system_service = False
148148

149+
[update_manager crowsnest]
150+
type = git_repo
151+
path = ~/crowsnest
152+
origin = https://github.com/mainsail-crew/crowsnest.git
153+
managed_services = crowsnest
154+
install_script = tools/pkglist.sh
155+
156+
[update_manager klipper-toolchanger]
157+
type = git_repo
158+
channel = dev
159+
path = ~/klipper-toolchanger
160+
origin = https://github.com/viesturz/klipper-toolchanger.git
161+
managed_services = klipper
162+
primary_branch = main
163+
install_script = install.sh
164+
165+
[update_manager happy-hare]
166+
type = git_repo
167+
path = ~/Happy-Hare
168+
origin = https://github.com/moggieuk/Happy-Hare.git
169+
primary_branch = main
170+
managed_services = klipper
171+
172+
[mmu_server]
173+
enable_file_preprocessor = True
174+
enable_toolchange_next_pos = True
175+
update_spoolman_location = True
176+

‎config/macros.cfg

+42
Original file line numberDiff line numberDiff line change
@@ -462,3 +462,45 @@ gcode:
462462
HEATSOAK_CHAMBER TEMP=50 BED=110
463463
MR_NOTIFY TITLE="Vor on" MESSAGE="Ready to print A B S!"
464464

465+
466+
#####################################################################
467+
#
468+
# StealthChanger macros
469+
#
470+
#####################################################################
471+
472+
[gcode_macro M104]
473+
rename_existing: M104.1
474+
description: [T<index>] [S<temperature>]
475+
Set tool temperature.
476+
T= Tool number, optional. If this parameter is not provided, the current tool is used.
477+
S= Target temperature
478+
gcode:
479+
{% if params.T is defined %}
480+
{% set newparameters = "" %}
481+
{% set newparameters = newparameters ~ " T="~params.T %}
482+
{% if params.S is defined %}
483+
{% set newparameters = newparameters ~ " TARGET="~params.S %}
484+
{% endif %}
485+
SET_TOOL_TEMPERATURE{newparameters}
486+
{% else %}
487+
M104.1 {rawparams}
488+
{% endif %}
489+
490+
[gcode_macro M109]
491+
rename_existing: M109.1
492+
description: [T<index>] [S<temperature>]
493+
Set tool temperature and wait.
494+
T= Tool number, optional. If this parameter is not provided, the current tool is used.
495+
S= Target temperature
496+
gcode:
497+
{% if params.T is defined %}
498+
{% set newparameters = "" %}
499+
{% set newparameters = newparameters ~ " T="~params.T %}
500+
{% if params.S is defined %}
501+
{% set newparameters = newparameters ~ " TARGET="~params.S %}
502+
{% endif %}
503+
SET_TOOL_TEMPERATURE WAIT=1 {newparameters}
504+
{% else %}
505+
M109.1 {rawparams}
506+
{% endif %}

‎crowsnest.conf

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
#### crowsnest.conf
2+
#### This is a typical default config.
3+
#### Also used as default in mainsail / MainsailOS
4+
#### See:
5+
#### https://github.com/mainsail-crew/crowsnest/blob/master/README.md
6+
#### for details to configure to your needs.
7+
8+
9+
#####################################################################
10+
#### #####
11+
#### Information about ports and according URL's #####
12+
#### #####
13+
#####################################################################
14+
#### #####
15+
#### Port 8080 equals /webcam/?action=[stream/snapshot] #####
16+
#### Port 8081 equals /webcam2/?action=[stream/snapshot] #####
17+
#### Port 8082 equals /webcam3/?action=[stream/snapshot] #####
18+
#### Port 8083 equals /webcam4/?action=[stream/snapshot] #####
19+
#### #####
20+
#### Note: These ports are default for most Mainsail #####
21+
#### installations. To use any other port would involve #####
22+
#### changing the proxy configuration or using directly #####
23+
#### http://<ip>:<port>/?action=[stream/snapshot] #####
24+
#### #####
25+
#####################################################################
26+
#### RTSP Stream URL: ( if enabled and supported ) #####
27+
#### rtsp://<ip>:<rtsp_port>/stream.h264 #####
28+
#####################################################################
29+
30+
31+
[crowsnest]
32+
log_path: /home/pi/printer_data/logs/crowsnest.log
33+
log_level: verbose # Valid Options are quiet/verbose/debug
34+
delete_log: false # Deletes log on every restart, if set to true
35+
no_proxy: false
36+
37+
[cam 1]
38+
mode: ustreamer # ustreamer - Provides mjpg and snapshots. (All devices)
39+
# camera-streamer - Provides webrtc, mjpg and snapshots. (rpi + Raspi OS based only)
40+
enable_rtsp: false # If camera-streamer is used, this enables also usage of an rtsp server
41+
rtsp_port: 8554 # Set different ports for each device!
42+
port: 8080 # HTTP/MJPG Stream/Snapshot Port
43+
device: /dev/video0 # See Log for available ...
44+
resolution: 2560x1472 # widthxheight format
45+
max_fps: 60 # If Hardware Supports this it will be forced, otherwise ignored/coerced.
46+
#custom_flags: # You can run the Stream Services with custom flags.
47+
#v4l2ctl: # Add v4l2-ctl parameters to setup your camera, see Log what your cam is capable of.
48+
exposure_auto: 1
49+
focus_absolute: 40
50+
sharpness: 200
51+
contrast: 130
52+
saturation: 120
53+
brightness: 150
54+
v4l2ctl: tilt_absolute=36000, pan_absolute=3600, zoom_absolute=600
55+

‎do_cam.sh

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
#####################################################################
44

55

6-
v4l2-ctl -d /dev/video0 --set-ctrl=auto_exposure=1
7-
v4l2-ctl -d /dev/video0 --set-ctrl=focus_automatic_continuous=0
8-
v4l2-ctl -d /dev/video0 --set-ctrl=white_balance_automatic=0
9-
v4l2-ctl -d /dev/video0 --set-ctrl=power_line_frequency=2
10-
v4l2-ctl -d /dev/video0 --set-ctrl=exposure_time_absolute=200
11-
v4l2-ctl -d /dev/video0 --set-ctrl=focus_absolute=40
12-
v4l2-ctl -d /dev/video0 --set-ctrl=white_balance_temperature=4395
6+
#v4l2-ctl -d /dev/video0 --set-ctrl=auto_exposure=1
7+
#v4l2-ctl -d /dev/video0 --set-ctrl=focus_automatic_continuous=0
8+
#v4l2-ctl -d /dev/video0 --set-ctrl=white_balance_automatic=0
9+
#v4l2-ctl -d /dev/video0 --set-ctrl=power_line_frequency=2
10+
#v4l2-ctl -d /dev/video0 --set-ctrl=exposure_time_absolute=200
11+
#v4l2-ctl -d /dev/video0 --set-ctrl=focus_absolute=40
12+
#v4l2-ctl -d /dev/video0 --set-ctrl=white_balance_temperature=4395
1313
v4l2-ctl -d /dev/video0 --set-ctrl=tilt_absolute=36000
1414
v4l2-ctl -d /dev/video0 --set-ctrl=pan_absolute=3600
1515
v4l2-ctl -d /dev/video0 --set-ctrl=zoom_absolute=600
16-
v4l2-ctl -d /dev/video0 --set-ctrl=sharpness=200
17-
v4l2-ctl -d /dev/video0 --set-ctrl=gain=15
18-
v4l2-ctl -d /dev/video0 --set-ctrl=contrast=130
19-
v4l2-ctl -d /dev/video0 --set-ctrl=saturation=120
20-
v4l2-ctl -d /dev/video0 --set-ctrl=brightness=150
16+
#v4l2-ctl -d /dev/video0 --set-ctrl=sharpness=200
17+
# v4l2-ctl -d /dev/video0 --set-ctrl=gain=15
18+
# v4l2-ctl -d /dev/video0 --set-ctrl=contrast=130
19+
# v4l2-ctl -d /dev/video0 --set-ctrl=saturation=120
20+
# v4l2-ctl -d /dev/video0 --set-ctrl=brightness=150

‎do_cam.sh~

-20
This file was deleted.

‎klipper_menuconfigs/config-octopus-446

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ CONFIG_LOW_LEVEL_OPTIONS=y
55
# CONFIG_MACH_LPC176X is not set
66
CONFIG_MACH_STM32=y
77
# CONFIG_MACH_HC32F460 is not set
8-
# CONFIG_MACH_RP2040 is not set
8+
# CONFIG_MACH_RPXXXX is not set
99
# CONFIG_MACH_PRU is not set
1010
# CONFIG_MACH_AR100 is not set
1111
# CONFIG_MACH_LINUX is not set
@@ -90,11 +90,14 @@ CONFIG_USB_SERIAL_NUMBER="12345"
9090

9191
CONFIG_WANT_GPIO_BITBANGING=y
9292
CONFIG_WANT_DISPLAYS=y
93-
CONFIG_WANT_SENSORS=y
93+
CONFIG_WANT_THERMOCOUPLE=y
94+
CONFIG_WANT_ADXL345=y
9495
CONFIG_WANT_LIS2DW=y
95-
CONFIG_WANT_LDC1612=y
96+
CONFIG_WANT_MPU9250=y
9697
CONFIG_WANT_HX71X=y
9798
CONFIG_WANT_ADS1220=y
99+
CONFIG_WANT_LDC1612=y
100+
CONFIG_WANT_SENSOR_ANGLE=y
98101
CONFIG_WANT_SOFTWARE_I2C=y
99102
CONFIG_WANT_SOFTWARE_SPI=y
100103
CONFIG_NEED_SENSOR_BULK=y

‎klipper_menuconfigs/config-octopus-446.old

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ CONFIG_LOW_LEVEL_OPTIONS=y
55
# CONFIG_MACH_LPC176X is not set
66
CONFIG_MACH_STM32=y
77
# CONFIG_MACH_HC32F460 is not set
8-
# CONFIG_MACH_RP2040 is not set
8+
# CONFIG_MACH_RPXXXX is not set
99
# CONFIG_MACH_PRU is not set
1010
# CONFIG_MACH_AR100 is not set
1111
# CONFIG_MACH_LINUX is not set
@@ -93,6 +93,8 @@ CONFIG_WANT_DISPLAYS=y
9393
CONFIG_WANT_SENSORS=y
9494
CONFIG_WANT_LIS2DW=y
9595
CONFIG_WANT_LDC1612=y
96+
CONFIG_WANT_HX71X=y
97+
CONFIG_WANT_ADS1220=y
9698
CONFIG_WANT_SOFTWARE_I2C=y
9799
CONFIG_WANT_SOFTWARE_SPI=y
98100
CONFIG_NEED_SENSOR_BULK=y

‎klipper_menuconfigs/config-raspberry-pi

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ CONFIG_LOW_LEVEL_OPTIONS=y
55
# CONFIG_MACH_LPC176X is not set
66
# CONFIG_MACH_STM32 is not set
77
# CONFIG_MACH_HC32F460 is not set
8-
# CONFIG_MACH_RP2040 is not set
8+
# CONFIG_MACH_RPXXXX is not set
99
# CONFIG_MACH_PRU is not set
1010
# CONFIG_MACH_AR100 is not set
1111
CONFIG_MACH_LINUX=y
@@ -18,11 +18,14 @@ CONFIG_USB_DEVICE_ID=0x614e
1818
CONFIG_USB_SERIAL_NUMBER="12345"
1919
CONFIG_WANT_GPIO_BITBANGING=y
2020
CONFIG_WANT_DISPLAYS=y
21-
CONFIG_WANT_SENSORS=y
21+
CONFIG_WANT_THERMOCOUPLE=y
22+
CONFIG_WANT_ADXL345=y
2223
CONFIG_WANT_LIS2DW=y
23-
CONFIG_WANT_LDC1612=y
24+
CONFIG_WANT_MPU9250=y
2425
CONFIG_WANT_HX71X=y
2526
CONFIG_WANT_ADS1220=y
27+
CONFIG_WANT_LDC1612=y
28+
CONFIG_WANT_SENSOR_ANGLE=y
2629
CONFIG_WANT_SOFTWARE_I2C=y
2730
CONFIG_WANT_SOFTWARE_SPI=y
2831
CONFIG_NEED_SENSOR_BULK=y

‎klipper_menuconfigs/config-raspberry-pi.old

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ CONFIG_LOW_LEVEL_OPTIONS=y
55
# CONFIG_MACH_LPC176X is not set
66
# CONFIG_MACH_STM32 is not set
77
# CONFIG_MACH_HC32F460 is not set
8-
# CONFIG_MACH_RP2040 is not set
8+
# CONFIG_MACH_RPXXXX is not set
99
# CONFIG_MACH_PRU is not set
1010
# CONFIG_MACH_AR100 is not set
1111
CONFIG_MACH_LINUX=y
@@ -21,6 +21,8 @@ CONFIG_WANT_DISPLAYS=y
2121
CONFIG_WANT_SENSORS=y
2222
CONFIG_WANT_LIS2DW=y
2323
CONFIG_WANT_LDC1612=y
24+
CONFIG_WANT_HX71X=y
25+
CONFIG_WANT_ADS1220=y
2426
CONFIG_WANT_SOFTWARE_I2C=y
2527
CONFIG_WANT_SOFTWARE_SPI=y
2628
CONFIG_NEED_SENSOR_BULK=y

‎klipper_menuconfigs/config-voron-skirt-buttons

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ CONFIG_LOW_LEVEL_OPTIONS=y
55
# CONFIG_MACH_LPC176X is not set
66
CONFIG_MACH_STM32=y
77
# CONFIG_MACH_HC32F460 is not set
8-
# CONFIG_MACH_RP2040 is not set
8+
# CONFIG_MACH_RPXXXX is not set
99
# CONFIG_MACH_PRU is not set
1010
# CONFIG_MACH_AR100 is not set
1111
# CONFIG_MACH_LINUX is not set
@@ -87,11 +87,14 @@ CONFIG_USB_SERIAL_NUMBER="12345"
8787

8888
CONFIG_WANT_GPIO_BITBANGING=y
8989
CONFIG_WANT_DISPLAYS=y
90-
CONFIG_WANT_SENSORS=y
90+
CONFIG_WANT_THERMOCOUPLE=y
91+
CONFIG_WANT_ADXL345=y
9192
CONFIG_WANT_LIS2DW=y
92-
CONFIG_WANT_LDC1612=y
93+
CONFIG_WANT_MPU9250=y
9394
CONFIG_WANT_HX71X=y
9495
CONFIG_WANT_ADS1220=y
96+
CONFIG_WANT_LDC1612=y
97+
CONFIG_WANT_SENSOR_ANGLE=y
9598
CONFIG_WANT_SOFTWARE_I2C=y
9699
CONFIG_WANT_SOFTWARE_SPI=y
97100
CONFIG_NEED_SENSOR_BULK=y

‎klipper_menuconfigs/config-voron-skirt-buttons.old

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ CONFIG_LOW_LEVEL_OPTIONS=y
55
# CONFIG_MACH_LPC176X is not set
66
CONFIG_MACH_STM32=y
77
# CONFIG_MACH_HC32F460 is not set
8-
# CONFIG_MACH_RP2040 is not set
8+
# CONFIG_MACH_RPXXXX is not set
99
# CONFIG_MACH_PRU is not set
1010
# CONFIG_MACH_AR100 is not set
1111
# CONFIG_MACH_LINUX is not set
@@ -90,6 +90,8 @@ CONFIG_WANT_DISPLAYS=y
9090
CONFIG_WANT_SENSORS=y
9191
CONFIG_WANT_LIS2DW=y
9292
CONFIG_WANT_LDC1612=y
93+
CONFIG_WANT_HX71X=y
94+
CONFIG_WANT_ADS1220=y
9395
CONFIG_WANT_SOFTWARE_I2C=y
9496
CONFIG_WANT_SOFTWARE_SPI=y
9597
CONFIG_NEED_SENSOR_BULK=y

0 commit comments

Comments
 (0)