iGoX/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-09-14 06:38:08 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,149 Commits 4 Branches 1 Tag
0454adc19415499635b5d268c5d928f5bbe3b71e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bubnikv 0454adc194 Added support for the upstream Marlin interpretation of the M204 code. 
Fix of https://github.com/prusa3d/Slic3r/issues/1089

M204 S.. T..:
T is interpreted by the firmware and Slic3r time estimator the old way
(as acceleration when retracting) only if an S code is found at the same line.
This allows PrusaResearch to interpret the legacy G-codes generated
by our older Slic3r with older Slic3r profiles.

M204 P.. R.. T..:
T is ignored, P is interpreted as acceleration when extruding,
R is interpreted as acceleration when retracting.
This will be the format the Slic3r 1.41.0 will produce from
the Machine Limits page.
In the future both MK3 firmware and Slic3r will likely be extended
to support the separate travel acceleration.

This change is in sync with the Prusa3D firmware:
https://github.com/prusa3d/Prusa-Firmware/commit/dd4c4b39b4359d61a3329c54bea58df119a731c6

Slic3r will now export
M204 P[machine_max_acceleration_extruding] R[machine_max_acceleration_retracting] T[machine_max_acceleration_extruding]
before the custom start G-code, which will be correctly interpreted
by both the new Prusa3D firmware and the Slic3r's time estimator.

To support our legacy MK2 firmware before we merge the commit above, we may
just insert the following line into the custom start G-code section to override
the block inserted by Slic3r automatically before the custom start G-code:
M204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting]
 2018-08-03 16:26:28 +02:00
bubnikv cd919d986a Fixed the *MK3* references in Prusa3D profiles 2018-08-02 13:09:53 +02:00
bubnikv 8fc11c2f14 Configuration improvements: 
Bumped up firmware versions for MK2.5/MK3 to 3.3.1, disabled priming areas for MK3MMU2
 2018-08-02 09:11:11 +02:00
bubnikv 212ebc5615 Updated the start G-codes for the MK3 MMU2 profiles: 
Implemented wiping line for MMU when the priming blocks are disabled,
added initialization of the MMU2 unit with the filament types.
 2018-08-01 19:07:49 +02:00
bubnikv a76cb3bd67 Merge remote-tracking branch 'remotes/origin/wipe_tower_no_priming' 2018-08-01 13:16:49 +02:00
bubnikv 3e2aedaaf0 Merge commit '4e901a9db778660d3471a49cd95d66f85b2dbc88' 2018-08-01 13:16:30 +02:00
bubnikv b6c5fa7f68 Added the alpha4 config to the index. 2018-07-27 23:28:59 +02:00
bubnikv 4778312fa5 Merge branch 'master' into wipe_tower_no_priming 2018-07-27 23:26:10 +02:00
bubnikv 4a88075334 Updated change log for the Prusa3D config index, 
bumped up the version to 1.41.0-alpha3
 2018-07-27 22:31:24 +02:00
bubnikv db8ba5fb76 New parameter "single_extruder_multi_material_priming" to be able 
to suppress the MM priming towers.
The PrusaResearch.ini was modified for the MMU2 printers to
correctly prime the initial extruder when
single_extruder_multi_material_priming is disabled.
 2018-07-27 22:19:46 +02:00
bubnikv 78a8acfcf1 New PrusaResearch configuration, renamed and improved the MK3 MMU2 wizard 
picture.
 2018-07-27 15:57:00 +02:00
bubnikv 987fc4c6df Merge remote-tracking branch 'origin/backspace_to_delete_on_osx' 2018-07-27 09:55:13 +02:00
bubnikv 5c1de9fdd5 Merge remote-tracking branch 'origin/scene_manipulators' 2018-07-27 09:54:39 +02:00
bubnikv c2291e54f4 Fixes crash when loading a config with zero number of default_filament_profile 
values. Fixes SPE-427
 2018-07-27 09:53:12 +02:00
bubnikv 077680b806 Fix of https://github.com/prusa3d/Slic3r/issues/1068 
Fixed reloading of an object, which contains non-ASCII7 characters
in its file name or path.
 2018-07-24 09:23:19 +02:00
bubnikv a0096cf563 Renamed the key MK3SMMU to MK3MMU2, 
added a generic PLA MMU2 material.
 2018-07-23 09:42:02 +02:00
bubnikv 68cd51435f Bumped up the version number. 2018-07-21 17:39:26 +02:00
bubnikv 109b6fb79c Added the MK3 MMU2 printer into the profiles, added an image 
of the MK3 MMU2 to the wizard.
 2018-07-21 15:46:54 +02:00
