Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
--- a/etc/init.d/S91unisrv
+++ b/etc/init.d/S91unisrv
@@ -30,6 +30,13 @@ ARGS="-t $(camera_type)"
--- a/etc/init.d/S90lmd
+++ b/etc/init.d/S90lmd
@@ -8,6 +8,12 @@ PROG=/usr/bin/lmd

case "$1" in
start)
+ EXTENDED_CFG="/home/lava/printer_data/config/extended/extended2.cfg"
+ CAMERA_INTERNAL=$(/usr/local/bin/extended-config.py get "$EXTENDED_CFG" camera internal paxx12)
+ if [ "$CAMERA_INTERNAL" != "snapmaker" ]; then
+ echo "Internal camera is not set to 'snapmaker', not starting unisrv."
+ exit 0
+ fi
+
log "Starting unisrv process..."
ulimit -c 102400
start-stop-daemon -S -b -x "$PROG" -m -p "$PIDFILE" -- $ARGS
start)
+ EXTENDED_CFG="/home/lava/printer_data/config/extended/extended2.cfg"
+ CAMERA_INTERNAL=$(/usr/local/bin/extended-config.py get "$EXTENDED_CFG" camera internal paxx12)
+ if [ "$CAMERA_INTERNAL" != "snapmaker" ]; then
+ echo "Internal camera is not set to 'snapmaker', not starting lmd."
+ exit 0
+ fi
ulimit -c 102400
start-stop-daemon -S -b -x "$PROG"
;;
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ CMD_CTRL_ARGS="/usr/local/bin/control-v4l2.py --device /dev/v4l-subdev2 --sock /

CMD_RTSP="/usr/local/bin/stream-rtsp --h264-sock /tmp/capture-mipi-h264.sock --rtsp-port 8554 --max-clients 4"

CMD_UNISRV="/usr/bin/unisrv"
CMD_UNISRV_ARGS="-t MIPI"
CMD_LMD="/usr/bin/lmd"
CMD_LMD_ARGS=""

start() {
if [ "$CAMERA_INTERNAL" != "paxx12" ]; then
Expand Down Expand Up @@ -71,14 +71,14 @@ start() {
export V4L2_IMPOSTER_HEIGHT=1080
export V4L2_IMPOSTER_FORMAT=nv12

printf "Starting unisrv: "
start-stop-daemon -S -b -q -m -p /var/run/unisrv.pid -x $CMD_UNISRV -- $CMD_UNISRV_ARGS
printf "Starting lmd: "
start-stop-daemon -S -b -q -m -p /var/run/unisrv.pid -x $CMD_LMD -- $CMD_LMD_ARGS
echo "OK"
)
}

stop() {
printf "Stopping unisrv: "
printf "Stopping lmd: "
start-stop-daemon -K -q -p /var/run/unisrv.pid
echo "OK"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ settings:
- -xc
- |
/usr/local/bin/extended-config.py add /home/lava/printer_data/config/extended/extended2.cfg camera internal paxx12 &&
/etc/init.d/S91unisrv stop &&
/etc/init.d/S90lmd stop &&
/etc/init.d/S99v4l2-mpp-mipi restart
snapmaker:
label: Snapmaker
Expand All @@ -46,7 +46,7 @@ settings:
- |
/usr/local/bin/extended-config.py add /home/lava/printer_data/config/extended/extended2.cfg camera internal snapmaker &&
/etc/init.d/S99v4l2-mpp-mipi stop &&
/etc/init.d/S91unisrv start
/etc/init.d/S90lmd start
none:
label: Disabled
cmd:
Expand All @@ -55,7 +55,7 @@ settings:
- |
/usr/local/bin/extended-config.py add /home/lava/printer_data/config/extended/extended2.cfg camera internal none &&
/etc/init.d/S99v4l2-mpp-mipi stop &&
/etc/init.d/S91unisrv stop
/etc/init.d/S90lmd stop
default: paxx12

camera-usb:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
diff -uNr rootfs.original/home/lava/origin_printer_data/config/moonraker.conf rootfs/home/lava/origin_printer_data/config/moonraker.conf
--- rootfs.original/home/lava/origin_printer_data/config/moonraker.conf
+++ rootfs/home/lava/origin_printer_data/config/moonraker.conf
@@ -13,6 +13,7 @@
@@ -15,6 +15,7 @@
169.254.0.0/16
172.16.0.0/12
192.168.0.0/16
192.0.0.0/8
+ 100.64.0.0/10
FE80::/10
::1/128
Expand Down
2 changes: 1 addition & 1 deletion scripts/create_firmware.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ for overlay; do
# apply all .patch to their respective directories
while read -r patchfile; do
echo "[+] Applying patch: $(basename "$patchfile") in subdir $(dirname "$patchfile")"
patch -F 0 -d "$ROOTFS_DIR/$(dirname "$patchfile")" -p1 < "$patchfile"
patch -F 0 --no-backup-if-mismatch -d "$ROOTFS_DIR/$(dirname "$patchfile")" -p1 < "$patchfile"
done < <(find -type f -name "*.patch" | sort)
popd > /dev/null
fi
Expand Down
6 changes: 3 additions & 3 deletions vars.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FIRMWARE_FILE=U1_1.1.0.105_20260124180406_upgrade.bin
FIRMWARE_VERSION=1.1.0
FIRMWARE_SHA256=f9b0cc01efa93f1b2485e1fa8b6ff15ee3d31bd27de65f521888b995ea2f707a
FIRMWARE_FILE=U1_1.1.1.122_20260207021740_upgrade.bin
FIRMWARE_VERSION=1.1.1
FIRMWARE_SHA256=847b4539e15451f89ab78110cfc0434ca94cc8234d91380162f14948f18d2344
KERNEL_GIT_URL=https://github.com/rockchip-linux/kernel.git
KERNEL_SHA=8533b2249e1550b233a4836d039d64e3bb2fed7a
Loading