josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,106 Commits 31 Branches 140 Tags 71 MiB
Commit Graph

2106 Commits

Author SHA1 Message Date
MacBookPro 537db0ee12 stability improovements, speed reduced for load. 2018-11-03 23:50:40 +10:00
MacBookPro 1f1b72f3bb fixed first load failing due to def being extruder 0 instead of -10. e.g. something other than one of the extruder values 2018-11-03 13:25:19 +10:00
MacBookPro bdfe509bc3 push some unload fixes 2018-11-03 08:51:57 +10:00
MacBookPro b5d6642e10 Rolled back to working without unload sense and hedged recover from filament at boot for now 2018-11-02 22:39:01 +10:00
MacBookPro 6c56deae4f move files, I'm so tired LOL 2018-11-02 19:25:43 +10:00
TheZeroBeast 5beb4c683d
Pending Testing - Recover from filament loaded at boot 2018-11-02 13:53:42 +10:00
TheZeroBeast cff6e6e4c5
Implemented MK3-FSensor on MMU Unload 
and started booting with filament loaded recovery
 2018-11-02 10:42:57 +10:00
TheZeroBeast 4a52683ad1
Updated fsensor_check_autoload( 2018-10-29 13:07:07 +10:00
TheZeroBeast 4f98fa1a64
Updated manage_inactivity 2018-10-29 13:05:18 +10:00
TheZeroBeast c5236c84df
Updated mmu_loop() Case 3: 2018-10-29 12:30:50 +10:00
TheZeroBeast 8fd41841c8
Updated Case 3: 2018-10-29 09:19:11 +10:00
TheZeroBeast 94a52e8d58
Initiale upload 2018-10-29 09:03:53 +10:00
TheZeroBeast 65b5ca51b3
Merge pull request #12 from prusa3d/MK3 
Merge Upstream
 2018-10-29 06:10:35 +10:00
PavelSindler 6a82af487e
Merge pull request #1278 from XPila/MK3-new_bs 
New lang - fixed french langcode and comparsion in lang-clean script
 2018-10-26 13:18:48 +02:00
mkbel 16c2f6fe8e
Merge pull request #1279 from PavelSindler/turn_on_FINDA 
mmu2: filament senor (FINDA) menu fix
 2018-10-25 21:53:11 +02:00
PavelSindler a9317b4d36 upstream/MK3 merge 2018-10-25 21:46:32 +02:00
mkbel cdb06c65f3
Merge pull request #1275 from PavelSindler/3_4_2_branch_merging 
3_4_2 branch merging into MK3
 2018-10-25 21:45:51 +02:00
mkbel f7cd0ffbb0
Merge pull request #1280 from PavelSindler/MK3_dev_merging_update 
Mk3 dev merge into MK3
 2018-10-25 21:40:49 +02:00
PavelSindler 0e0dbad871 #ifdef __cplusplus added to allow including to .c file 2018-10-25 21:06:37 +02:00
PavelSindler 01529f18d2 upstream/MK3 merge 2018-10-25 20:57:27 +02:00
PavelSindler a6a81c6ea6 mmu2: filament senor (FINDA) can be switched ON/OFF from menu without dependency on pat9125 state 2018-10-25 18:26:26 +02:00
Robert Pelnar d301aa0e8c New lang - fixed french langcode and comparsion in lang-clean script 2018-10-25 18:16:36 +02:00
PavelSindler 2566ae0b08
Merge pull request #1264 from XPila/MK3-new_bs 
New lang,  arduino 1.8.5
 2018-10-23 19:22:46 +02:00
Robert Pelnar 7e9eaf0f4b New lang, arduino 1.8.5 - disable multilanguage support by default 2018-10-23 17:32:52 +02:00
PavelSindler bd8ca8d652 removed redefinition of functions in fsensor.cpp 2018-10-22 20:51:44 +02:00
PavelSindler d1de9fff60 mmu_loop: missing return added 2018-10-22 20:38:32 +02:00
PavelSindler d005005e22 Merge remote-tracking branch 'upstream/3_4_2' into 3_4_2_branch_merging 2018-10-22 20:33:38 +02:00
PavelSindler 940f436a5f merge MK3_dev into MK3 2018-10-22 20:25:29 +02:00
XPila be9f921153
Merge pull request #1268 from PavelSindler/3_4_2 
MK2.5 MMU sw reset at setup function
 2018-10-19 18:03:03 +02:00
PavelSindler bc247ca02c MK2.5 sw reset at setup function 2018-10-19 17:54:48 +02:00
Robert Pelnar ac18eb67c0 New lang, arduino 1.8.5 - boot_app debug output 
+ variable _uartout linkage fix
+ DEBUG_DCODE5
 2018-10-18 16:20:14 +02:00
Robert Pelnar 563052d015 New lang, arduino 1.8.5 - language.c - DEBUG_SEC_LANG fix 2018-10-18 15:39:08 +02:00
Robert Pelnar 868c79e835 New lang, arduino 1.8.5 - language.h - section names, messages.h - extern "C" added 2018-10-18 14:41:32 +02:00
XPila 483b0ee144
Merge pull request #1262 from PavelSindler/3_4_2 
MK2.5 printers MMU support
 2018-10-18 13:46:55 +02:00
Robert Pelnar 48c775f8bf New lang, arduino 1.8.5 - config.sh updated 2018-10-18 13:31:00 +02:00
Robert Pelnar 1368ec4915 New lang, arduino 1.8.5 - fw-build.sh fix 2018-10-18 13:10:11 +02:00
Robert Pelnar dd763575a2 New lang, arduino 1.8.5 - lang-build.sh - fr 2018-10-18 13:08:41 +02:00
Robert Pelnar ed84dfe2d6 New lang, arduino 1.8.5 - fw-clean.sh and lang-clean.sh fix 2018-10-18 13:08:12 +02:00
Robert Pelnar 3834a06dc9 New lang, arduino 1.8.5 - progmem.sh reworked 2018-10-18 13:05:44 +02:00
Robert Pelnar 41256ce017 New lang, arduino 1.8.5 - postbuild.sh renamed to fw-build.sh 2018-10-18 13:04:01 +02:00
Robert Pelnar 8129332619 New lang, arduino 1.8.5 - removed make_lang.sh 2018-10-18 13:02:35 +02:00
Robert Pelnar 3c232a763b New lang, arduino 1.8.5 - removed po files (will be solved other way) 2018-10-18 12:57:25 +02:00
PavelSindler b8f92fdfa9 MK2.5 printers set mmu to stealth mode (using Mx code), required mmu2 buildnr can be different for MK2.5 and MK3 printers 2018-10-18 02:44:16 +02:00
mkbel 0d9b502937
Merge pull request #1246 from PavelSindler/variants_max 
MK3: default max feedrate for x and y changed to 100mm/s
 2018-10-10 16:46:34 +02:00
PavelSindler bbd4f70f41
Merge pull request #1221 from XPila/MK3 
Update fsensor in Manage_inactivity instead of main loop.
 2018-10-10 13:12:12 +02:00
PavelSindler 866d6758c3
Merge pull request #1243 from mkbel/simplify_EEPROM_M500 
Simplify eeprom m500
 2018-10-10 13:11:17 +02:00
mkbel 0d7fae8a28
Merge pull request #1247 from mkbel/doc 
Format fsensor documentation.
 2018-10-09 22:35:18 +02:00
Marek Bel 9dff6431e6 Format fsensor documentation. 2018-10-09 22:33:54 +02:00
PavelSindler 809ae5a5f0 default max feedrate for x and y changed to 100mm/s 2018-10-09 20:03:28 +02:00
Marek Bel 08fcfa775d Merge branch 'MK3_dev' into simplify_EEPROM_M500 2018-10-08 20:41:30 +02:00