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

159 Commits

Author SHA1 Message Date
PavelSindler
85c208f9f4
Merge branch 'MK3' into bad_load_cut 2019-03-01 14:55:55 +01:00
PavelSindler
22c0d6e230
Merge pull request #1577 from mkbel/add_cut 
Add MMU cut filament
 2019-03-01 14:53:12 +01:00
Marek Bel
49b1d1cb93 Move prototype to header file. 2019-02-26 18:50:15 +01:00
Marek Bel
5a5a482a59 Rename preprocessor macro K1 to PID_K1 to avoid future conflict with MMU command. 2019-02-26 13:59:44 +01:00
Laurentiu
4835b9b220 7x7 points mesh bed leveling 2019-02-14 10:57:58 +02:00
PavelSindler
e432e258dc extr fan RPM measuring fix 2019-02-06 22:56:10 +01:00
PavelSindler
2fe8e0670a MK2 build fail fixed 2019-02-06 16:15:19 +01:00
PavelSindler
1ba046395e fan measurements fix: keep fanSpeedSoftPwm = 255 during measurements, selftest changes 2019-02-06 12:37:18 +01:00
PavelSindler
62e253edd0 fanSpeed -> fanSpeedSoftPwm (fixes fan speed menu) 2019-02-05 18:21:44 +01:00
PavelSindler
f9298b37b8 fan check hotfix (selftest, measuring RPM, fan errors) 2019-02-05 04:02:38 +01:00
PavelSindler
ea20529945 merge changes from upstream 2019-02-04 15:23:39 +01:00
MRprusa3d
5a2df47077 minTemp 
better stability for delay-cutting
 2019-02-04 14:54:25 +01:00
Robert Pelnar
3244c37435 Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control 2019-02-04 01:32:04 +01:00
PavelSindler
6bf8611afa mintemp: delay cutting lines removed 2019-02-04 01:19:58 +01:00
PavelSindler
97aaf919a3 Merge remote-tracking branch 'upstream/MK3' into dev 2019-02-01 18:12:59 +01:00
PavelSindler
1742dbdb9e Merge remote-tracking branch 'my_dev/MK3' into dev 2019-01-28 16:21:57 +01:00
PavelSindler
2ea34d21e7
Revert "Revert "Mk3 bed fast pwm"" 2019-01-28 14:20:31 +01:00
PavelSindler
7889305702 merging changes from upstream 2019-01-28 11:00:42 +01:00
PavelSindler
41f103c28f
Revert "Mk3 bed fast pwm" 2019-01-28 10:53:51 +01:00
Robert Pelnar
eea755496b Conditional translation for SYSTEM_TIMER_2 because we want to have posibility to switch between old/new implementation. 
Timing functions (millis, micros and delay) replaced in whole source, defined in Marlin.h.
This commit enables original implementation (SYSTEM_TIMER_2 undefined)
Verified with passed complete wizard process.
 2019-01-27 22:48:51 +01:00
Robert Pelnar
9a1e914637 fix - bed heating durring selftest 2019-01-27 18:14:01 +01:00
Robert Pelnar
434a723151 Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2' 2019-01-27 17:37:27 +01:00
Robert Pelnar
fc0b55b213 Timing functions micros2 and delay2 + fix of delay_keep_alive(). 2019-01-27 17:23:53 +01:00
PavelSindler
ab2a25cd3f Revert "Fast PWM for bed - newer set HEATER_BED_PIN to 1" 
This reverts commit 50bcfae183.
 2019-01-25 18:38:46 +01:00
PavelSindler
31236e411e Revert "Fast PWM for bed - set pwm value from soft_pwm_bed variable." 
This reverts commit e612eb2a17.
 2019-01-25 18:38:36 +01:00
PavelSindler
76db58605b Revert "Fast PWM for bed - timer2 used as system timer" 
This reverts commit 0963c889f0.
 2019-01-25 18:37:23 +01:00
PavelSindler
7e3a1c7d45 merge changes from upstream 2019-01-25 17:57:24 +01:00
PavelSindler
273554b9b0
Merge pull request #1470 from XPila/MK3-bed_fast_pwm 
Mk3 bed fast pwm
 2019-01-24 13:11:57 +01:00
MRprusa3d
15b45df9fb PID / manage_heater 
better build-warnings elimination
 2019-01-23 20:14:40 +01:00
Robert Pelnar
c4d5b58c37 Merge remote-tracking branch 'upstream/MK3' into MK3-bed_fast_pwm 
# Conflicts:
#	Firmware/temperature.cpp
resolved
 2019-01-23 17:04:41 +01:00
Robert Pelnar
50bcfae183 Fast PWM for bed - newer set HEATER_BED_PIN to 1 2019-01-21 18:21:17 +01:00
MRprusa3d
2c0d62fbf7 PID / manage_heater 
some small corrections
 2019-01-21 18:20:40 +01:00