bubnikv 88bf7c852c Fixed upgrade of vendor profile from the application resources 
after an upgrade of the application.
 2018-07-21 09:32:45 +02:00
bubnikv e19a74865b Bumped up the version number. 2018-07-20 17:57:21 +02:00
bubnikv b57418f81d Reordered the fields on the new "Machine limits" page. 2018-07-18 15:08:55 +02:00
bubnikv a46bdb1d81 Reworked the "Sliced info" box on the platter to only show the 
"silent mode" print time if it is available.
 2018-07-18 14:52:19 +02:00
bubnikv f7390c7ad6 The acceleration G-codes (M204 Sxxx) emited for Marlin are now 
clamped by the maximum acceleration when extruding.

The machine envelope values are only set at the time estimator
from the Printer parameters for the Marlin firmware.
 2018-07-18 14:00:42 +02:00
bubnikv 17df029c9d Fixed a previous commit. 2018-07-18 12:04:56 +02:00
bubnikv b6fe90cbdc Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-07-18 11:58:19 +02:00
bubnikv 9d027a558e Implemented clamping of the acceleration when extruding for the Marlin 
firmware, both for the G-code export and the time estimator.
 2018-07-18 11:58:02 +02:00
bubnikv 3bebe9f954 Restored the "Fix STL through Netfabb" functionality, which has been 
lost during some merge process.
 2018-07-17 21:31:54 +02:00
bubnikv c596c05765 With the Marlin flavor, a "machine envelope limits" G-code section 
is emitted, which breaks some of the automatic tests.

Changed the default firmware flavor to RepRap,
so that the automatic tests will run.
 2018-07-17 20:37:15 +02:00
bubnikv 36c1483ec5 Merge remote-tracking branch 'remotes/origin/feature_arrange_with_libnest2d' 2018-07-17 19:42:02 +02:00
bubnikv 0660862058 For the Marlin firmware, the machine envelope G-code is emitted 
based on the Slic3r printer profile.

Also the bundled config has been updated, so that the machine envelope
G-code values were removed and the new Slic3r printer profile values
were updated with the former G-code values.

Slic3r version has been bumped up to 1.41.0-alpha for the configuration
files to work.
 2018-07-17 19:37:24 +02:00
bubnikv c34a713c8c Simplification of 
1.40.1-rc2 fails to save the modified AMF settings #1035
 2018-07-17 10:41:17 +02:00
bubnikv 161a2bc6f8 Merge remote-tracking branch 'remotes/origin/ys_preset_externals_bf' 2018-07-17 09:47:49 +02:00
bubnikv 3339623db6 Merge remote-tracking branch 'remotes/origin/ys_tooltips_osx' 2018-07-17 09:40:19 +02:00
bubnikv 83f9813f56 Merge remote-tracking branch 'remotes/origin/opengl_to_cpp' 2018-07-17 09:37:38 +02:00
bubnikv c7f59aca7d Merge remote-tracking branch 'remotes/origin/wipe_tower_improvements' 2018-07-17 09:20:19 +02:00
bubnikv 210eeff160 Merge remote-tracking branch 'remotes/origin/amf_activate_existing_presets' 2018-07-16 19:52:17 +02:00
bubnikv fa86d776cb Bumped up the version number to final. 2018-07-05 15:27:48 +02:00
bubnikv bdc9b9dadd Bumped up the version number. 2018-07-03 16:46:52 +02:00
bubnikv e61b25de7c Merge branch 'master' into amf_activate_existing_presets 2018-07-03 13:04:11 +02:00
bubnikv c7f3014d26 Fix of 
"Slic3r 1.40.1-rc fails to retain the filament list on"
https://github.com/prusa3d/Slic3r/issues/1020
 2018-07-02 20:25:37 +02:00
bubnikv d4b0d1b773 bumped up the version number 2018-06-29 10:59:58 +02:00
bubnikv 6b3c24359b Merge branch 'master' into amf_activate_existing_presets 2018-06-28 22:00:10 +02:00
bubnikv 082f88ad5f gcc / clang did not like backslashes inside comments 2018-06-28 21:46:23 +02:00
bubnikv 26b003073b Renamed the "compatible_printers_condition" and "inherits" vectors 
to "compatible_printers_condition_cummulative" and "inherits_cummulative"
when storing to AMF/3MF/Config files.

Improved escaping of strings stored / loaded from config files.
 2018-06-28 20:13:01 +02:00
