Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update BBS network plugin to 1.10.1 #8148

Merged
merged 59 commits into from
Jan 31, 2025
Merged

Update BBS network plugin to 1.10.1 #8148

merged 59 commits into from
Jan 31, 2025

Conversation

Noisyfox
Copy link
Collaborator

@Noisyfox Noisyfox commented Jan 23, 2025 •
edited
Loading

This PR ported the following changes based on BBS 1.10.1 codebase:

Thanks BambuLab for those improvements!

Please note: with this update, we will no longer be able to streaming the live camera through cloud, only through Lan (even if the printer is not in Lan mode). At least that's what I saw with this PR and also #8103, more tests & feedbacks on this are needed. Update: nvm, I missed a commit that fixes the remote live view. It's working now.

Unfortunately even with this update you still cannot bind the printer in a different subnet, which is an inherent problem from BBS:
bambulab/BambuStudio#4512
bambulab/BambuStudio#5070
bambulab/BambuStudio#5833
and more...

StoneLiBambulab and others added 30 commits January 23, 2025 09:28
@StoneLiBambulab @Noisyfox
ENH: parse net conf for network wired status
c336ae6 
JIRA: STUDIO-5195

Change-Id: Ida3cd5c60b25d1eff4f04e324a74d63394a9ffeb
Signed-off-by: Stone Li <[email protected]>
(cherry picked from commit 6b6787b30736f87491171237a36c6badc8e51878)
(cherry picked from commit acfdcadac09f05f2e008340d485c4781744c95f9)
@StoneLiBambulab @Noisyfox
FIX: fix network wired issue
d9473fd 
JIRA: STUDIO-7534

Change-Id: I0b5d3764ebf61735238207adc2053ad45ce5ec1a
Signed-off-by: Stone Li <[email protected]>
(cherry picked from commit babda59caa2cb83ae993bfe87c865d7f61c6ab4b)
(cherry picked from commit ff22a8651580a637e42a6839ae364552354781e1)
@bambu123 @Noisyfox
FIX: change to 'Video Stopped'
f99116d 
Change-Id: Ie8ed7865719652998577d2801ad71bc7da1f634f
Jira: none
(cherry picked from commit 69ad831570601554589057983ba7c7caa7964cf2)
@bambu123 @Noisyfox
FIX: sleep before retry on file session lost
b9eb162 
Change-Id: I924f0a370a2a8d6a9b5aa082cbe791fc2e1a18c5
Jira: STUDIO-7991
(cherry picked from commit 3b8ef667b106de60cba542ad5ceee5db8714fc3d)
@DanBao-Bambu @Noisyfox
FIX: [6657] AMS humidity display title change
b6c1adb 
Jira: 6657

Change-Id: I88ed6f438211f741ec918bc35e6c10c3f2e23975
Signed-off-by: maosheng.wei <[email protected]>
(cherry picked from commit 60149a7322425d73904cc0713eed147e09f15e78)
@Noisyfox
ci: update network module based on commit 053c1c1
fcd6f33 
Change-Id: I88b9699d48ad1e8da53f26ff549b1700bd60247b
(cherry picked from commit 76b5bc626ec1372e869649f35da84c4bbba0ea12)
@bambu123 @Noisyfox
FIX: liveview local missing ip dialog not show
d802379 
Change-Id: Ie15bdf0ac20354aecb2e0dffe9471e12e0143aa9
(cherry picked from commit 4d7715cc116b37f0889729d6550c8aa1a5034b73)
@walterwongbbl @Noisyfox
ENH:Support for binding farm mode printers
66af62a 
jira:[for farm mode]

Change-Id: Icb2eb3f8435bcc1cabcb343ba040ce426eb50581
(cherry picked from commit f6a230869b020bcd149b7e2878cd33a4200c6a06)
@Noisyfox
ci: update network module based on commit ce3b330
e9f9cf5 
Change-Id: I5700edccc853075ea82118a3b9eed78e5c5f48e8
(cherry picked from commit 553028775ecb8c8338d5d32bff868ae43ac85852)
@walterwongbbl @Noisyfox
NEW:Support setting filaments in printing
8eece6a 
jira:[set filament]

