viewit/OrcaSlicer-KX
5
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity
27,235 Commits 8 Branches 3 Tags
dceb8807b85eeae7083acb7ed9fd6b0236dc9b67
Commit Graph

357 Commits

Author SHA1 Message Date
tao wang
c712265c28 NEW:support multiple extruder new control 
jira:[device page]

Change-Id: Idf68a3385172cbaa123cedb4e2b814c15cc09f07
(cherry picked from commit 7700b911a6fec782ce6b484b9b030963283a846c)
 2025-08-26 20:12:40 +08:00
yw4z
750d2a5095 Fix scaling on bed and extruder icons in BBL > Device tab (#10416) 
Update StatusPanel.cpp
 2025-08-25 01:30:44 +08:00
zhimin.zeng
2e74025178 FIX: fix crash bug when switching resolution 
jira: none
Change-Id: Ie1879a2a120502db2f2a9b3b8cac1f8a2b9737f9
(cherry picked from commit 28d0fc9bbe40386f799aa3dab3367aed56fe0d0a)
 2025-08-24 23:18:27 +08:00
tao wang
f3a15e7ea9 FIX:fix some new ui issues 
jira:[new ui]

Change-Id: I1283de641d4f2e4acfd5bef91716f9029665c465
(cherry picked from commit 65e8b4ee7e816cc313e8d7a33f06c6f1638dceef)
 2025-08-24 23:18:22 +08:00
hang.xu
6a2a0b078e FIX: Aix and temp control 
jira: none

Change-Id: I7a9db8178a77727c85ad2b727771179fc5e8050a
(cherry picked from commit e6b14bdefb949d3a61479e54b7b27450b344de18)
 2025-08-24 23:18:19 +08:00
Noisyfox
eb4b2df02a Fix build error 2025-08-24 23:18:13 +08:00
hang.xu
e5a2108dd5 FIX: Parse virtual slot info 
jira: STUDIO-7724, STUDIO-7725

Change-Id: Id9181511b7503787fe06403be6ecb782d78cb21e
(cherry picked from commit 286eca79c2c0824522f0917123c9315f8df65dee)
 2025-08-24 23:18:13 +08:00
hang.xu
8e0c5de9d5 FIX:Change text in stop printing dialog 
jira: STUDIO-7899

Change-Id: Ic93f7322aa35c06dd98df2b70c9f24f94a62467c
(cherry picked from commit b2418c74172364f875a08844fd7bb103a849a973)
 2025-08-24 23:18:11 +08:00
hang.xu
01d0105364 FIX: the order of cans in AMSLite 
jira: STUDIO-7765, STUDIO-7766, STUDIO-7767, STUDIO-7721, STUDIO-7713

Change-Id: If95e0667fc1d615c0494b007f7f7408f68e5b21c
(cherry picked from commit 9b510c0aeb4e9b8f26c285e1f6d5402852be1895)
 2025-08-24 23:18:10 +08:00
hang.xu
88e353db8a FIX: Ams control display 
jira: NONE

Change-Id: I221eb4167dad894c9e7f32141d33c5c96934df96
(cherry picked from commit 065c8d029eb9df4deb85ce22fe41896fa7c2a883)
 2025-08-24 23:18:09 +08:00
tao wang
068eb194d1 NEW:support new ext slot mapping 
jira:[support new mapping]

Change-Id: Iaf88f7bd57177df772a926ad162bd3b5a141327a
(cherry picked from commit 3b93bd2dd305026457e9f63ca3faeb153b59c9a5)
 2025-08-24 23:18:00 +08:00
Noisyfox
bf2c6e4fcf Merge branch 'main' into dev/bbl-network-upd 
# Conflicts:
#	src/slic3r/GUI/SelectMachine.cpp
 2025-06-21 10:27:10 +08:00
yw4z
f6f80fe1ee Remove usage of titlebar icons (#9932) 
* ibit

* update

* Update RecenterDialog.cpp

* Update AboutDialog.cpp
 2025-06-20 16:52:15 +08:00
Noisyfox
f1af2a1cc2 Merge branch 'main' into dev/bbl-network-upd 2025-06-16 14:02:04 +08:00
Alexandre Folle de Menezes
5f4b129ef4 Fix english strings punctuation mistakes (#8901) 
* Fix punctuation of enumerations

* Add missing '?' at the end of questions on hints

* Add periods after error messages

* Add punctuation to all tooltips

* Add missing periods on the pt-BR translation
 2025-06-15 16:12:03 +08:00
Noisyfox
76fcaa52b4 Merge branch 'main' into dev/bbl-network-upd 
# Conflicts:
#	src/slic3r/GUI/SelectMachine.cpp
 2025-06-15 15:28:10 +08:00
Dipl.-Ing. Raoul Rubien, BSc
de66749a11 fixes compiler warnings (#9619) 
* compiler warnings: adds SYSTEM to [target_]include_directories to skip warnings originating from dependencies

* compiler warnings: uninitialized/unused variables, missing parenthesis, pragma

* compiler warnings: redundant template type, missing curly braces, pass 0 instead of NULL as int argument

* compiler warnings: removes fclose(fp) where fp==nullptr since fclose() has attribute __nonnull((1))

* compiler warnings: uninitialized variables, missing parentheses, missing curly braces

* compiler warnings: ? as lower precedence than <<

* compiler warnings: unused variable

* compiler warnings: unused result

* compiler warnings: undefined/unused variable

* compiler warnings: uninitialized variable
 2025-06-14 21:05:25 +08:00
tao wang
601a73205b ENH:support u0 firmware homing 
jira:[none]

Change-Id: I9533944c343007897d25929739e5eb175bad6689
(cherry picked from commit 533911e2cd46fadc92bd7d908e81ad51ce14944c)
 2025-06-01 23:39:42 +08:00
tao wang
947e7a56d3 NEW:use new homing command 
jira:[none]

Change-Id: I9d60d0b5c2d0e2cf7ac5c5e4b0dbcf2daf6edbb1
(cherry picked from commit 9dce95d401e8333077db63dbad57bda837d0ce19)
 2025-06-01 23:38:27 +08:00
Noisyfox
c72c1f0604 Merge branch 'main' into dev/bbl-network-upd 2025-06-01 19:33:39 +08:00
Alexandre Folle de Menezes
30087a1680 Fix the spelling/grammar on the original english strings (#9487) 
* Fix the spelling/grammar on english strings

* Fix the spelling/grammar on english strings, part 2
 2025-06-01 19:32:36 +08:00
tao wang
4bfe77bfff ENH:Support more SD card states 
jira:[for sdcard]

Change-Id: Ic09198a0ed357f827768ed2f8d8a9ed6266f749f
(cherry picked from commit c877405caba2b75c515c814b7aaa0793200eee04)
 2025-05-26 14:41:43 +08:00
zhimin.zeng
e1e93b5090 FIX: Calibration adaptation encryption 
jira: none
Change-Id: Ie42da224ca02261b0c32262be895c215878b7921
(cherry picked from commit 7498d6e5f89751d4f576ba073485238baba53d0f)
 2025-05-25 20:29:53 +08:00
Noisyfox
d46afc11a6 Fix crash when using old firmware 2025-05-24 18:37:35 +08:00
Noisyfox
6b8cce6fc9 FIX:update load/unload command for n3s 
(cherry picked from commit bambulab/BambuStudio@fc32042639)

---------

Co-authored-by: tao wang <tao.wang@bambulab.com>
 2025-05-22 21:54:15 +08:00
Noisyfox
b775b850e5 Display correct AMS type 2025-05-19 23:10:16 +08:00
Noisyfox
4624e1293b Preparing for AMS drying support 2025-05-19 11:04:14 +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
Noisyfox
e86a500ddc Merge branch 'main' into dev/bbl-network-upd 
# Conflicts:
#	src/slic3r/GUI/Widgets/AMSControl.cpp
 2025-05-11 21:17:43 +08:00
Alexandre Folle de Menezes
3f79e0522e Use "°C" instead of "degree" to avoid ambiguity (#9597) 2025-05-11 15:06:30 +08:00
Alexandre Folle de Menezes
5a0f720706 Remove markers from strings that don't need to be translated (#8842) 
Remove markers from text that does not need to be translated
 2025-05-11 15:04:48 +08:00
Noisyfox
8ff2046799 Update to latest BBS code. Fix ams filament preset check 2025-05-07 20:42:23 +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
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
tao.wang
3a7cc8384e FIX:fixed some amscontrol issue 
jira:[for fix amscontrol issue]

Change-Id: Id62ffd047403bf80f6aba732b8ce31d782bcea57
(cherry picked from commit 55898ab88ee844dd7da17d992ad8f79e439f96a0)
 2025-05-07 14:27:02 +08:00
Noisyfox
68ba9f80c4 refactoring the modules of amscontrol 
adapted from bambulab/BambuStudio@b78fa4c11c

Co-authored-by: tao wang <tao.wang@bambulab.com>
 2025-05-07 11:30:29 +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
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
tao wang
06e8c3c05f FIX:display msg when cannot edit filament 
jira:[edit filament]

Change-Id: I7e2b4fabeb3930f34fc252f1334e168e4f623b77
(cherry picked from commit 95655e067a7187afd29e53759aae8e3023a5a7f7)
 2025-01-23 11:38:16 +08:00
Kunlong Ma
84deeefba6 ENH: Optimize the presentation of error code dialog 
JIRA: STUDIO-7469 STUDIO-7477 STUDIO-7613

Change-Id: I6689dc375a51a1d690b82f9dbaa79d1555f7816f
(cherry picked from commit 777c16fef0862587f3ec468652aabd70cff88dfe)
 2025-01-23 10:00:48 +08:00
Henri van der Riet
11d540d42d merge conflicts 2024-09-08 01:04:19 +02:00
SoftFever
cce40fd154 Revert "Fix typos and grammar (#6638)" 
This reverts commit 1afc1372bc.
 2024-09-07 20:04:17 +08:00
henrivdr
0da135f4b8 Fix typos and grammar (#6638) 
* fix lots of typos, grammar etc.

* merge conflict

* merge conflict

* merge conflict

* merge conflict

* revert gettext comments

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
 2024-09-07 18:00:01 +08:00
Noisyfox
8a746a7764 Fix Linux build & some warnings (#6438) 
* Fix linux deps debug build

* Use the same DL_CACHE for release build when building debug version of deps on Linux.
This prevents downloading the same source packages twice, and avoid downloading again after deleting the build dir.

* Fix debug build

* Fix warnings "loop variable creates a copy from type" and "loop variable binds to a temporary constructed from type"
 2024-08-18 11:33:00 +08:00
SoftFever
ab3d04312b Revert "Fix Compile Warnings (#5963)" 
This reverts commit b83e16dbdd.

Found regressions like auto orientation didn't work anymore after this change, revert it
 2024-08-12 00:00:20 +08:00
Ocraftyone
dab6fa4db2 Fix Compile Warnings (#5963) 
* Fix calls to depreciated wxPen constructor

* Fix use of wxTimerEvent

* Fix unrecognized character escape sequence

* Fix signed/unsigned mismatch

At least as much as possible without significantly altering parts of the application

* Clean unreferenced variables

* fix mistyped namespace selector

* Update deprecated calls

* Fix preprocessor statement

* Remove empty switch statements

* Change int vector used as bool to bool vector

* Remove empty control statements and related unused code

* Change multi character constant to string constant

* Fix discarded return value

json::parse was being called on the object, rather than statically like it should be. Also, the value was not being captured.

* Rename ICON_SIZE def used by MultiMachine

By having the definition in the header, it causes issues when other files define ICON_SIZE. By renaming it to MM_ICON_SIZE, this lessens the issue. It would probably be ideal to have the definitions in the respective .cpp that use them, but it would make it less convenient to update the values if needed in the future.

* Remove unused includes

* Fix linux/macOS compilation

* Hide unused-function errors on non-Windows systems

* Disable signed/unsigned comparison mismatch error

* Remove/Disable more unused variables

Still TODO: check double for loop in Print.cpp

* Remove unused variable that was missed

* Remove unused variables in libraries in the src folder

* Apply temporary fix for subobject linkage error

* Remove/Disable last set of unused variables reported by GCC

* remove redundant for loop

* fix misspelled ifdef check

* Update message on dialog

* Fix hard-coded platform specific modifier keys

* Remove duplicate for loop

* Disable -Wmisleading-indentation warning

* disable -Wswitch warning

* Remove unused local typedefs

* Fix -Wunused-value

* Fix pragma error on Windows from subobject linkage fix

* Fix -Waddress

* Fix null conversions (-Wconversion-null)

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
 2024-07-29 21:00:26 +08:00