viewit/OrcaSlicer-KX
3
1
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 3 Wiki Activity
25,154 Commits 4 Branches 3 Tags
df6aa89c4e56de390bd03674579f346b0ed24d7b
Commit Graph

282 Commits

Author SHA1 Message Date
xin.zhang
df6aa89c4e FIX: fix the json assert 
jira: none
Change-Id: I0d17ef2e8474e84397c92ecd7868c6313bb8c9f7
(cherry picked from commit ec2412ddec0fd9d21a004f231154bec28d3107f8)
 2025-05-20 20:32:47 +08:00
xin.zhang
52baf3fe38 FIX: The humidity popup with humidity_percent/temperature/dry_time 
jira: [STUDIO-9268]
Change-Id: Ic6e923ae7cff56fa3e053d48e5dea6e393cd41eb
(cherry picked from commit 75da1db2f926125a0cb3595a8cae9f4d7588c6a8)
 2025-05-20 11:48:15 +08:00
xin.zhang
54a0e449a7 FIX: support more device components 
jira: [STUDIO-9275]
Change-Id: I8105828183d42496eed77793daa1c1a618e252bf
(cherry picked from commit 478fc597c4b0f054c93bef954f3ca1054111b4b3)
 2025-05-20 10:55:48 +08:00
xin.zhang
d3773dff5e FIX: update the display of AMSHumidity 
jira: [STUDIO-10119]
Change-Id: I7a1be57bd0dff13be149d6450b36fb54ffa9521d
(cherry picked from commit c3a8690987005e0f53bbd5f9622a670e76bed93a)
 2025-05-19 11:04:15 +08:00
tao wang
170dafa3a7 FIX:fixed obtaining incorrect bits 
jira:[none]

Change-Id: I27a4ae24870276912b69fad1c0285889e749030b
(cherry picked from commit 207d81c76933c5cf2fe2d28ed70ab2d246af2615)
 2025-05-19 11:04:14 +08:00
tao wang
1bac9bc14c FIX:Fix the display issue of uncalibrated AMS 
jira:[for uncalibrated ams]

Change-Id: I02e3f3548750fd0bd61d64e36a535a0f83371e98
(cherry picked from commit f08d40b42a8193123bdba559cb8eade5ff062b4a)
 2025-05-19 11:04:13 +08:00
tao wang
e1fb9e8354 ENH:adjust the parsing of ams info data 
jira:[none ]

Change-Id: I8e5125ae313b48b3f64fe59ae45ee7b437a0119f
(cherry picked from commit c38074d3cdc38f8e676a443f23b20d9477facea9)
(cherry picked from commit c8ce030bd2de6b54a79e218d6073164956f6f0b9)
 2025-05-19 11:04:12 +08:00
liz.li
d671ccfa99 ENH: support dynamic size ams panel list in upgrade panel 
jira: none

adjust accessories display text

Change-Id: I1de6872325b17bd5cfb11e750608d5f420055ee4
(cherry picked from commit 6ba1518c24b4dcba01eabb6d1d0ce3a0ce69576c)
 2025-05-18 16:42:19 +08:00
tao wang
afb17f1d4f ENH:show n3f/n3s version info 
jira:[for n3s]

Change-Id: Ia0056dfdf7157036008cc63a37c9fd8076063a6a
(cherry picked from commit a44ff5a95a6774b4eed1238bde12d0a750c24a10)
 2025-05-18 16:35:09 +08:00
Noisyfox
60cec637a1 Fix nozzle target temp display 2025-05-18 14:59:08 +08:00
Noisyfox
bd34ae53b4 Merge branch 'main' into dev/bbl-network-upd 
# Conflicts:
#	src/slic3r/GUI/SelectMachine.cpp
 2025-05-17 00:22:09 +08:00