Change-Id: Ib37896f9101d93ca63c7edb0b1e6328045a5ddb3
(cherry picked from commit fa2dbd7ada18bc806be845673cce9eb4559cda80)
@walterwongbbl @Noisyfox
FIX:disable some non existent methods
688b769 
Change-Id: Ic5af8864bcb709f9f76303eb4a0f13b4789400b4
(cherry picked from commit 1f4dd2b2a89e0e2109b4ba3fa80e48a01a2bebaf)
@walterwongbbl @Noisyfox
FIX:fixed unable to pick color
65d4d31 
jira:[for setting]

Change-Id: I877af3561fcbeb43b46202cb2b27b6522425a83f
(cherry picked from commit 5648ef61afdc1463e7dc80856a6e4a65e6a892c7)
@Noisyfox
ci: update network module based on commit ba54563
5c11aed 
Change-Id: I587d656e20ed2ee8927ca2f5272ad715bed66740
(cherry picked from commit 20a531733ce240817610c9956af8f16dbe49d426)
@walterwongbbl @Noisyfox
NEW:Support direct connection to LAN printers
9ab3107 
jira:[connect printer]

Change-Id: Ifdc25651f4effde8e2a2d2a4e690aa20e0ef7022
(cherry picked from commit 0ec49c3588c1f81c159193de352f8a47d39ffe74)
@MklBambu @Noisyfox
ENH: Optimize the presentation of error code dialog
b75f22b 
JIRA: STUDIO-7469 STUDIO-7477 STUDIO-7613

Change-Id: I6689dc375a51a1d690b82f9dbaa79d1555f7816f
(cherry picked from commit 777c16fef0862587f3ec468652aabd70cff88dfe)
@walterwongbbl @Noisyfox
FIX:Fixed the issue of disconnection cause no respon
02abd17 
jira:[STUDIO-8062]

Change-Id: Ic369f6f6b293c0f616e6408651c6f40cec0de051
(cherry picked from commit c3bb86f26c399d19b00de321d490e0586a1e10f7)
@walterwongbbl @Noisyfox
ENH:fix directly connected text
d380b59 
jira:[STUDIO-8031]

Change-Id: I0e747e4a279ab97ed7cab2acc6efb14cbafc4685
(cherry picked from commit 00b65490dcf853c864cbce1abe3de22c162ba58d)
@Noisyfox
ci: update network module based on commit 4b3f1e5
fe01886 
Change-Id: Ifde48fc6f2d3f4d5bd6e348cc2a09deef83bd090
(cherry picked from commit 620b40c904aca8f7f40cb09f4633bbacfb62a869)
@lanewei120 @Noisyfox
ENH: networking: sync the header files to fix the compile issue
8b33119 
JIRA: no-jira
Change-Id: Ie1d454d4a9256e15a27b294af680a5ed49137f90
(cherry picked from commit 07e4aa213ac4a1b5bda865774a4e3d9e7f866170)
@bambu123 @Noisyfox
ENH: liveview remote protocols with agora
6385a4d 
Change-Id: Id86aa4bfa5f5e09675a6fe627668c63d20c7d1bf
Jira: none
(cherry picked from commit 46eba0048b73f1741b4b7b57f788830c08a8d7f1)
@bambu123 @Noisyfox
ENH: refresh_agora_url callback
f527060 
Change-Id: I0d9a659d8bc9d004798409e1e76003854d4e5af6
(cherry picked from commit 76ef39c588908ad0dddef257812c333704fef84b)
@lanewei120 @Noisyfox
ENH: network: load dlls from current directory if failed
a7f58f3 
JIRA: no-jira
Change-Id: I86efafe3aefac85d56879a68f864a52c0e62fca5
(cherry picked from commit cdf0859e78e8d62c2de13f2f9bf56a216a79a12a)
(cherry picked from commit b4cc20ac14298bac2e928d1d598e9d75ca953ba3)
@lanewei120 @Noisyfox
ENH: network: refine current path logic
a0c0964 
only use the same path as binary for current path

JIRA: STUDIO-7875

