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

2269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Pelnar
f24c71d5a9 removed unused variable SDscrool 2018-07-12 17:01:03 +02:00
Robert Pelnar
8d5e6a65cd LCD sdcard menu fix 
+removed debug code
 2018-07-12 16:27:02 +02:00
Marek Bel
bf0bbb215e Merge branch 'MK3' into fix_compiler_warnings 2018-07-12 14:10:02 +02:00
PavelSindler
5fe53ae251
Merge pull request #922 from PavelSindler/make_prep 
filament loading corrected
 2018-07-11 22:36:49 +02:00
PavelSindler
07f6ddfb69 filament loading corrected 2018-07-11 22:34:32 +02:00
PavelSindler
9133f83b77
Merge pull request #919 from PavelSindler/make_prep 
Make prep
 2018-07-11 22:03:05 +02:00
PavelSindler
9b7cc60b42 filament statistics hotfix, load filament move Z simplified 2018-07-11 21:59:43 +02:00
PavelSindler
11aa775322 move in Z before filament loading: intial version 2018-07-11 21:59:23 +02:00
Marek Bel
29d1052f0e Save 80B of flash and 8B of RAM and fix compiler warning: 
sketch/adc.c: In function 'adc_init':
sketch/adc.c:20:2: warning: implicit declaration of function 'printf' [-Wimplicit-function-declaration]
  printf(("adc_init\n"));
  ^
sketch/adc.c:20:2: warning: incompatible implicit declaration of built-in function 'printf' [enabled by default]
 2018-07-11 21:58:49 +02:00
PavelSindler
d18160cab5 splash screen 2018-07-11 21:58:06 +02:00
MRprusa3d
1357e27b55 FilamentAutoload setting by shipping preparation 2018-07-11 21:56:25 +02:00
MRprusa3d
d658bf56cf ShippingPrep Reset 
statistics reset by shipping preparation & filament sensor force
 2018-07-11 21:55:21 +02:00
PavelSindler
29d73029ae
Merge pull request #916 from MRprusa3d/MK3 
FilamentAutoload setting by shipping preparation
 2018-07-11 21:42:42 +02:00
Marek Bel
fc657bc31e Merge branch 'MK3' into use_Timer 2018-07-11 21:24:18 +02:00
mkbel
02bd319a6c
Merge pull request #818 from 3d-gussner/MK3_fix7 
Fix warning #7
 2018-07-11 21:04:13 +02:00
MRprusa3d
4b295c4091 FilamentAutoload setting by shipping preparation 2018-07-11 20:45:56 +02:00
Robert Pelnar
066c044396 fixed tmc2130_wr_CHOPCONF 
backlash - initial implementation (disabled by default)
removed menu "W25x20CL init"
splashscreen displayed before entering optiboot
 2018-07-11 20:02:46 +02:00
PavelSindler
efa5f49f66
Merge pull request #912 from MRprusa3d/MK3 
ShippingPrep Reset
 2018-07-11 18:59:14 +02:00
MRprusa3d
d167b631fb ShippingPrep Reset 
statistics reset by shipping preparation & filament sensor force
 2018-07-11 18:52:58 +02:00
PavelSindler
1ad49dc5e9 first working version 2018-07-10 10:45:45 +02:00
PavelSindler
c7745dfb83
Merge pull request #908 from XPila/MK3-new_lang 
TMC2130 gcodes for live motor tunning:
 2018-07-09 16:58:09 +02:00
Robert Pelnar
771cead291 TMC2130 gcodes for live motor tunning: 
TMC_SET_WAVE_X..E (linearity correction)
TMC_SET_CHOP_X..E (chopper configuration - 4 args - toff, hstr, hend, tbl)
 2018-07-09 16:44:10 +02:00