Alexandre Folle de Menezes
cf71e4f2c7 Fix the spacing on the original english strings (#9596) 
* Remove extra spaces between words

* Remove extra spaces after punctuation

* Remove extra spaces before punctuation

* Always needs a space after punctuation

* Always needs a space before parens

* Remove trailing spaces before newline
 2025-05-16 16:31:58 +08:00
xin.zhang
eb8a4419c2 FIX: fix the humidity display of N3S_AMS 
jira: [STUDIO-10641]
Change-Id: I48ac96443f851262b3ce720d4b4948b7b515a381
(cherry picked from commit 51042edcbdc1d8d24c11fa8a479559d4fd000fc7)
 2025-05-15 13:35:07 +08:00
xin.zhang
b77d3b5770 FIX: the humidity display 
jira: [STUDIO-10481]
Change-Id: Ib4bec6db6afbe40199c401c539b13a0e8459bbad
(cherry picked from commit 658a8ab7ef1d2149fee58b45ea9455bb188f82f0)
 2025-05-15 13:35:06 +08:00
Noisyfox
0f6c378fd3 Fix external spool filament settings 2025-05-14 21:29:12 +08:00
Noisyfox
4debf22ef4 Add network debugging 2025-05-12 21:51:34 +08:00
Noisyfox
8ff2046799 Update to latest BBS code. Fix ams filament preset check 2025-05-07 20:42:23 +08:00
tao wang
534c4fd153 ENH:command ams filament settings is compatible with all AMS 
jira:[none]

Change-Id: I622300794d1fa14826847229737b1f6f2ae490db
(cherry picked from commit c2adbe140b134b958f589ba178286e245a09adbf)
 2025-05-07 18:13:03 +08:00
Noisyfox
a8b28d2856 Fix compile error 2025-05-07 16:57:28 +08:00
zhimin.zeng
ff1e5d5d4c FIX: modify for get pa cali result 
jira: none
Change-Id: I3c57ccaac3b7e73e0b2eb0e26678635478480298
(cherry picked from commit 6bf39690517f9e25de895bf52673d3a4a7b77255)
 2025-05-07 16:38:26 +08:00
Noisyfox
4d0f0940c3 Update naming 2025-05-07 16:35:57 +08:00
zhimin.zeng
4e4b8c48b6 FIX: cannot cali for single nozzle printer 
jira: none
Change-Id: I1cc0e5e4b0f9db2a66694c894f96a14047fde9e5
(cherry picked from commit 7bd3a5218af9f3d172090a80da447c4f2bbfff61)
 2025-05-07 16:35:35 +08:00
tao wang
939b4a1aef FIX:Fix the issue of extruder matching errors 
jira:[for nozzle match]

Change-Id: I6965500bfb7feef6d18d28bea8a53a3c477f5e36
(cherry picked from commit 7bcf4b6cc5bc38e723bfd8dcd495c60a55134490)
 2025-05-07 15:49:21 +08:00
zhimin.zeng
3e954e1f37 ENH: support auto pa cali for multi_extruder printer 
jira: none
Change-Id: I835a0e20de81f9af7c40983e00bdb37ea6c95a68
(cherry picked from commit 4e387d4ace4332a7c2b6c0ab695b80a51597d0c7)
 2025-05-07 15:46:24 +08:00
tao.wang
39af16577e ENH:support set ams filament 
jira:[for 2nozzle setting]

Change-Id: Ib9e20bcdf6d8ea1bf5dd5e8624a68730e05e69ad
(cherry picked from commit 78c592819473b1291d1bec1126ccbf7d86bb17d5)
 2025-05-07 15:13:39 +08:00
tao wang
04ac43949b ENH:support parse new print data 
jira:[for new print data]

Change-Id: Iac6747e9ade690fcdf3b7b11239fe183bc7c3796
(cherry picked from commit 6c02c7bc8c77a481253e6c574f7bc13ff2cfcbdc)
 2025-05-07 15:01:17 +08:00
Noisyfox
8d2f4a21c3 Fix setting AMS calib profile 
ENH: calib support multi_extruder

1. backend support multi_extrude data structure
2. Compatible with third-party calibration

(cherry picked from commit bambulab/BambuStudio@21e6271e59)

Co-authored-by: zhimin.zeng <zhimin.zeng@bambulab.com>
 2025-05-06 23:04:35 +08:00
tao wang
bb509ce63b NEW:support new mapping type 
jira:[support new mapping]

Change-Id: I88e5d3b6966d4ed1e8098d13fe9335fecf6e01c4
(cherry picked from commit c0932e16ff9fcae0e900c6e0cac9a5b496d0cc0e)
 2025-05-01 15:54:19 +08:00
tao wang
73e729b7eb ENH:support new amsmapping data 
jira:[for 2 extruder]

Change-Id: Ie03eae17d600bc68451511a0179f20d1919ff6ea
(cherry picked from commit 0848c26da97c7b74e98645b9a0873fe928fdf631)
 2025-05-01 15:54:18 +08:00
Noisyfox
702755548c Support both old and new version of BBL network plugin 2025-05-01 15:54:17 +08:00
Alexandre Folle de Menezes
aac4337b6d Fix english strings consistency (#8881) 
* "non zero" -> "non-zero"

* "Z hop" -> "Z-hop"

* "works" -> "is working"

* "version at least x" -> "version x or higher"

* "printing job" -> "print job"
"to print on" -> "printing on"

* "is not find" -> "was not found"

* "boundary of plate" -> "plate boundaries"

* "toolchange" -> "tool change"

* "colour" -> "color"

* "cancelled" -> "canceled"

* "can not" -> "cannot"

* "gcode" -> "G-code"
 2025-04-26 19:59:49 +08:00
Noisyfox
88f0a232dc Implement manual printer setup 2025-01-31 19:18:04 +08:00
Noisyfox
45d8ea6115 Automatically connect local machine when switch to device tab 2025-01-31 16:33:59 +08:00
Noisyfox
5a404bd4b6 Save binded local machines 2025-01-31 16:33:57 +08:00
Noisyfox
c8f190b5ce Sync with bbs 2025-01-23 13:29:27 +08:00
Noisyfox
3fba0a8937 Fix flatpack build 2025-01-23 12:51:05 +08:00
tao wang
4464d3c6b2 FIX:Fixed printer name display error 
jira:[STUDIO-8619]

Change-Id: Ie9ce0cb39623eefa3973a342b447ab2f2a765d28
(cherry picked from commit c41eb657818bb29abb3a2e7c6df7b7d489c80592)
 2025-01-23 11:38:25 +08:00
tao wang
c621cd7d6e NEW:Support direct connection to X printer 
Change-Id: I4ea38d3a69834f607161ae35eda00d042b7c4f47
(cherry picked from commit a0f63b9a3a4efd2fd6d396aa757750cd0ff28178)
 2025-01-23 11:38:19 +08:00
zhimin.zeng
232983a0d1 FIX: add ack info for cali command 
jira: none
Change-Id: Iec36ba2fd1248428234d74adb2089d975c54b7f2
(cherry picked from commit 0312db40c8ee5dfe7a912bf9992240f99036f6a8)
(cherry picked from commit 8a279ef30238dc70ef9b4ef473e75b4335059b87)
 2025-01-23 11:38:13 +08:00
tao wang
c334c0264a NEW:Support parsing of bit parameters 
Change-Id: I9b474a0e8b1bbfb5b1a4f2748f3f3f1e2afc6239
(cherry picked from commit 73c2ccd83b96490aee58f8cfe912e3ab66982094)
 2025-01-23 11:38:12 +08:00
maosheng.wei
84895eaf9e ENH: Optimize the number of function calls during information parsing 
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)
 2025-01-23 11:38:11 +08:00
chunmao.guo
4ba5960dd4 ENH: liveview remote protocols with agora 
Change-Id: Id86aa4bfa5f5e09675a6fe627668c63d20c7d1bf
Jira: none
(cherry picked from commit 46eba0048b73f1741b4b7b57f788830c08a8d7f1)
 2025-01-23 10:13:24 +08:00
tao wang
d647e31bb8 NEW:Support direct connection to LAN printers 
jira:[connect printer]

Change-Id: Ifdc25651f4effde8e2a2d2a4e690aa20e0ef7022
(cherry picked from commit 0ec49c3588c1f81c159193de352f8a47d39ffe74)
 2025-01-23 09:58:59 +08:00
tao wang
b03ede1978 FIX:disable some non existent methods 
Change-Id: Ic5af8864bcb709f9f76303eb4a0f13b4789400b4
(cherry picked from commit 1f4dd2b2a89e0e2109b4ba3fa80e48a01a2bebaf)
 2025-01-23 09:44:11 +08:00
tao wang
a727f4f04a NEW:Support setting filaments in printing 
jira:[set filament]

Change-Id: Ib37896f9101d93ca63c7edb0b1e6328045a5ddb3
(cherry picked from commit fa2dbd7ada18bc806be845673cce9eb4559cda80)
 2025-01-23 09:43:32 +08:00
tao wang
823ab50fb8 ENH:Support for binding farm mode printers 
jira:[for farm mode]

Change-Id: Icb2eb3f8435bcc1cabcb343ba040ce426eb50581
(cherry picked from commit f6a230869b020bcd149b7e2878cd33a4200c6a06)
 2025-01-23 09:40:15 +08:00
Stone Li
02d4067898 FIX: fix network wired issue 
JIRA: STUDIO-7534

Change-Id: I0b5d3764ebf61735238207adc2053ad45ce5ec1a
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit babda59caa2cb83ae993bfe87c865d7f61c6ab4b)
(cherry picked from commit ff22a8651580a637e42a6839ae364552354781e1)
 2025-01-23 09:28:41 +08:00
