3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,286 Commits 3 Branches 78 Tags 40 MiB
d89c03a0f1
Commit Graph

2286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marek Bel
9cae0c378a Rename _EEPROM_writeData to EEPROM_writeData. Rename _EEPROM_readData to EEPROM_readData. Add return value to EEPROM_writeData to detect failure to write. Do not mark data as valid, if write has failed. Remove EEPROM_WRITE_VAR and EEPROM_READ_VAR macros. Make pos input only parameter. Convert EEPROM_OFFSET macro to typed constatant EEPROM_M500_base, it was defined in two places, leave it in one place. Use Config_StoreSettings() instead of erase_eeprom_section(). Compare float with 0xff byte by byte to avoid compiler warning "Dereferencing type punned pointer will break strict aliasing rules." 2018-10-08 20:24:56 +02:00
PavelSindler
c91c878408
Merge pull request #1202 from MRprusa3d/PFW-573 
preHeatError
 2018-10-08 16:12:33 +02:00
Marek Bel
1585dc66b0 Merge remote-tracking branch 'prusa3d/MK3_dev' into simplify_EEPROM_M500 
Known limitation: Unable to compile.
 2018-10-08 15:58:49 +02:00
PavelSindler
d79025de58
Merge pull request #1230 from mkbel/improve_erase_EEPROM 
PFW-608 Decrease wear of mass erase EEPROM and do it faster.
 2018-10-08 10:14:22 +02:00
Marek Bel
c77672bf0f PFW-608 Decrease wear of mass erase EEPROM and do it faster. 2018-10-05 18:11:26 +02:00
mkbel
7bd90c0d01
Update README.md 2018-10-05 17:50:01 +02:00
mkbel
8f0ed9752b
Update README.md 2018-10-05 17:47:02 +02:00
PavelSindler
27a4081362
Merge pull request #1224 from PavelSindler/MK3_for_merging 
changed version
 2018-10-04 17:41:19 +02:00
PavelSindler
436f5b5728 changed version 2018-10-04 17:40:38 +02:00
PavelSindler
d2aa13d333
Merge pull request #1199 from mkbel/document_gcodes1 
Documentation: Put scattered and unscattered Gcode documentation toge…
 2018-10-04 16:29:39 +02:00
Robert Pelnar
9960c80bf7 Additional check always with enabled oq_meassure 
+ variant files
 2018-10-04 16:12:41 +02:00
Robert Pelnar
f9d8c46802 Enable/disable optical quality meassurement in settings menu 2018-10-04 15:48:28 +02:00
Robert Pelnar
ced74b7ec2 Merge remote-tracking branch 'upstream/MK3' into MK3 2018-10-04 13:53:00 +02:00
Robert Pelnar
7882b3c975 Update fsensor in Manage_inactivity instead of main loop. 2018-10-03 17:29:24 +02:00
PavelSindler
3a58489c6a
Merge pull request #1169 from mkbel/remove_duplicate_debouncing_4 
Remove duplicate debouncing 4
 2018-10-02 11:21:17 +02:00
PavelSindler
362797d40b
Merge pull request #1206 from PavelSindler/MK3_for_merging 
version change
 2018-09-27 21:13:57 +02:00
PavelSindler
bba1ffdb65 version change 2018-09-27 21:13:06 +02:00
PavelSindler
aefb4e5c09
Merge pull request #1200 from XPila/MK3 
Filament sensor - fix invalid calculation of fsensor_counter in LA st…
 2018-09-27 21:05:33 +02:00
Robert Pelnar
e50025cc7d static_assert - portable solution compatible with C++98 2018-09-27 19:59:29 +02:00