Robert Pelnar
e612eb2a17 Fast PWM for bed - set pwm value from soft_pwm_bed variable. 2019-01-21 18:14:19 +01:00
Robert Pelnar
0963c889f0 Fast PWM for bed - timer2 used as system timer 2019-01-21 17:57:07 +01:00
MRprusa3d
d9f8e4eb9e PID / manage_heater 
PSD regulator improvement
 2019-01-17 02:57:08 +01:00
MRprusa3d
4e300fd552 minTemp 
safety heaters management during/after minTemp
 2019-01-02 18:25:41 +01:00
Robert Pelnar
cb334238cc Slow PWM fan @ 62.5Hz 2018-12-06 15:18:07 +01:00
MRprusa3d
83a9f75abe minTemp 
correct minTemp detection @ MK2.5 & MK3
 2018-11-28 23:43:16 +01:00
PavelSindler
940f436a5f merge MK3_dev into MK3 2018-10-22 20:25:29 +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
MRprusa3d
0184f06dcf preHeatError 
correction of preHeatError detection
 2018-09-27 04:23:00 +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
98e921d456 Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings 2018-08-01 16:24:07 +02:00
MRprusa3d
970ba6fa2a Sound 
all cases
 2018-07-29 22:59:14 +02:00
Marek Bel
98ba79e518 Fix out of array bounds access. 
Manifested as compiler warnings:

In file included from sketch/Marlin_main.cpp:67:0:
sketch/temperature.h: In function 'bool gcode_M45(bool, int8_t)':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
sketch/temperature.h: In function 'void long_pause()':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
sketch/temperature.h: In function 'void process_commands()':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
 2018-07-25 12:52:02 +02:00
Marek Bel
88cce94cf9 Revert "Revert "Save 80B of flash and 8B of RAM and fix compiler warning:"" 
This reverts commit 77426b563a.
 2018-07-23 13:35:38 +02:00
Petr Ledvina
fd332c1ff1 Fix ADC index overflow 
Use bitmap bitcount to map pin number to adc_values array  index. Old
code fails for TEMP_AMBIENT_PIN and VOLT_BED_PIN
 2018-07-17 17:55:04 +02:00
Robert Pelnar
e22d204e8e LCD menu optimalization - print functions 
+removed unused code
 2018-07-16 19:29:27 +02:00
Robert Pelnar
268d2634f0 LCD menu optimalization - lcd and menu 
removed unused code and conditional translation
 2018-07-16 02:13:52 +02:00
Robert Pelnar
c0946d8f04 New ML support - w25x20cl spi external flash support 
+fixed some messages
+sec lang update test
 2018-06-09 01:23:04 +02:00
PavelSindler
d86d1beeaa fan error synchronization with planner 2018-05-02 16:16:48 +02:00
PavelSindler
0ba7850146 pinda temp table changed back 2018-04-11 17:40:04 +02:00
Robert Pelnar
92997204a1 Linearity correction - TMC codes for calibration object, variable stored as uint8, range from 1.03 to 1.20 2018-04-03 12:30:35 +02:00
PavelSindler
78f9f6b611 use defines for adc pins, temp table for PIDNA update 2018-03-16 11:01:06 +01:00
Robert Pelnar
ac1a56b493 Merge branch 'MK25' into MK3 2018-03-13 20:43:19 +01:00
Robert Pelnar
e3967e444b SafetyTimer disabled 
Watchdog disabled
watchdog.cpp and watchdog.h source code removed (using directly <avr/wdt.h>)
 2018-03-07 14:13:34 +01:00
PavelSindler
c986ac14ec pinda thermistor pin changed 2018-03-06 18:09:25 +01:00
Robert Pelnar
4309c8951c fix - false fancheck error at end of print 2018-02-23 17:40:16 +01:00
PavelSindler
ae50a1a768 checking fan speed synchronized with block currently processed 2018-02-22 17:12:24 +01:00
bubnikv
cff7b9b396 Unified the volumetric_multiplier with extrusion_multiply to improve 
numeric accuracy and to reduce compuatitonal load. With this commit,
the numeric rounding is fixed not only for the M221 G-code
(as implemented by the preceding commit), but also for the volumetric
extrusion in general.

Removed the old FILAMENT_SENSOR code, which served the purpose
to modulate the volumetric multiplayer in real time depending
on the measured filament diameter. This feature will certainly not be
used by Prusa Research in the near future as we know of no sensor,
which would offer sufficient accuracy for a reasonable price.
 2018-02-22 14:53:10 +01:00
Robert Pelnar
c5175e97ec Pinout, conditional translation and variant file for MK2 2018-02-21 15:19:34 +01:00
bubnikv
ba49c21f17 Unified the volumetric_multiplier with extrusion_multiply to improve 
numeric accuracy and to reduce compuatitonal load. With this commit,
the numeric rounding is fixed not only for the M221 G-code
(as implemented by the preceding commit), but also for the volumetric
extrusion in general.