Stone Li
a47a0bc6e8 ENH: parse net conf for network wired status 
JIRA: STUDIO-5195

Change-Id: Ida3cd5c60b25d1eff4f04e324a74d63394a9ffeb
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 6b6787b30736f87491171237a36c6badc8e51878)
(cherry picked from commit acfdcadac09f05f2e008340d485c4781744c95f9)
 2025-01-23 09:28:35 +08:00
Marius Wachtler
e6c49c8a73 Fix some errors uncovered via compiler warnings (#7954) 
* fix: tray_exist_bits != tray_exist_bits comparison

* fix: title == GetTitle() == title comparison

* fix: possibly dangling reference to a temporary
```
OrcaSlicer/src/libslic3r/calib.cpp:456:17: warning: possibly dangling reference to a temporary [-Wdangling-reference]
  456 |     const auto &w         = bed_ext.size().x();
OrcaSlicer/src/libslic3r/calib.cpp:456:45: note: the temporary was destroyed at the end of the full expression ‘((Eigen::DenseCoeffsBase<Eigen::Matrix<double, 2, 1, 2>, 1>*)(& Slic3r::BoundingBoxBase<PointClass>::size() const [with PointClass = Eigen::Matrix<double, 2, 1, 2>]()))->Eigen::DenseCoeffsBase<Eigen::Matrix<double, 2, 1, 2>, 1>::x()’
  456 |     const auto &w         = bed_ext.size().x();
```

* fix: mixup of | and ||
in this case I think it actually does not change the semantics it just means that both comparison have to be evaluated.

* fix: multi-character character constants need "

OrcaSlicer/src/slic3r/GUI/MediaPlayCtrl.cpp:392: warning: multi-character character constant [-Wmultichar]
  392 |     if (auto n = tunnel.find_first_of('/_'); n != std::string::npos)
OrcaSlicer/src/slic3r/GUI/MediaPlayCtrl.cpp: In member function ‘void Slic3r::GUI::MediaPlayCtrl::Stop(const wxString&)’:
OrcaSlicer/src/slic3r/GUI/MediaPlayCtrl.cpp:392: warning: overflow in conversion from ‘int’ to ‘char’ changes value from ‘12127’ to ‘95’ [-Woverflow]

* fix: missing paranthesis - skips null check

* NFC: Remove this check it can never be false

* NFC: fix warning: statement has no effect
 2025-01-08 13:06:39 +08:00
Philipp
0b616c22a9 Allow printing prohibited filaments when 'Skip AMS Blacklist Check' is enabled (#7161) 
Update DeviceManager.cpp
 2024-10-22 23:13:34 +08:00