Change-Id: I5523e3b7e20b0f24de50c8d295f54b984693165a
(cherry picked from commit 62b98f783dcee8900da034b384167817155a3e59)
@bambu123 @Noisyfox
FIX: take addr of refresh_agora_url
b0be4bc 
Change-Id: I02e7010634f578d76d3d4ee39edf73117d5684d1
Jira: none
(cherry picked from commit ee290b439d2dd19bc00e7037b38fc48bc741b938)
@Noisyfox
ci: update network module based on commit 0988159
a2eea5f 
Change-Id: I28069501e6fb9468d92903a82e3e6839f007ef3d
(cherry picked from commit 6aca03d69a6f5e80d9551b8f192ed8199cec1f1c)
@DanBao-Bambu @Noisyfox
ENH: Optimize the number of function calls during information parsing
8f08b58 
During the printer connection cycle, each Filament and slot is only judged once
When deleting custom filaments or modifying the temperature of custom filaments, re evaluate

Jira: XXXX

Change-Id: If495a343efdb1be6f46d11dd20f6ec7934266e87
(cherry picked from commit e5dab1487188d744c732568232b32666e5f2cc5c)
@walterwongbbl @Noisyfox
NEW:Support parsing of bit parameters
66e5cbd 
Change-Id: I9b474a0e8b1bbfb5b1a4f2748f3f3f1e2afc6239
(cherry picked from commit 73c2ccd83b96490aee58f8cfe912e3ab66982094)
@zhimin-zeng-bambulab @Noisyfox
FIX: fix build error
f160381 
jira: none
Change-Id: I606c7ef67bf3b5f2810561ef2f5689947de4d4a8
(cherry picked from commit 93f95d95e718494a796a9290a1d7a5131485a205)
@zhimin-zeng-bambulab @Noisyfox
FIX: add ack info for cali command
fde250f 
jira: none
Change-Id: Iec36ba2fd1248428234d74adb2089d975c54b7f2
(cherry picked from commit 0312db40c8ee5dfe7a912bf9992240f99036f6a8)
(cherry picked from commit 8a279ef30238dc70ef9b4ef473e75b4335059b87)
@Noisyfox
ci: update network module based on commit 89857a1
4c48b28 
Change-Id: Id47ec68b439751f6d1459b4325cea56b26ff175b
(cherry picked from commit 2a5c42fdd0d1228f85215ff05e5bca781ea8d663)
walterwongbbl and others added 5 commits January 23, 2025 11:38
@walterwongbbl @Noisyfox
FIX:fixed that macOS will hang up as direct connected device
00d274f 
jira:[STUDIO-8630]

Change-Id: I96562bd11de807435fc6a2d81501800b0cf110b1
(cherry picked from commit c8a8d9f19758a33d713054eb93cd5084b38ac26a)
@walterwongbbl @Noisyfox
FIX:Fixed printer name display error
818948a 
jira:[STUDIO-8619]

Change-Id: Ie9ce0cb39623eefa3973a342b447ab2f2a765d28
(cherry picked from commit c41eb657818bb29abb3a2e7c6df7b7d489c80592)
@Noisyfox
ci: update network module based on commit adbaa57
7a3bafc 
Change-Id: I34d6ae1a192e3eb629a37a175626da0007208746
(cherry picked from commit 4be224611afaa7d3a113d8f6c62c13061c8946e6)
@Noisyfox
ci: update network module based on commit bf743ea
93f4c2b 
Change-Id: Ic6104cad06da962e61834d7b072f2155ae729928
(cherry picked from commit 5f8b68601b1766568ec604a5b75d8a68efb24ade)
@Noisyfox
Fix build
4f496dd
@Noisyfox Noisyfox force-pushed the dev/update-bbs-network branch from 3bf0fd2 to 4f496dd Compare January 23, 2025 03:39
Noisyfox and others added 5 commits January 23, 2025 12:51
@Noisyfox
Fix flatpack build
a908801
@walterwongbbl @Noisyfox
NEW:clear token when account logs out
5f3ff22 
jira:[for logout]