PavelSindler
bde81de984 load and unload filament functions for snmm_v2 2018-07-09 15:24:59 +02:00
PavelSindler
18f007d7b2 Merge remote-tracking branch 'upstream/MK3' into snmm_v2 2018-07-09 14:47:10 +02:00
PavelSindler
8389e89521
Merge pull request #907 from PavelSindler/MK3_for_merging 
missing initialization fix
 2018-07-09 14:46:44 +02:00
PavelSindler
928dcb1417 missing initialization fix 2018-07-09 14:45:59 +02:00
PavelSindler
9d0a15da90 init 2018-07-09 14:20:56 +02:00
PavelSindler
8932327229
Merge pull request #906 from PavelSindler/MK3_for_merging 
T-codes for MMU_V2: initial version
 2018-07-09 13:59:09 +02:00
PavelSindler
5979bf5e0c T-codes for MMU_V2: initial version 2018-07-09 13:57:36 +02:00
XPila
860a0b0858
Merge pull request #867 from XPila/MK3-new_lang 
Mk3 new lang - multiple languages in internal flash + menu optimalization
 2018-07-09 12:46:40 +02:00
Robert Pelnar
8d2acd02a5 Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang 2018-07-09 12:44:58 +02:00
Robert Pelnar
e2ff00b05f Menu optimalization - SDcard menu - initial implementation for async variant 2018-07-09 12:44:19 +02:00
XPila
7bbbb38ce2
Merge pull request #888 from XPila/MK3 
Version changed
 2018-07-02 16:54:29 +02:00
Robert Pelnar
c8d5648ea8 Version changed 2018-07-02 16:53:10 +02:00
Marek Bel
3248edc1ca Do not skip bootloader when initiating reset by farm PRUSA RESET command. 
Set bootloader magic and run flag before watchdog reset in PRUSA RESET command.
 2018-06-26 20:12:09 +02:00
PavelSindler
6940b13507
Merge pull request #878 from PavelSindler/MK3_for_merging 
version changed
 2018-06-26 18:54:09 +02:00
PavelSindler
6abde828fa version changed 2018-06-26 18:53:11 +02:00
PavelSindler
65880fac67
Merge pull request #875 from PavelSindler/fix_crash_restore 
dummy "ok" reponse readded (fix for SD card print with Octoprint: fix…
 2018-06-25 19:08:43 +02:00
PavelSindler
6f617696ac dummy "ok" reponse readded (fix for SD card print with Octoprint: fixes communication timeout issues) 2018-06-25 18:52:22 +02:00
XPila
01f04cc406
Merge pull request #874 from XPila/MK3 
XYZ cal. details screen fixed
 2018-06-25 18:29:58 +02:00
Robert Pelnar
3ff4105024 XYZ cal. details screen fixed 2018-06-25 18:28:43 +02:00
PavelSindler
3674673faa
Merge pull request #873 from PavelSindler/MK3_for_merging 
status screen update
 2018-06-25 17:56:53 +02:00
PavelSindler
81c0c01825 status screen update 2018-06-25 17:50:37 +02:00
XPila
20f98d487a
Merge pull request #872 from XPila/MK3 
Farm mode - tmc2130 extruder current setting fixed
 2018-06-25 17:45:58 +02:00
Robert Pelnar
fe9b4e5f1f Farm mode - tmc2130 extruder current setting fixed 2018-06-25 17:45:07 +02:00
PavelSindler
0fccf5a737
Merge pull request #870 from XPila/MK3 
Mk3
 2018-06-25 17:36:22 +02:00
XPila
93aed63115
Merge pull request #871 from PavelSindler/crashdet_timeout 
save extruder relative mode correctly
 2018-06-25 17:35:47 +02:00
PavelSindler
5d531b0f66 save extruder relative mode correctly 2018-06-25 17:30:20 +02:00
Robert Pelnar
12de2f95e6 Farm mode: PFW360, PFW361, PFW362, PFW363 2018-06-25 17:29:34 +02:00
Robert Pelnar
6d4c3b8b27 Farm mode - reset using watchdog for MK3 2018-06-25 16:04:47 +02:00