bubnikv c4a3e4eca7 Merge branch 'for_merging' 2018-06-28 17:43:15 +02:00
bubnikv aae6cfc696 Merge remote-tracking branch 'remotes/origin/lm_ultimate_wipe_tower_rotation_fix' 2018-06-28 13:59:19 +02:00
bubnikv acd712cdbc Merge remote-tracking branch 'remotes/origin/vk-octoprint' 2018-06-28 13:53:27 +02:00
bubnikv 67de1a462f Merge remote-tracking branch 'remotes/origin/vk-bugfixes' 2018-06-28 13:53:22 +02:00
bubnikv 80b430ad94 Simplified handling of the "compatible_printers_condition" and 
"inherits" configuration values.
Implemented correct setting of the "inherits" flag for the profiles
loaded from AMF/3MF/Config files.
 2018-06-27 16:57:42 +02:00
bubnikv 68e82a7348 Merge branch 'master' into amf_activate_existing_presets 2018-06-27 10:33:14 +02:00
bubnikv 645cc65d2b When running on Windows, Perl $^X returns slic3r.exe or slic3r-console.exe 
Do some magic to get the perl interpreter path.
 2018-06-26 15:29:23 +02:00
bubnikv 22463343a7 Fixed integration tests. 2018-06-26 13:22:24 +02:00
bubnikv 59510c42d1 When loading an archive (AMF/3MF/Config), the original name 
of the profile is show in braces next to the file name.
 2018-06-26 11:31:01 +02:00
bubnikv 1175dc95f6 Storing and recovering the "compatible_printers_condition" 
and "inherits" fields from / to the AMF/3MF/Config files.
The "compatible_printers_condition" are collected over all active profiles
(one print, possibly multiple filament, and one printer profile)
into a single vector.
 2018-06-26 10:50:50 +02:00
bubnikv b5f97baa28 Merge remote-tracking branch 'remotes/origin/machine-limits-config' into add_kinematics 2018-06-22 17:44:12 +02:00
bubnikv 082ed95a94 Activate existing projects after loading AMF/3MF/Config: Initial implementation. 2018-06-22 14:17:03 +02:00
bubnikv 8abe1b3633 Yet another fix for the OSX. 2018-06-20 19:26:19 +02:00
bubnikv 3a2b501012 Fixed compilation on OSX 2018-06-20 19:07:55 +02:00
bubnikv ac011aec6d Removed dependencies of libslic3r on Slic3r GUI library. 2018-06-20 18:55:31 +02:00
bubnikv 02d4f3e14d Provide a callback to libslic3r to translate texts. 
Moved the "translate" functions to namespaces to avoid clashes
between the code in libslic3r and Slic3r GUI projects.
 2018-06-20 18:33:46 +02:00
bubnikv 6b2b970b9a Added machine evelope configuration parameters 
(the MachineEnvelopeConfig class).
Added localization support for libslic3r through a callback
(the callback is not registered yet, so the localization does nothing).
Localized the Print::validate() error messages.
 2018-06-20 13:57:37 +02:00
bubnikv 7863412687 Firwmare updater for the Einsy external flash memory, 
to be used as a storage for localization strings.

Hacked into the avrdude Arduino STK500 (not STK500v2) protocol.
 2018-06-19 18:46:37 +02:00
bubnikv 27faaa27f6 Merge remote-tracking branch 'remotes/origin/3mf_io' 2018-06-19 16:14:57 +02:00
bubnikv 7499a4dea4 Disabled the UI gizmos, they are not yet ready for the prime time 2018-06-19 16:14:10 +02:00
bubnikv 6fef5a07ab Merge remote-tracking branch 'remotes/origin/scene_manipulators' 
Disabled the gizmos.
 2018-06-19 16:12:36 +02:00
bubnikv 5a56f08aad Merge remote-tracking branch 'remotes/origin/opengl_to_cpp' 2018-06-19 16:08:53 +02:00
bubnikv 734273a33a Merge remote-tracking branch 'remotes/origin/fix_model_by_win10' 2018-06-19 10:02:49 +02:00
bubnikv 2cd0c64b96 Merge branch 'dev' 2018-06-12 17:11:45 +02:00
bubnikv 0ec06e6981 Fixed missing dependencies in Prusa's profiles for 0.25 and 0.6mm nozzles. 2018-06-12 17:10:12 +02:00
bubnikv 303ed0e6c9 Bumped up the version number to a final. 2018-06-12 11:53:09 +02:00
bubnikv 6cf508e124 Updated slic3r_min_version in prusa3d config version index. 2018-06-12 11:46:15 +02:00
bubnikv 69705b5e66 Split the MK2.5 profile from the MK2S 2018-06-11 18:20:29 +02:00
bubnikv 7b6a0ba9ad Merge remote-tracking branch 'origin/ys_master_bug_fixes' 2018-06-11 16:58:46 +02:00
bubnikv 49cd06407a There is a bug related to Ubuntu overlay scrollbars, see https://github.com/prusa3d/Slic3r/issues/898 and https://github.com/prusa3d/Slic3r/issues/952. 
The issue apparently manifests when Show()ing a window with overlay scrollbars while the UI is frozen. For this reason,
we will Thaw the UI prematurely on Linux. This means destroing the no_updates object prematurely.
 2018-06-11 16:56:35 +02:00