Change-Id: Iafbdc9244419bb689a9626251064517ec5544c3d
(cherry picked from commit 6472fbdc6a7e7380538b6e2da29f802831a93157)
@Noisyfox
Sync with bbs
bee7188
@lanewei120 @Noisyfox
ENH: version: bumped to 1.10.1
6b30984 
jira: no-jira
Change-Id: Ic2acf61195d4290d5c4742f18a5d769ba3030e63
(cherry picked from commit aed9dd9dff74bb8ed93c34b5fde2cac0b3dfc88c)
@Noisyfox
Fix stop button
ccee8ef
@liberodark
Copy link
Contributor

Hi,

I case of you use X1Plus that work for camera ?

Best Regards

@walterwongbbl @Noisyfox
NEW:update printer config version
ad76d0a 
Change-Id: I85432494b2e9a27dc97a1bb464f9f3b04bf5bc2f
(cherry picked from commit 6fd4bda1d62e3e3921945bdcd9db71942b754fed)
@Noisyfox
Copy link
Collaborator Author

Hi,

I case of you use X1Plus that work for camera ?

Best Regards

Nvm, I missed some code changes. The live camera is working now.

@EchoJunction
Copy link

Thanks for your work already! Just tried this flatpak build and it does not seem to connect when my printer is on a different subnet.

@Noisyfox
Copy link
Collaborator Author

Noisyfox commented Jan 23, 2025 •
edited
Loading

Thanks for your work already! Just tried this flatpak build and it does not seem to connect when my printer is on a different subnet.

Does BambuStudio 1.10.1 works in this case? Since they should use the exact same network plugin I would expect the same behavior.

@EchoJunction
Copy link

Thanks for your work already! Just tried this flatpak build and it does not seem to connect when my printer is on a different subnet.

Does BambuStudio 1.10.1 works in this case? Since they should use the exact same network plugin I would expect the same behavior.

Just tested it in BBS 1.10.1.50 and it also does not work sadly.

@recursiveGecko
Copy link

recursiveGecko commented Jan 24, 2025 •
edited
Loading

@Noisyfox Hi, when the user tries to add a printer by entering the IP address, could Orca somehow trigger the same code path that's used for SSDP-initiated connections, but with IP address entered by the user? Could this effectively "trick" the network plugin into connecting correctly? I'm not familiar with the codebase but I thought I'd mention it.

I've been using https://github.com/jonans/bsnotify to successfully connect to my printer that's on a different subnet, so there's no inherent connectivity issues, but it would be nice if we didn't have to run another program.

@Noisyfox Noisyfox mentioned this pull request Jan 26, 2025
Open
1 task
@SoftFever
Copy link
Owner

Looks like there's an issue to download the plugin
image

@Noisyfox
Copy link
Collaborator Author

Looks like there's an issue to download the plugin image

image
It works fine on my side. Did you have another instance of Orca running?

@Noisyfox Noisyfox marked this pull request as ready for review January 29, 2025 13:26
@igiannakas
Copy link
Contributor

Merged in my dev branch and has been working well. Nothing to report but nothing is equally good :D

@SoftFever
Copy link
Owner

Thank you for the confirmation.
I don't have other slicer instances running and I have rebooted the OS also.
It's very strange. It turns out that the plugin was locked by Chrome browser.
I'm totally clueless why this happened

SoftFever
SoftFever approved these changes Jan 31, 2025
View reviewed changes
Copy link
Owner

@SoftFever SoftFever left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@SoftFever SoftFever merged commit 82ce8c9 into SoftFever:main Jan 31, 2025
16 checks passed
@Noisyfox Noisyfox deleted the dev/update-bbs-network branch January 31, 2025 08:34
@Noisyfox
Copy link
Collaborator Author

@Noisyfox Hi, when the user tries to add a printer by entering the IP address, could Orca somehow trigger the same code path that's used for SSDP-initiated connections, but with IP address entered by the user? Could this effectively "trick" the network plugin into connecting correctly? I'm not familiar with the codebase but I thought I'd mention it.

I've been using https://github.com/jonans/bsnotify to successfully connect to my printer that's on a different subnet, so there's no inherent connectivity issues, but it would be nice if we didn't have to run another program.

Could you give this PR a try? #8256

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SoftFever SoftFever SoftFever approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone