Skip to content

Commit d384cc1

Browse files
BlackNetBlackNet
committed
Autocommit from 2025-01-31 21:45:48
Klipper on commit: 0114d72 Moonraker on commit: 7e3c86e Mainsail version: v2.13.2
1 parent f89957d commit d384cc1

13 files changed

+78
-134
lines changed

‎.moonraker.conf.bkp

-3
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ origin = https://github.com/Arksine/katapult.git
146146
path = ~/katapult
147147
is_system_service = False
148148

149-
<<<<<<< HEAD
150149
[update_manager crowsnest]
151150
type = git_repo
152151
path = ~/crowsnest
@@ -163,8 +162,6 @@ managed_services = klipper
163162
primary_branch = main
164163
install_script = install.sh
165164

166-
=======
167-
>>>>>>> 7fa5654265a8eea8fe4464ea23f6b05f1ccad8cd
168165
[update_manager happy-hare]
169166
type = git_repo
170167
path = ~/Happy-Hare

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ Hardware:
4646
* Kiauh g-code shell extension
4747
* (defunct, not using) Klipper Expander board - for case lights
4848
* Nevermore with 2x 5015 fans.
49+
* Added u2c can board, RP2040 toolhead board.
4950

5051

5152
Software Used:

‎klipper_menuconfigs/config-U2C

-2
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@ CONFIG_WANT_THERMOCOUPLE=y
104104
CONFIG_WANT_ADXL345=y
105105
CONFIG_WANT_LIS2DW=y
106106
CONFIG_WANT_MPU9250=y
107-
CONFIG_WANT_HX71X=y
108-
CONFIG_WANT_ADS1220=y
109107
CONFIG_WANT_LDC1612=y
110108
CONFIG_WANT_SENSOR_ANGLE=y
111109
CONFIG_WANT_HX71X=y

‎klipper_menuconfigs/config-U2C.old ‎klipper_menuconfigs/config-U2C~

+9-2
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
@@ -100,9 +100,16 @@ CONFIG_USB_SERIAL_NUMBER="12345"
100100

101101
CONFIG_WANT_GPIO_BITBANGING=y
102102
CONFIG_WANT_DISPLAYS=y
103-
CONFIG_WANT_SENSORS=y
103+
CONFIG_WANT_THERMOCOUPLE=y
104+
CONFIG_WANT_ADXL345=y
104105
CONFIG_WANT_LIS2DW=y
106+
CONFIG_WANT_MPU9250=y
107+
CONFIG_WANT_HX71X=y
108+
CONFIG_WANT_ADS1220=y
105109
CONFIG_WANT_LDC1612=y
110+
CONFIG_WANT_SENSOR_ANGLE=y
111+
CONFIG_WANT_HX71X=y
112+
CONFIG_WANT_ADS1220=y
106113
CONFIG_WANT_SOFTWARE_I2C=y
107114
CONFIG_WANT_SOFTWARE_SPI=y
108115
CONFIG_NEED_SENSOR_BULK=y

‎klipper_menuconfigs/config-octopus-446

-3
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,8 @@ CONFIG_WANT_THERMOCOUPLE=y
9494
CONFIG_WANT_ADXL345=y
9595
CONFIG_WANT_LIS2DW=y
9696
CONFIG_WANT_MPU9250=y
97-
CONFIG_WANT_HX71X=y
98-
CONFIG_WANT_ADS1220=y
9997
CONFIG_WANT_LDC1612=y
10098
CONFIG_WANT_SENSOR_ANGLE=y
101-
CONFIG_WANT_SENSOR_ANGLE=y
10299
CONFIG_WANT_HX71X=y
103100
CONFIG_WANT_ADS1220=y
104101
CONFIG_WANT_SOFTWARE_I2C=y

‎klipper_menuconfigs/config-octopus-446.old ‎klipper_menuconfigs/config-octopus-446~

+5-1
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,13 @@ 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
96+
CONFIG_WANT_MPU9250=y
9597
CONFIG_WANT_LDC1612=y
98+
CONFIG_WANT_SENSOR_ANGLE=y
99+
CONFIG_WANT_SENSOR_ANGLE=y
96100
CONFIG_WANT_HX71X=y
97101
CONFIG_WANT_ADS1220=y
98102
CONFIG_WANT_SOFTWARE_I2C=y

‎klipper_menuconfigs/config-raspberry-pi

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ CONFIG_WANT_HX71X=y
2626
CONFIG_WANT_ADS1220=y
2727
CONFIG_WANT_LDC1612=y
2828
CONFIG_WANT_SENSOR_ANGLE=y
29-
CONFIG_WANT_SENSOR_ANGLE=y
3029
CONFIG_WANT_SOFTWARE_I2C=y
3130
CONFIG_WANT_SOFTWARE_SPI=y
3231
CONFIG_NEED_SENSOR_BULK=y

‎klipper_menuconfigs/config-raspberry-pi.old ‎klipper_menuconfigs/config-raspberry-pi~

+6-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,15 @@ 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
29+
CONFIG_WANT_SENSOR_ANGLE=y
2630
CONFIG_WANT_SOFTWARE_I2C=y
2731
CONFIG_WANT_SOFTWARE_SPI=y
2832
CONFIG_NEED_SENSOR_BULK=y

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

-109
This file was deleted.

‎klipper_menuconfigs/klipper_make_all.sh

+6
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ case "$1" in
2323

2424
voron)
2525
./klipper_make_voron_skirt_buttons.sh $2
26+
if [[ -f /sys/class/net/can0/operstate ]]; then
27+
./klipper_make_SB2209-can.sh $2
28+
./klipper_make_u2c.sh $2
29+
else
30+
echo can0 is DOWN.
31+
fi
2632
;;
2733

2834
bookworm)

‎klipper_menuconfigs/klipper_make_all.sh~

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#! /bin/bash
2+
3+
##########
4+
# $1 is machine to flash, voron / bookworm
5+
# $2 is start klipper true/false
6+
# $3 is main / spare for UUID
7+
##########
8+
9+
if [ "$#" -ne 3 ]; then
10+
echo "Illegal number of parameters"
11+
echo -n
12+
echo "arg 1 is machine to flash, voron / bookworm"
13+
echo "arg 2 is start klipper true/false"
14+
echo "arg 3 is main / spare for UUID"
15+
exit
16+
fi
17+
18+
19+
./klipper_make_raspberry.sh $2
20+
./klipper_make_octopus-466.sh $2
21+
22+
case "$1" in
23+
24+
voron)
25+
./klipper_make_voron_skirt_buttons.sh $2
26+
;;
27+
28+
bookworm)
29+
if [[ -f /sys/class/net/can0/operstate ]]; then
30+
./klipper_make_mmb_can_backup.sh $2 $3
31+
./klipper_make_SB2209-can.sh $2
32+
./klipper_make_u2c.sh $2
33+
else
34+
echo can0 is DOWN.
35+
fi
36+
;;
37+
esac
38+
39+
echo -n
40+
echo finished!! Starting klipper
41+
sudo service klipper start

‎printer.cfg

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[include mmu/base/*.cfg]
1+
#[include mmu/base/*.cfg]
22
#[include mmu/addons/blobifier.cfg]
33
#[include mmu/addons/mmu_erec_cutter.cfg]
44

@@ -15,10 +15,9 @@
1515
path: /home/pi/printer_data/gcodes
1616
on_error_gcode: CANCEL_PRINT
1717

18+
[save_variables]
19+
filename: ~/printer_data/config/saved_variables.cfg
1820

19-
########################################
20-
## pushed to github 11-6-21
21-
########################################
2221

2322
# skew correction
2423
[skew_correction]
@@ -42,8 +41,6 @@ on_error_gcode: CANCEL_PRINT
4241
[include config/*.cfg]
4342

4443
# other configs like res testing, klipper expander board, pico's, etc.
45-
[include config-other/knomi.cfg]
46-
[include config-other/SB2209.cfg]
4744
#[include config-other/skirt-buttons.cfg] # skirt button pcb
4845
#[include config-other/nitehawk-sb.cfg]
4946
#[include config-other/klipper_expander.cfg]
@@ -59,13 +56,17 @@ on_error_gcode: CANCEL_PRINT
5956
#[include filament-dryer/dehydrator.cfg] # Si7021 sensor
6057

6158
# include these last, they can override things as needed.
59+
#
60+
# in file /etc/network/interfaces.d/can0
61+
# allow-hotplug can0
62+
# iface can0 can static
63+
# bitrate 1000000
64+
# up ifconfig $IFACE txqueuelen 1024
65+
6266
[include config-other/u2c.cfg]
6367
[include config-other/knomi.cfg]
6468
[include config-other/SB2209.cfg]
6569

66-
[save_variables]
67-
filename: ~/printer_data/config/saved_variables.cfg
68-
6970
[exclude_object]
7071

7172
[force_move]

‎saved_variables.cfg

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
[Variables]
22
chamber_temp = 65
3-
filament_type = 'PLA'
4-
mmu_calibration_bowden_length = 650
53
filament_type = 'ASA'
64
mmu__revision = 1150
75
mmu_calibration_bowden_home = 'encoder'

0 commit comments

Comments
 (0)