Removed the old FILAMENT_SENSOR code, which served the purpose
to modulate the volumetric multiplayer in real time depending
on the measured filament diameter. This feature will certainly not be
used by Prusa Research in the near future as we know of no sensor,
which would offer sufficient accuracy for a reasonable price.
 2018-02-21 11:25:21 +01:00
Robert Pelnar
31e6271b2c Voltage measurement - conditional translation 2018-02-08 21:07:17 +01:00
PavelSindler
29978c4126 TACH_1 must be defined to enable print fan error 2018-02-07 11:10:04 +01:00
PavelSindler
0c98ec5f6b selftest, max endstops undefined, initialization of extruder fan, y offset from extruder 2018-02-06 17:01:09 +01:00
Robert Pelnar
8562235440 MK2.5 port - compilable version 2018-02-01 20:08:11 +01:00
PavelSindler
cbcfcee48f PID cal. is not sending OK periodically, print fan error pauses print in octoprint (not disconnecting), initialize serial line when swithing in settings menu 2018-01-25 15:23:11 +01:00
Robert Pelnar
f30da4bbca babystep synchronisation 2018-01-16 01:34:44 +01:00
XPila
6ff7641d97
Merge pull request #385 from XPila/MK3 
Build 143f
 2018-01-09 20:01:56 +01:00
Robert Pelnar
43010b30b4 Build 143f 
Crashdetection improoved, blocking temperature ISR fixed, limits for silent mode adjusted.
 2018-01-09 19:54:07 +01:00
PavelSindler
858945d949 thermal runaway: reset cmd queue to ensure that heater/bed temp will be always set to zero 2018-01-09 13:35:12 +01:00
Robert Pelnar
8a5ba89a9c Missing serial characters debuging 
disabled fan ISR
disabled fsensor ISR
disabled linear advance
build 143b
 2018-01-02 20:55:33 +01:00
Robert Pelnar
f9d5619682 MINTEMP safety for ambient temperature < 18C 
Silent mode acceleration limit lowered to 1000mm/s^2
 2017-12-27 18:20:04 +01:00
Robert Pelnar
8739b4a610 MINTEMP fix 2017-12-23 03:36:08 +01:00
Robert Pelnar
3ddbac6056 LCD_PWM removed (will be solved other way) 2017-12-21 01:00:49 +01:00
Robert Pelnar
a3a0e70eeb Fsensor autoload enabled menu and eeprom variable 2017-12-20 22:29:41 +01:00
Robert Pelnar
c88938e813 Fixed blocked lcd buttons 
build = 137y
 2017-12-20 21:33:07 +01:00
Robert Pelnar
25dd6dd673 new module adc (analog2digital) 
temperature.cpp - adc sampling state machine removed
new dcode D9 (adc read/write + simulator)
temporarily DEBUG_DISABLE_STARTMSGS because UI blocked
SILENT_MAX_FEEDRATE reduced to 172mm/s
hexfile removed
build number 137x
 2017-12-20 13:42:20 +01:00
Robert Pelnar
01654e7145 Meassuring voltages (pwr, bed), voltages menu 2017-12-15 18:33:35 +01:00
PavelSindler
893f34fd85 watchdog reset 2017-12-14 20:28:07 +01:00
Robert Pelnar
7e00248060 new ambient thermistor table 
MINTEMP_MINAMBIENT
 2017-12-12 22:49:47 +01:00
Robert Pelnar
f2e9bdef24 Fsensor synchronization and triggering improved 
Watchdog implemented (4s interval, triggered from manage_heater)
Stallguard sensitivity for XY decreased by 1
Extruder current adjusted to 5.5kg force
Build number = 111
 2017-11-24 21:53:35 +01:00
PavelSindler
1ca48fee49 PID calibration temp runaway 2017-11-21 15:11:15 +01:00
PavelSindler
91d125369e keepalive messages initial version 2017-11-15 15:09:29 +01:00
PavelSindler
f4d5d891df measuring pulse width: initial version 2017-10-26 17:42:27 +02:00
PavelSindler
a95506b128 fan speed error during print fixed 2017-09-22 21:21:16 +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
13f45adb13 fan error changes 2017-09-22 19:31:52 +02:00
PavelSindler
a53428835a fan error improvements 2017-09-22 18:22:21 +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
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
ec7678a25f pat9125 filament sensor 
sg homing - bug fix + homing multiple axes simultanously (AXIS_MASK)
 2017-07-07 04:45:09 +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
Robert Pelnar
b8025e63e6 DEBUG defines, variant files for MK3 2017-07-04 16:23:28 +02:00
PavelSindler
a8678cb2fd recover print 2017-07-04 11:31:39 +02:00