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

658 Commits

Author SHA1 Message Date
Rob McKenzie 3d7841f3aa Comms ACK working for new FS command 
Added FS command to MMU when filament is sensed at MK3 FSensor
 2018-11-07 03:29:39 +10:00
TheZeroBeast 4e21d7482c
added mmu_loop case 20: 2018-11-07 01:01:16 +10:00
Rob McKenzie dbac1c7159 formatting 2018-11-05 11:32:41 +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 4f98fa1a64
Updated manage_inactivity 2018-10-29 13:05:18 +10:00
TheZeroBeast 94a52e8d58
Initiale upload 2018-10-29 09:03:53 +10: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
PavelSindler 01529f18d2 upstream/MK3 merge 2018-10-25 20:57:27 +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
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
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
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
Robert Pelnar 7882b3c975 Update fsensor in Manage_inactivity instead of main loop. 2018-10-03 17:29:24 +02:00
Marek Bel d80fcab66c Disable filament sensor response quality check. 2018-09-25 15:50:50 +02:00
Marek Bel 19c1ba6274 Remove duplicate condition. This condition was already in if(mmu_enabled) {} else branch. 2018-09-25 14:25:03 +02:00
Marek Bel c38fef281d Use cs.max_feedrate_silent, cs.max_acceleration_units_per_sq_second_silent from ConfigurationStore. 2018-09-24 17:33:58 +02:00
Marek Bel ca179a2d18 Use cs.filament_size from ConfigurationStore. 2018-09-24 17:29:02 +02:00
Marek Bel e225e9cab0 Use cs.volumetric_enabled from ConfigurationStore. 2018-09-24 17:12:16 +02:00
Marek Bel a201128b20 Use cs.retract_length, cs.retract_feedrate, cs.retract_zlift, cs.retract_recover_length and cs.retract_recover_feedrate from ConfigurationStore. 2018-09-24 17:10:25 +02:00
Marek Bel 7e593e6922 Use cs.autoretract_enabled from ConfigurationStore. 2018-09-24 17:03:10 +02:00
Marek Bel 20ba2b1c79 Use cs.bedKp, cs.bedKi and cs.bedKd from ConfigurationStore. 2018-09-24 16:57:48 +02:00
Marek Bel 54bcc8aa52 Use cs.Kp, cs.Ki and cs.Kd from ConfigurationStore. 2018-09-24 16:54:50 +02:00
Marek Bel f2ae3fb1f7 Use cs.zprobe_zoffset from ConfigurationStore. 2018-09-24 16:47:57 +02:00
Marek Bel 959d0069fa Use cs.add_homing from ConfigurationStore. 2018-09-24 16:42:28 +02:00
Marek Bel ac7c062161 Use cs.max_jerk from ConfigurationStore. 2018-09-24 16:35:33 +02:00
Marek Bel bb66bfe6a7 Use cs.minsegmenttime from ConfigurationStore. 2018-09-24 16:22:50 +02:00
mkbel 0e7afc67ca
Merge pull request #1175 from PavelSindler/eeprom_version 
M500 EEPROM version update and M500 EEPROM block size check
 2018-09-24 16:19:55 +02:00
Marek Bel 10428b30d9 Use cs.mintravelfeedrate from ConfigurationStore. 2018-09-24 16:01:58 +02:00
Marek Bel 26e2fd1c76 Use cs.minimumfeedrate from ConfigurationStore. 2018-09-24 15:57:24 +02:00
Marek Bel b8fefceb4d Use cs.retract_acceleration from ConfigurationStore. 2018-09-24 15:53:35 +02:00
Marek Bel 7dbe0afdc4 Use cs.acceleration from ConfigurationStore. 2018-09-24 15:47:36 +02:00
Marek Bel cee51cf9c3 Use cs.max_acceleration_units_per_sq_second_normal from ConfigurationStore. 2018-09-24 15:40:35 +02:00
Marek Bel 02becb5e6a Use cs.max_feedrate_normal from ConfigurationStore. 2018-09-24 15:09:19 +02:00
PavelSindler 053b94b711 remove "start" duplicity in setup 2018-09-24 14:57:46 +02:00
Marek Bel 3f28632443 Use cs.axis_steps_per_unit from ConfigurationStore. 2018-09-24 14:54:41 +02:00
PavelSindler 752aec37fb M500 EEPROM version changed; if EEPROM_M500_SIZE is not updated, data are not stored 2018-09-19 14:36:26 +02:00
PavelSindler 1253fb338a wizard hotfix 2018-09-10 18:02:54 +02:00
Marek Bel 001680bbdc Merge branch 'MK3' into time_remaining_fix 
# Conflicts:
#	Firmware/Marlin_main.cpp
 2018-09-07 08:21:36 +02:00
mkbel 801f8e93e8
Merge pull request #1112 from PavelSindler/MK25_time_remaining 
MK25: always show "normal mode" remaining time (PFW-553)
 2018-09-07 08:05:16 +02:00
PavelSindler 2f02828273 time remaining fix 2018-09-07 02:02:35 +02:00
PavelSindler 66305b3e04 MK25: always show "normal mode" remaining time 2018-09-06 23:05:36 +02:00
PavelSindler 40679dcb3a
Merge branch 'MK3' into MK3 2018-09-05 00:06:48 +02:00
MRprusa3d 25a22120fb 1-st Layer Calibration correction 
filament loading improvement
 2018-08-30 03:32:33 +02:00
PavelSindler b284c70d9b auto deplete: dont eject filament 2018-08-29 13:08:09 +02:00
PavelSindler 515e78cfd1 Eject filament feature in menu, M600: if it was envoked by FINDA, eject filament 2018-08-29 01:58:28 +02:00
PavelSindler d290543d7d
Merge pull request #1085 from mkbel/fix_active_filament 
Fix active filament PFW-528
 2018-08-28 23:50:57 +02:00