Commit Graph

334 Commits

Author SHA1 Message Date
PavelSindler
4630df6cf4 pause print fix for absolute mode, minor first layer cal. fix for snmm 2017-11-14 16:51:34 +01:00
PavelSindler
f209f698ac translations, cursor position changes 2017-11-14 16:16:02 +01:00
PavelSindler
9e2533ecdf Support menu translated and fixes, snmm M600 long beep fix 2017-11-14 16:10:10 +01:00
PavelSindler
4d9780a3c6 Merged lin adv. fix from MK2 2017-11-14 13:57:32 +01:00
XPila
dfe3541d2b
Merge branch 'MK3' into MK3 2017-11-13 18:48:19 +01:00
Robert Pelnar
01de834e0d SG_THR_X = 2, holding currents == running currents
Farm preheat menu
dcode D5 - read/write/erase FLASH
dcode D6 - bootloader update test (for new stk500-prusa)
_NO_ASM - MINGW simulator support
fixed bug - "Fil. sensor [on/off]" menu
Build number = 107
2017-11-13 18:45:11 +01:00
PavelSindler
ee5505887c First layer cal. corrections, translations to all languages for Wizard MK2 added 2017-11-13 17:43:14 +01:00
PavelSindler
eda0c6bd39 english version of xyz: place/remove steel sheet; wait for cooling down removed, 2017-11-13 17:09:26 +01:00
PavelSindler
5707f8b14e Merge remote-tracking branch 'upstream/MK3' into wizard 2017-11-13 14:39:14 +01:00
PavelSindler
fbbcc27f1a X max lowered to 250, XYZ/Z calibration: Z top coordinate changed, changes in xyz cal. because of stell sheet, still not final version 2017-11-12 11:30:06 +01:00
PavelSindler
a81d28664f axis selftest fixed 2017-11-08 14:25:31 +01:00
michalprusa
1e81861e0c Configuration files reordered and added build number 2017-11-07 23:54:06 +01:00
XPila
55325a5a32
Merge branch 'MK3' into MK3 2017-11-07 17:15:27 +01:00
PavelSindler
e88ac72cc8 missing messages added 2017-11-07 16:57:52 +01:00
PavelSindler
2e68770e62 initial version - messages missing (will not compile) 2017-11-07 16:49:04 +01:00
PavelSindler
67c76104a5 Configuration_prusa updated 2017-11-07 11:39:11 +01:00
PavelSindler
c36b7be90c SUPPORT_VERBOSITY initial version 2017-11-07 11:36:41 +01:00
PavelSindler
461675b806
Merge pull request #78 from PavelSindler/4point_xyz_cal
4point xyz cal.
2017-11-07 10:02:32 +01:00
michalprusa
967594edf0 Added G-CODE "PRUSA FAN" to report RPM of both fans 2017-11-03 20:27:52 +01:00
Robert Pelnar
877c8a3978 TMC2130 configuration in eeprom (not finished).
Extruder and Z holding currents same as running currents.
M600 filament unload speed = 3500 (PFW-22).
FSensor - algorithm changed (reset error couter instead of decrement)
build number = 106
2017-10-30 15:45:29 +01:00
PavelSindler
1ee6016fa0 Merge remote-tracking branch 'upstream/MK3' into 4point_xyz_cal 2017-10-30 11:48:45 +01:00
Robert Pelnar
bd7c3d08f3 Marlin_main - lineending CRLF -> LF 2017-10-27 17:07:02 +02:00
Robert Pelnar
0607086e14 Build number = 105 2017-10-27 16:38:12 +02:00
PavelSindler
c4d7b801b9 Initial version. XYZ cal works, but bed ref. points coordinates must be checked. 2017-10-27 16:12:37 +02:00
PavelSindler
d37c925bc0 Merge branch 'MK3' into print_fan_speed 2017-10-26 18:04:38 +02:00
PavelSindler
f4d5d891df measuring pulse width: initial version 2017-10-26 17:42:27 +02:00
Robert Pelnar
45d6baa757 setup second serial port only in case it is selected
build number = 104
2017-10-24 23:20:48 +02:00
Robert Pelnar
cddb0eafb8 PAT9125 - sampled only Y value, new debug code D9125.
FSensor - synchronous sampling and new algorithm
build number = 103
2017-10-24 19:45:15 +02:00
Robert Pelnar
8734961e0e M114 now reports also actual extruder position,
PAT9125 HWI2C (Wire) support,
fsensor implementation into separate file
build number = 102
2017-10-22 22:42:45 +02:00
michalprusa
1244b195f9 M119 now reports real values of hardware endstops, not SG status. 2017-10-18 18:04:42 +02:00
michalprusa
84bdc6c0e6 Merge remote-tracking branch 'origin/MK3' into MK3 2017-10-18 15:36:31 +02:00
Robert Pelnar
66c19b874d Extruder settings tunning (http://jira.prusa/projects/PFW/issues/PFW-5)
buildnumber increased to 101
2017-10-17 21:24:11 +02:00
Robert Pelnar
6a0f8752c3 Endless loop after calibration Z (http://jira.prusa/projects/PFW/issues/PFW-3?filter=allissues)
Buildnumber (http://jira.prusa/projects/PFW/issues/PFW-4?filter=allissues)
2017-10-17 21:05:31 +02:00
Robert Pelnar
cc9f03a46f Line endings to LF (./le.sh lf) 2017-10-03 13:01:59 +02:00
michalprusa
7cf0218737 Merge remote-tracking branch 'origin/MK3' into MK3 2017-09-27 21:34:37 +01:00
Robert Pelnar
cc469b4c51 changed configuration 2017-09-26 17:20:44 +02:00
michalprusa
0b88142253 Merge remote-tracking branch 'origin/MK3' into MK3 2017-09-26 14:48:32 +01:00
michalprusa
77debbc568 Fail stats moved to main menu to be easily accessible 2017-09-26 14:46:33 +01:00
michalprusa
c3585bc696 Automatic recovery typo fix
Failures statistics in eeprom
2017-09-26 14:14:17 +01:00
Robert Pelnar
ca33f7f60f PWM_GRAD back to 4 (trinamic suggested value), standstilltimeout = 1000 2017-09-26 13:07:25 +02:00
michalprusa
5ff28682be Automatic recovery after crash is detected 2017-09-26 11:48:46 +01:00
michalprusa
a4a90aa9ed Merge remote-tracking branch 'origin/MK3' into MK3 2017-09-26 11:37:39 +01:00
Robert Pelnar
40fae26d75 Silent / Hight Power mode switching - wait for standstill
parameter tunning:
PWM_GRAD, PWM_AMPL TCOOLTHRS (XY)
2017-09-26 12:22:58 +02:00
michalprusa
22f189009f Merge remote-tracking branch 'origin/MK3' into MK3 2017-09-26 10:03:12 +01:00
Robert Pelnar
345fee66be Silent mode x-axis amplitude adjust from 200 to 210, because of layershift at high speed. 2017-09-26 07:20:54 +02:00
Robert Pelnar
b475d11bdb Maker Faire brainstorm 2.0 (2)
Automatic recover after short power loss (according to heatbed temperature drop)
Adjusted crashdetection - TMC2130_TCOOLTHRS_X and TMC2130_TCOOLTHRS_Y = 450 to be enabled at low speed
!!!ALL FEATURES TESTED AT THIS POINT!!!
2017-09-26 06:11:42 +02:00
Robert Pelnar
89121e6e34 Maker Faire brainstorm 2.0
Added filament sensor and crash detection to EEPROM
Added crash-detection counters display disable directive
Added Restore/Save print directive
Added crash detection and filament sensor settings to Tune menu
2017-09-26 04:30:10 +02:00
Robert Pelnar
a883c8df84 preklep 2017-09-26 03:23:08 +02:00
Robert Pelnar
73cc1c9c8a initial state of crash detect and filament sensor is ON
slowed down return speed from crash detect after home
Added babystep apply after return from crash detect (don’t know if it’s accurate)
Added D10 to set machine to XYZ correctly calibrated
Added resume debug directive to mask additional menu item
2017-09-26 03:21:33 +02:00
michalprusa
14a8c33096 Merge remote-tracking branch 'origin/MK3' into MK3 2017-09-26 00:51:12 +01:00
Robert Pelnar
39f6e746dc Crashdetection tunning. 2017-09-26 01:43:56 +02:00
bubnikv
ed0fe01bcc Decreased the homing feedrate for the X axis from 3000 to 2500mm/min.
With the old settings the stall guard did not work reliably.
2017-09-25 15:22:20 +02:00
bubnikv
c6e9896257 Changed the homing routine to avoid crashing into the right end stop. 2017-09-25 15:20:39 +02:00
bubnikv
b0ca2477c8 Modified homing procedures for the X & Y axes using the Trinamic stall guard
to run against the end stop with a repeatable velocity.

Slightly reduced the collision detection sensitivity.
2017-09-24 00:07:32 +02:00
bubnikv
b58dcf33d0 Removed a test snippet, which broke the power panic recovery. 2017-09-23 20:52:22 +02:00
Robert Pelnar
f2f74ebddf Powerpanic Z correction improved. 2017-09-23 20:36:10 +02:00
michalprusa
39e32c8b3a Sync of Configuration_prusa to proper variant 2017-09-23 14:28:40 -04:00
XPila
4fa5669298 Merge pull request #57 from XPila/MK3
Soft homing + fixed homing in silent mode.
2017-09-23 20:02:15 +02:00
Robert Pelnar
e11ae8bdbf Soft homing + fixed homing in silent mode. 2017-09-23 20:01:37 +02:00
XPila
e44adfc71b Merge pull request #56 from XPila/MK3
Fixed homing (mbl and babystep - crashdetection recovery work fine now).
2017-09-23 16:35:26 +02:00
Robert Pelnar
480838a0a1 Fixed homing (mbl and babystep - crashdetection recovery work fine now). 2017-09-23 16:35:01 +02:00
XPila
5649e7be9d Merge pull request #55 from XPila/MK3
Silent/High Power mode switching with crashdetection.
2017-09-23 15:09:01 +02:00
Robert Pelnar
89acf29247 Silent/High Power mode switching with crashdetection. 2017-09-23 15:01:31 +02:00
XPila
e676ce6230 Merge pull request #53 from XPila/MK3
Crashdetection
2017-09-22 23:08:08 +02:00
Robert Pelnar
d2ff47dac8 Crashdetection 2017-09-22 23:06:52 +02:00
PavelSindler
03b7a8e765 Merge pull request #52 from PavelSindler/MK3
fan error during print improved
2017-09-22 21:22:17 +02:00
PavelSindler
a95506b128 fan speed error during print fixed 2017-09-22 21:21:16 +02:00
XPila
1ca48ef160 Merge pull request #51 from XPila/MK3
SG limits adjusted (x=5,y=5), for homing is possible to set different…
2017-09-22 20:53:26 +02:00
Robert Pelnar
4805713b8d SG limits adjusted (x=5,y=5), for homing is possible to set different values (x=5,y=5, without filter). 2017-09-22 20:53:00 +02:00
PavelSindler
d1a065881b fan error: long pause is used during print, resuming print resets error flag; stop print used during heating phase 2017-09-22 20:43:30 +02:00
PavelSindler
7e71d21a03 Merge pull request #50 from PavelSindler/MK3
Fan errors updated
2017-09-22 19:48:27 +02:00
PavelSindler
045ffb9f0e languages updated 2017-09-22 19:47:08 +02:00
PavelSindler
13f45adb13 fan error changes 2017-09-22 19:31:52 +02:00
Robert Pelnar
df1aa85526 Crashdetection + configuration file. 2017-09-22 19:28:32 +02:00
PavelSindler
b87dc69042 merging with upstream 2017-09-22 18:26:13 +02:00
PavelSindler
a53428835a fan error improvements 2017-09-22 18:22:21 +02:00
XPila
10cd30b9c6 Merge pull request #48 from XPila/MK3
Language files (EN only), because of flash overflow.
2017-09-22 17:43:37 +02:00
Robert Pelnar
f5e39112a2 Language files (EN only), because of flash overflow. 2017-09-22 17:42:53 +02:00
bubnikv
522b438ef5 Power panic: When panicking, move the X carriage to the bed side fast. 2017-09-22 16:44:00 +02:00
bubnikv
a8297369b2 Merge branch 'MK3' of https://github.com/prusa3d/Prusa-Firmware-DEV into MK3 2017-09-22 15:43:56 +02:00
bubnikv
23b4fa6c0d Some fixes / improvements of the power panic:
1) Fix of an order of SD card function calls on recover: First set position, then restart the print.
2) Some convenience improvements: On panic, the X axis moves to the edge to avoid oozing into the print.
3) On recovery, move Z up if the head is too low to make it easier for the user to clean the print head.
2017-09-22 15:43:39 +02:00
PavelSindler
37d7740e42 Merge pull request #47 from PavelSindler/MK3
fan check turn off, saving to eeprom with offset and levels, fan kickstart,2nd heatbed version, fans check modified
2017-09-22 14:39:52 +02:00
bubnikv
72ab17f585 Further fixes of the power panic and g-code & planner queues. 2017-09-22 13:44:10 +02:00
bubnikv
582a6270b0 Fix of a power panic print stop. 2017-09-21 17:50:39 +02:00
PavelSindler
effe6126be eeprom error message 2017-09-21 15:35:46 +02:00
PavelSindler
6eb57da770 fan check can be turned off from support menu, saving parameters to eeprom with offset and different levels, fan kickstart,2nd heatbed version, fans check modified 2017-09-21 15:20:02 +02:00
Robert Pelnar
1409bd633c Power Panic - new method of sd_position calculation. 2017-09-21 05:35:41 +02:00
Robert Pelnar
9b901bd3f5 XY homing repeatibility - move by 160um from margin. 2017-09-21 04:55:30 +02:00
Robert Pelnar
4cae00741e MAKER FAIRE
filament sensor: runout detection tuning, save/restore print
silent mode: safe mode selection durring printing and after homing
2017-09-21 01:52:28 +02:00
Robert Pelnar
e34d816004 Recover print 2017-09-20 16:04:02 +02:00
Robert Pelnar
2c3387e71d Recover print - simple solution 2017-09-19 21:38:47 +02:00
Robert Pelnar
9d91a5d425 TMC2130 XY currents can be over 31 (like Z). 2017-09-19 17:42:43 +02:00
Robert Pelnar
c4e9e624f5 cmd queue and planner - functions for calculating sd position:
cmdqueue_calc_sd_length
planner_calc_sd_length
2017-09-18 19:36:18 +02:00
Robert Pelnar
9c92025cf2 Serial port ECHO bug fix - for clear eerpom farm_mode will be set to false. In farm_mode is second serial port the main port and data received from this port is send to serial port 0 (debuging feature). 2017-09-15 16:34:34 +02:00
Robert Pelnar
6f5f88e7ea Temporary added configuration file Configuration_prusa.h. 2017-09-14 16:28:16 +02:00
Robert Pelnar
9105de073c Cmdqueue code in separate files, debug codes for read/write eeprom and ram, PWM amplitude for Y axis stealtchop mode increased to 210. 2017-09-14 16:19:49 +02:00
Robert Pelnar
14519aa7ee Support the second serial (original commit 7d2d6c6fdc on MK2 by AndreeeCZ) 2017-09-13 13:35:22 +02:00
Robert Pelnar
0685439e36 Cmd queue modification. Added CMDHDRSIZE=2, each command readed from SD is preceded by one byte variable containing original length. 2017-09-12 19:20:41 +02:00
Robert Pelnar
0122146dd8 Fixed configuration files (missing TEMP_SENSOR_PINDA and TEMP_SENSOR_AMBIENT) 2017-09-12 12:35:58 +02:00
Robert Pelnar
9c324bfeda Stealth chop mode creek fix - TCOOLTHRS must be set to zero, Y-axis current increased. 2017-09-08 21:58:39 +02:00
Robert Pelnar
d9cdb1da60 Ambient thermistor - table and conversion function, extruder motor changed back to 200steps type, extruder resolution changed to 32usteps. 2017-09-06 16:04:50 +02:00
Robert Pelnar
8ec316773f PINDA thermistor and ambient thermistor. 2017-09-05 14:02:35 +02:00
Robert Pelnar
f563618b1c PINDA thermistor + extruder current adjust. 2017-08-30 21:56:48 +02:00
Robert Pelnar
1e705198e0 LCD backlight brightnes pwm control and lcd blinking. 2017-08-21 17:23:30 +02:00
Robert Pelnar
d63045fdb3 TMC2130 stallguard improovment - axis load monitoring, autocalibrate Z. 2017-08-21 13:06:17 +02:00
Robert Pelnar
683784c4c7 PAT9125 I2C, hardware SG homing
separate pin configuration file for each board
changed board codes:
RAMBO =100, MiniRambo1.0 =200, MiniRambo1.3 = 203, Einy03 =303, Einy04 =304
2017-08-17 15:23:34 +02:00
Robert Pelnar
a7477673de HW SG homing, SWSPI pins for EINY03/04 2017-07-18 13:54:01 +02:00
Robert Pelnar
fa854bde13 fixed bug - removed variable sg_homing_delay 2017-07-12 18:17:39 +02:00
XPila
a41a836ef0 Merge branch 'MK3' into MK3 2017-07-12 17:54:41 +02:00
Robert Pelnar
cd48d5b4ff TMC2130 stallguard SW homing improvement - steps delta instead of delay (loop count), new function tmc2130_home_restart, always enable endstops durring homing. 2017-07-12 17:36:50 +02:00
michalprusa
c36e088f99 Merge remote-tracking branch 'origin/MK3' into MK3-michal 2017-07-07 10:46:31 +02:00
michalprusa
281ae26a5e Merge branch 'MK3' into MK3-michal 2017-07-07 10:43:39 +02:00
michalprusa
e6c7a29693 filament sensor tweaked for 400 step motor.
On/OFF switch for filament sensor
2017-07-07 10:42:36 +02:00
PavelSindler
46f0c3e3b9 selftest fixed 2017-07-07 10:09:09 +02:00
michalprusa
5750a8e661 Einy 0.4a filament sensor fix pinout 2017-07-07 08:01:01 +02:00
XPila
76477edf63 Merge pull request #20 from XPila/MK3
SG homing - fixed bug - set sg_homing_delay to zero before move.
2017-07-07 07:47:07 +02:00
Robert Pelnar
21974ae07a SG homing - fixed bug - set sg_homing_delay to zero before move. 2017-07-07 07:45:36 +02:00
michalprusa
3e83df09cc Merge remote-tracking branch 'origin/MK3' into MK3 2017-07-07 07:36:34 +02:00
michalprusa
52554d72c4 PAT9125 finally able to turn off 2017-07-07 07:34:35 +02:00
XPila
70f6b769ef Merge pull request #19 from XPila/MK3
SWSPI - different pinmapping for EINY03a and EINY04a.
2017-07-07 07:34:19 +02:00
Robert Pelnar
d512456506 SWSPI - different pinmapping for EINY03a and EINY04a. 2017-07-07 07:33:38 +02:00
michalprusa
7ffa42f43a PAT9125 init result print 2017-07-07 05:41:41 +02:00
michalprusa
ea17fa56d7 Merge remote-tracking branch 'origin/MK3-michal' into MK3-michal
# Conflicts:
#	Firmware/ultralcd.cpp
2017-07-07 05:00:23 +02:00
XPila
82c1fc978b Merge branch 'MK3' into MK3-michal 2017-07-07 04:51:01 +02:00
michalprusa
e23f34339e Power panic improved by turning off Z steppers
Dubug outputs for filament and fan rotation sensors moved to special menu Support->Extruder info
XYZ calibration debug now available only while not printing
2017-07-07 04:50:00 +02:00
XPila
c1f6646d08 Merge pull request #16 from XPila/MK3
pat9125 filament sensor
2017-07-07 04:46:45 +02:00
Robert Pelnar
ec7678a25f pat9125 filament sensor
sg homing - bug fix + homing multiple axes simultanously (AXIS_MASK)
2017-07-07 04:45:09 +02:00
michalprusa
87ff9db76e Merge remote-tracking branch 'origin/MK3' into MK3-michal 2017-07-07 02:12:18 +02:00
michalprusa
06fe85e9ee Linear Advance 2017-07-07 01:58:02 +02:00
PavelSindler
164e01ac7c Merge pull request #14 from PavelSindler/MK3
power panic: extrusion to stabilize pressure, waiting for temperature…
2017-07-06 23:02:40 +02:00
PavelSindler
2ea8e11eea power panic: extrusion to stabilize pressure, waiting for temperature in homing position 2017-07-06 23:01:59 +02:00
XPila
d109602896 Merge pull request #13 from XPila/MK3
TMC2130 - variable Z current reference (IRUN>31 => vsense = 0, IRUN/=…
2017-07-06 22:36:01 +02:00
Robert Pelnar
a21bef25c3 TMC2130 - variable Z current reference (IRUN>31 => vsense = 0, IRUN/=2, IHOLD/=2) 2017-07-06 22:32:21 +02:00
XPila
4fa3cfefc9 Merge pull request #12 from prusa3d/MK3-michal
Mesh bed leveling calibrated to new MK42 24V heatbed (rev 0.3b)
2017-07-06 20:47:10 +02:00
michalprusa
3fdb630c42 Mesh bed leveling calibrated to new MK42 24V heatbed (rev 0.3b)
Increased currents in Z and E axis
Decreased stallguard sensitivity
E axis microsteps changed to 64
2017-07-06 20:40:56 +02:00
PavelSindler
e521831245 status message during print recovery 2017-07-06 19:31:18 +02:00
PavelSindler
c9d7b65c02 updated z recovery in power panic, added test to main menu 2017-07-06 19:09:06 +02:00
PavelSindler
21f068b37a changed Z axis recovery in power panic 2017-07-06 17:09:35 +02:00
PavelSindler
8ceca8b9c6 power panic - fixed z axis recovery 2017-07-06 15:52:38 +02:00
PavelSindler
5943e786ee Merge remote-tracking branch 'upstream/MK3' into MK3
sync with upstream # Please enter a commit message to explain why this merge is necessary,
2017-07-06 13:20:02 +02:00
PavelSindler
54ef2936c7 selftest 2017-07-06 13:19:11 +02:00
XPila
78f7923ab2 Merge pull request #10 from XPila/MK3
Changed jerks, disabled oversampling, debug code, commands for seting…
2017-07-06 13:07:37 +02:00
Robert Pelnar
2b24e9ceb3 Changed jerks, disabled oversampling, debug code, commands for seting pwm_ampl and pwm_grad (M917, M918), changed configuration files 2017-07-06 13:06:07 +02:00
XPila
458dfa80f6 Merge branch 'MK3' into MK3 2017-07-06 12:55:30 +02:00
PavelSindler
16fffed52d current feedrate and fan speed stored to eeprom in power panic, number of blocks (linear movements) in planner serve for counting SD card recover position, print fan speed error limit prolonged to 15s 2017-07-05 15:04:43 +02:00
PavelSindler
2c102f8580 fixed SD card restore position (power panic) 2017-07-05 09:16:33 +02:00
PavelSindler
ef7a302626 power panic: Z axis is lowered in position where print starts (is recovered) 2017-07-04 20:58:44 +02:00
Andre Sklenar
9e3d608ba0 Merge branch 'MK3' of github.com:prusa3d/Prusa-Firmware-DEV into MK3 2017-07-04 16:25:53 +02:00
Andre Sklenar
5ab57ab2ad Init LCD ASAP for a nice UX 2017-07-04 16:25:30 +02:00
Robert Pelnar
b8025e63e6 DEBUG defines, variant files for MK3 2017-07-04 16:23:28 +02:00