bubnikv 6cafc7f121 Fix of a regression issue, which was certainly in 1.34.0, probably 
even longer. An infill / perimeter overlap was not applied
when defined with absolute coordinates.
Fixes https://github.com/prusa3d/Slic3r/issues/964
 2018-06-11 10:59:02 +02:00
bubnikv 95047c1953 Fixed typos from the previous commit. 2018-06-07 22:54:26 +02:00
bubnikv 2b5a1f3e60 Merge remote-tracking branch 'remotes/origin/vk-bugfixes' 2018-06-07 22:10:49 +02:00
bubnikv 7dfe2e2595 Fixed mangling of UTF characters when converted implicitely to 
wxString on Windows through the + operator.
 2018-06-07 22:10:23 +02:00
bubnikv ce6a23ef3b Repair by the netfabb service: Implemented progress dialog and cancelation. 2018-06-06 15:19:06 +02:00
bubnikv 92875709e1 Fixed a bug reporting incorrect compatible_printers and 
compatible_printers_condition inside the Config Bundle.
 2018-06-06 12:01:11 +02:00
bubnikv adcf869eee Fixed printer_variant fields for the i3 MK3 0.25 and 0.6mm nozzles. 2018-06-05 10:11:28 +02:00
bubnikv d05d3cb652 Initial working implementation of the "Fix by Netfabb" function. 2018-06-04 21:22:42 +02:00
bubnikv e65fac5e84 Added initial implementation of fixing 3MFs through the Netfabb 
API provided through the Windows 10 Universal Windows Platform API.
 2018-06-04 17:27:33 +02:00
bubnikv 1343a22dc6 Added Prusa profiles from https://raw.githubusercontent.com/prusa3d/Slic3r-settings/master/live/PrusaResearch 2018-06-04 15:58:44 +02:00
bubnikv 03518d2ff2 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-06-04 15:47:51 +02:00
bubnikv 03fea392d5 Merge remote-tracking branch 'remotes/origin/wipe_tower_gcode_preview' 2018-06-04 15:45:10 +02:00
bubnikv a9499ae45c Fix of a crash intruduced with e8247c5646 2018-05-23 13:19:25 +02:00
bubnikv 076b293fec Bumped up version numbers of the PrusaResearch.ini and the Slic3r itself. 2018-05-22 15:18:38 +02:00
bubnikv 306d77559e Merge remote-tracking branch 'remotes/origin/scene_manipulators' 2018-05-22 14:32:07 +02:00
bubnikv e8247c5646 When loading a config bundle, make sure a config value is not accepted 
if it is placed in a wrong group (for example, max_print_height
does not belong to print settings, but a printer settings, so Slic3r
will now complain about it being in print settings, and it will
remove the value from the print settings).
 2018-05-22 14:17:27 +02:00
bubnikv 36b337b7e7 Moved max_print_height from [print:*common*] to [printer:*common*], 
there is a bug still in Slic3r, it should refuse to load config keys
from a wrong location.
 2018-05-22 11:45:15 +02:00
bubnikv 81fb408671 Merge branch 'master' of https://github.com/prusa3d/slic3r 2018-05-22 11:26:05 +02:00
bubnikv eef1d500ec Merge remote-tracking branch 'remotes/origin/brim_width_calculation' 2018-05-22 11:08:37 +02:00
bubnikv b694f1ac89 One day I will fix it! 2018-05-21 23:40:17 +02:00
bubnikv 512b6dfd88 Yet another fix of the previous commit. 2018-05-21 23:24:18 +02:00
bubnikv 6b4fe7975f Fix of the previous commit: When asking the operating system to open 
the datadir using the platform specific file explorer, enquote
and escape the path.
 2018-05-21 22:10:38 +02:00
bubnikv 7b4aeef40c Moved the "Flash firmware" menu to "Configuration", 
removed the "Check for updates" from the "Configuration" menu,
added an "Open file explorer at the datadir" item to the Help menu.
 2018-05-21 21:04:03 +02:00
bubnikv 3307dbc0fb Another fix for linux & osx 2018-05-21 18:58:22 +02:00
bubnikv 1e8a0b69b2 Yet another fix for OSX 2018-05-21 18:58:22 +02:00
bubnikv 0a328789ef Fixed compilation on Linux. 2018-05-21 18:58:22 +02:00