Commit Graph

212 Commits

Author SHA1 Message Date
PavelSindler b0566cbb14 Merge pull request #34 from PavelSindler/MK2
Improved E calibration, added degree sign when waiting for cooling in…
2017-01-12 13:43:18 +01:00
PavelSindler a08010c8df Improved E calibration, added degree sign when waiting for cooling in xyz calibration, removing cooling when calibrating just Z, fixed move_menu_axis 2017-01-11 18:14:42 +01:00
Aaron Yourk 0181a17263 Revert "Rebase to upstream changes."
This reverts commit 3afe6d09e2.
Resolves conflicts with upstream Pull request.
2017-01-09 17:11:47 -07:00
PavelSindler ea22febb42 added defines for snmm and stack guard 2017-01-09 16:27:44 +01:00
PavelSindler bfe2f72cf8 added defines for max hotend and max bed temperature for xyz calibration 2017-01-09 14:58:05 +01:00
PavelSindler fcce374a14 initial version - merging from DEV multicolor 2017-01-09 13:12:39 +01:00
Aaron Yourk 3afe6d09e2 Rebase to upstream changes. 2016-12-31 16:24:33 -07:00
Aaron Yourk 2db00510c2 Add modifications from the Mini Rambo 1.3a header to the Mini Rambo 1.0a header. 2016-12-31 07:20:15 -07:00
michalprusa 2c0e83a785 Factory reset redesigned and added LCD output 2016-12-30 17:16:24 +01:00
michalprusa 87c6d36cf2 Menu redesigned in farm mode 2016-12-30 14:42:02 +01:00
michalprusa d2bcdec300 Force high power mode when in farm mode 2016-12-30 13:37:07 +01:00
Aaron Yourk 6129c9167d Make an attempt at resuming previous fan speed when resuming from a paused SD card print via the menu. 2016-12-27 16:43:43 -07:00
Aaron Yourk d5ce8dfa96 Renamed fpos_t to filepos_t as per Github issue #9 to be more compatible with versions of Arduino newer than v1.6.8. 2016-12-27 15:19:18 -07:00
ayourk 0af1945d5e Update thermistortables.h
Update thermistortables.h to be more in line with the forum post.
2016-12-25 04:20:39 -07:00
Aaron Yourk ad55674801 Added PT100 bed PID values (copied from extruder PID and untested) 2016-12-25 03:03:33 -07:00
Aaron Yourk 93400ea4e0 Fix ENCODER steps in Configuration.h
Add temp tables for the E3D PT100 with Amplifier in thermistortables.h
Make it easier to switch to the PT100 temperature sensor with appropriate PID values for the Extruder.
2016-12-25 02:49:34 -07:00
Michal Průša e4b7219239 Merge pull request #27 from AndreeeCZ/MK2
main: ignore handling of 'N' symbols (line number) when dealing with special PRUSA commands
2016-12-14 16:03:11 +01:00
Andre Sklenar 83dbcc2985 main: ignore handling of 'N' symbols (line number) when dealing with special PRUSA commands
Signed-off-by: Andre Sklenar <andre.sklenar@gmail.com>
2016-12-14 15:59:23 +01:00
michalprusa 5169c17d2f Version increment 2016-12-14 15:12:21 +01:00
Michal Průša 8f3f10765a Merge branch 'MK2' into MK2 2016-12-14 15:01:33 +01:00
michalprusa 734ca2eb43 Added link monitor to farm mode 2016-12-14 14:59:01 +01:00
Andre Sklenar 16e34501a0 main: remove features that are not complete yet
Signed-off-by: Andre Sklenar <andre.sklenar@gmail.com>
2016-12-14 14:49:23 +01:00
Andre Sklenar c58453a726 main: add chunk write to sd card 2016-12-14 14:38:36 +01:00
michalprusa 977b58269a Soft factory reset does not reset Live Adjust Z to 0 2016-11-01 17:21:56 +01:00
akukan 6f203c4735 Farm mode error reporting 2016-10-27 15:43:56 +02:00
akukan 2f13563c18 Pre-heat termal runaway check adjusted 2016-10-25 17:06:28 +02:00
michalprusa 54bcd2022d Added question mark for better understanding. 2016-10-21 19:15:02 +02:00
michalprusa 04b83db0ad Italian language fan self test messages translated. 2016-10-19 16:46:07 +02:00
michalprusa 3c735786e3 Max endstops pins definition fixed to match pcb layout 2016-10-19 16:04:41 +02:00
michalprusa ea197360ac Print fan automatically turns off after stop print 2016-10-19 15:54:48 +02:00
michalprusa d0e678e1d1 HotFix - Calibrate XYZ and Calibrate Z now prints status messages of next step after confirming that both carriages are all the way up. 2016-10-19 11:58:15 +02:00
michalprusa 0e7b4d3d3c Firmware version iterated, fan selftest strings ported to all languages. 2016-10-19 09:55:56 +02:00
akukan 8cd558007c Fan test adjustments 2016-10-13 10:40:15 +02:00
akukan da5f1f71ea Fan selftest, error on TR reported via serial 2016-10-11 18:07:27 +02:00
bubnikv e9f25eba27 Translated MSG_BABYSTEP_Z_NOT_SET into Polish language. 2016-10-10 09:38:43 +02:00
bubnikv 854b79de46 Implemented a calibration flow supporting the new & pre-built machines.
Fixed a thermal runaway on heat up.
Increased timeout of live adjust to 90 seconds.
2016-10-07 17:21:06 +02:00
bubnikv e0bb76032c Reset live adjust on XYZ calibration.
Disable timeouts in the XYZ/Z calibration.
Don't modify feed rate multiplier during the XYZ/Z calibration.
Support multi screen messages in the XYZ/Z calibration - "move the Z carriages up" step.
Support up to three lines in the XYZ/Z calibration messages.
Added a new message "Measuring reference height of calibration point xx of 9".
Changed the "move the Z carriages up" message to suggest rotating the knob.
Changed the "live adjust not set" message to reference the manual chapter and section.
Remove debugging serial line output on Z calibration.
Removed the non-working pressure advance feature.
Improved accuracy of diagonal moves by oversampling the path discretization.
Accelerated the planner by rewriting time critical routines from floating
point to fixed point arithmetics.
2016-09-01 17:05:15 +02:00
akukan 078d883416 Firmware version updated to 3.0.7 2016-08-23 10:27:29 +02:00
bubnikv 77c24aa56e Improvement in the mesh bed leveling routine: Z-lift before XY to home.
Fix of the print stop: Reset mesh bed leveling and baby stepping
on print stop.
2016-08-22 13:02:04 +02:00
michalprusa e7bc6a0645 Z homing cords reconfigured. 2016-08-21 16:44:45 +02:00
michalprusa be47a2b7c1 Serial receive timeout while in farm mode to prevent printer from stuck when some characters appears on serial line. Added status echo while waiting for filament. 2016-08-21 16:23:36 +02:00
michalprusa 3c1349a746 XYZ calibration output strings typo fixed X/Z -> X/Y in EN language and XYZ -> X/Y in IT 2016-08-17 11:57:54 +02:00
michalprusa 11dac765e7 Language selection menu moved to marlin_main before printer calibration test. 2016-08-17 11:56:31 +02:00
bubnikv 88bffa5341 Corrected a mistake in the previous check-in. 2016-08-09 12:12:11 +02:00
Vojtech Bubnik 232662ff47 Fixed a valid limit in the bed correction menu. Removed st_synchronize() where it does not have any effect 2016-08-09 11:58:37 +02:00
michalprusa 4e61ac2eb1 Different calibrate Z string and finally arduino addons added. 2016-08-08 19:17:19 +02:00
michalprusa 053c727fed Bed MINTEMP implemented, MAXTEMP behaviour changed, loading filament bug fixed, Extruder max feedrate increased and Italian language strings fix. 2016-08-07 20:20:48 +02:00
bubnikv 5c119501c0 Shortened some long Italian texts. 2016-08-05 19:03:55 +02:00
bubnikv ea646dce10 Update of Spanish and Italian. 2016-08-05 18:50:46 +02:00
bubnikv 935c42fb6d Updated the Polish language file.
Extended the langtool.pl to understand annotations
on the maximum text length and number of lines of mutli-line texts.
2016-08-05 16:03:38 +02:00
bubnikv 52fc724cb4 Menu reorganized.
Toshiba FlashAir switchable.
2016-08-05 13:34:21 +02:00
bubnikv 32c8e9c2dc "Calibrate Z" was redefined to let the user move the X axis up
to the Z end stoppers and to re-calibrate the 9 bed point
reference values after the printer has been re-seated or transported.

New "Mesh Bed Leveling" function was added to the menu, doing what
the "Calibrate Z" was doing before.
2016-08-04 17:42:54 +02:00
bubnikv f9f9912fff Fixed print stop: Now the printer will maintain a valid coordinate system during print stop, so it will not crash into the end stops.
Clean-up of some hard coded constants.
Fixed line edit error introduced in the preceding check-in.
Enable a high power mode when first booted up on a virgin RAMBo board.
2016-08-04 13:02:45 +02:00
bubnikv d1df7f931c Unused experimental Prusa3D specific G8X G-codes disabled. 2016-08-02 15:56:14 +02:00
bubnikv 4c6ea5af94 Fixed crashes when one moved the axes from the menu many times
up/down, left/right until the planner queue got full.
2016-08-02 15:40:23 +02:00
bubnikv 805cdadb6f Show "Calibrating nth point" on the display when running G80
if initiated from SD card. Don't show Z height during the calibration.

Update status of the Toshiba FlashAir on sd card insert / removal.
2016-08-02 15:08:34 +02:00
Vojtech Bubnik a154fc1691 Merge branch 'MK2' of https://github.com/Prusa3D/Prusa-Firmware into MK2 2016-08-02 12:19:40 +02:00
bubnikv 077560ce4c Improvement of baby stepping:
1) Fix of stepper control timing
2) Load / restore baby stepping after 9 point bed leveling using
   the planner instead of the questionable baby stepping routine.

Improvement of the menu system: Use a shared menuData union to preserve
memory. Adaptation of baby stepping and edit menus to menuData.

Improvement of the "Toshiba FlashAir" status display. Don't force IP
address query on each display refresh when in the "Support" menu.

Bugfix of the baby stepping menu: Show the correct value instead
of zero when the baby stepping menu is entered.

New feature: Bed leveling adjustment at left / right / front / rear side.
The bed adjustment feature is accessible from the Settings menu
and as L R F B codes of the G80 code.
2016-08-02 12:19:17 +02:00
akukan 012e21d49d Add files via upload 2016-07-28 15:19:23 +02:00
bubnikv f17aa3b0a2 Adjusted the maximum acceleration of the Z axis to a sensible value
for the MK2 printer.
2016-07-26 15:36:35 +02:00
bubnikv 7355589119 Added a test for a broken PINDA cable during G80.
Added a ------ separator in the menu showing the Toshiba FlashAir IP address.
2016-07-26 11:35:39 +02:00
bubnikv 018c1b1fad Multiline lcd_show_fullscreen_message_and_wait_P() function. 2016-07-25 15:52:27 +02:00
bubnikv 403d71d902 Increased the "calibration point not found" threshold from 0.5mm to 1.mm
difference from the reference value stored in the EEPROM.
Lowered the speed of lowering the Z axis during the XY calibration
from 0.5mm per zig-zag search to 0.2mm to avoid the nozzle scratching
the bed if the PINDA sensor is mounted too high.
Improved the display routine to break the interpunction from the end
of a sentence. While the result may not be typographically correct,
more fits onto the screen.
2016-07-25 15:33:26 +02:00
bubnikv d00b4a2c75 Reworked the calculation of jerks in the planner.
Now the confugration values are half the values used before,
and the planner ensures, that the jerks will not be violated.
2016-07-22 16:52:13 +02:00
bubnikv 986b286803 Reworked calculation of the trapezoidal ramps inside the planner.
The old implementation seems to be buggy, it accesses segments
outside the queue, causing jerks and skipped steps.
2016-07-22 10:37:06 +02:00
bubnikv 5c56e472fe Show the Toshiba FlashAir IP address in the menu. 2016-07-22 10:31:30 +02:00
bubnikv 2e66fdf84a Merge branch 'MK2' of https://github.com/Prusa3D/Prusa-Firmware into MK2 2016-07-21 10:49:48 +02:00
bubnikv 562c089e17 Initial implementation of the Toshiba FlashAir support:
Get the status of the Toshiba FlashAir, namely its IP address.
The IP address is currently reported through an M46, but this
is subject to change and the IP address shall be shown on the display.
2016-07-21 10:48:08 +02:00
akukan c8c92f8ae5 PLA preheat settings for MK2 set to 215/55 2016-07-20 16:30:44 +02:00
akukan e9910a9078 Print farm confirmation 2016-07-20 16:05:20 +02:00
akukan 1b2676baac Farm monitoring 2016-07-20 15:02:52 +02:00
bubnikv ea6a948c6b Removed the dual carriage code for readibility.
Removed support for the slow Toshiba stepper drivers.
2016-07-19 10:57:18 +02:00
bubnikv 2e6e4542c9 Undo babystepping in Z before G28 / G80, if applied already.
Update babystepsTodo atomically (disable / enable interrupts).
Disable debugging outputs on the serial line from the X/Y calibration code.
OctoPrint fix - fixes a hangup after G28: Link the G28->G80 G codes
by calling the G80 code directly without pushing it into the command buffer.
SD card driver patch to support the Toshiba FlashAir SD/WiFi card.
2016-07-18 17:28:54 +02:00
bubnikv 3c21438392 In addition to the firmware version number, store the "PRUSA3D"
magic at the beginning of the EEPROM,
so at the upgrade the firmware would know, if the previous firmware
was a Prusa3D firmware.
2016-07-08 09:49:15 +02:00
bubnikv d825c5ffac Write the current firmware version into first 8 bytes of the EEPROM,
so the firmware will have a chance to find out, that it has been
upgraded.
2016-07-07 22:01:51 +02:00
bubnikv d4e332112b Reset babystepping value on startup, if the Z live adjust is off.
This is necessary so the Z axis will not go havoc when the Z live adjust
is enabled.
2016-07-07 21:34:13 +02:00
bubnikv 591e81777a "Printer has not been calibrated yet, calibrate Z" message on startup,
if EEPROM_BABYSTEP_Z_SET equals 0x0ff.
2016-07-07 21:23:32 +02:00
bubnikv 208976f397 Ignore extended ASCII characters. These characters have no meaning in the G-code apart from the file names
and Marlin does not support such file names anyway.
Serial characters with a highest bit set to 1 are generated when the USB cable is unplugged, leading
to a hang-up of the print process from an SD card.
2016-07-07 20:31:11 +02:00
bubnikv 0b372bfc94 Added a new feature to the "M115" code:
"M115 Umajor.minor.revision-flavor" will trigger a dialog
on the display if the "upgrade" firmware version number is higher
than the current version number.
2016-07-07 20:26:59 +02:00
bubnikv d7c75f2060 Updated soft end stops with the skew calibration active.
Updated changes between the corrected / uncorrected XY axes.
2016-07-07 11:51:24 +02:00
bubnikv a88c0a30e7 Fixed a non-C++ implementation of the PRUSA specific G-Codes.
Yet another improvements of the bed skew calibration.
2016-07-06 16:12:04 +02:00
bubnikv 1394e7efc6 Skew calibration: Yet another improvement of the search algorithm
of the front row induction sensor targets.
Fixes of some movements behind the end stops.
2016-07-06 09:34:42 +02:00
bubnikv 58b2aa9fb8 Improvement of the bed skew calibration. 2016-07-04 19:00:42 +02:00
bubnikv 0389b23514 Rewrote the fitting routine of the induction sensor points to the measured points
from Linear Least Squares to Nonlinear Least Squares to maintain unity length of machine axes.
Improved the scanning of the 1st row of the induction points.
2016-07-01 09:13:15 +02:00
bubnikv 677c13fc9a Improved the bed auto calibration at the Y=0 edge of the bed.
Fixed problems with step motors being disabled after inactivity.
2016-06-24 15:44:31 +02:00
bubnikv 80971237b8 Polished the bed skew and shift calibration. 2016-06-23 19:08:45 +02:00
bubnikv c24f3369d7 Fixed a bug in babystepping: The babystep value will be written to EEPROM
at the end of the menu only.
Provided a general method for a menu function to detect exiting by a timeout.
When exiting, the menu function is called with a global variable menuExiting set.
Some errorneously removed functions were reverted.
2016-06-23 11:15:47 +02:00
bubnikv 78ebd522b6 Removed support for DELTA, SCARA and BARICUDA.
Implemented bed skew calibration by matching a precise physical model
to the measured data using the least squares method.
Rewrote handling of the command buffer to preserve memory
and allow pushing the commands to the front of the queue.
2016-06-23 08:46:15 +02:00
bubnikv 08bf6acf1b Fixed ".." label when leaving a subdirectory.
Made the hidden and system files invisible when browsing the SD card.
2016-06-20 13:46:37 +02:00
bubnikv d9da3c4c7f Bugfix of the "Move Z carriages up" step. 2016-06-16 15:52:58 +02:00
bubnikv 6cff4b92ff Automatic bed calibration by searching the 3x3 point matrix.
Fixed a problem with low RAM by re-vamping the langtool.
2016-06-16 14:29:04 +02:00
michalprusa e115c5145f MK2 Config files and hex output added 2016-05-31 14:36:31 +02:00
michalprusa a4a80b3eb7 MK2 Firmware release. 2016-05-31 14:08:04 +02:00
michalprusa 7361f620d3 Extrude mintemp lowered for wax filaments support 2016-05-01 15:04:44 +02:00
michalprusa 9b8d663526 Better live adjust Z interface 2016-05-01 13:56:55 +02:00
michalprusa d1df17a722 Tweaked mesh positions 2016-04-28 17:00:20 +02:00
michalprusa 7bfe91483d Calibration process added 2016-04-28 14:50:25 +02:00
michalprusa 1ce1088d6f Bed PID added and minor tweaks 2016-04-19 11:32:22 +02:00
michalprusa d7417e1dd3 Mesh Bed Leveling rewritten, upcaling of tiles, better bed finding method and minor other tweaks. 2016-04-01 16:48:48 +02:00
michalprusa 4263792793 Planning move in mesh rewritten. 2016-03-25 15:56:51 +01:00
michalprusa 7f9e947954 Added debug output 2016-03-25 14:53:55 +01:00
michalprusa f98cf1b44b Added automatic mesh bed leveling feature 2016-03-12 17:14:11 +01:00
michalprusa 657f339d95 Development branch version mark added 2016-03-12 07:07:22 +01:00
michalprusa 533c3e4e1a Language file generator tweaked
Now checking if every language has defined all strings!
2016-03-10 19:15:30 +01:00
michalprusa 8ff414d408 Removed sublime project files 2016-03-10 18:55:08 +01:00
michalprusa e67d7ed4e3 Fixed missing string in polish language 2016-03-09 17:42:50 +01:00
michalprusa 95dd729904 Compiled output 2.2.4 version 2016-03-08 21:12:24 +01:00
michalprusa 37d3e4278d Added languages and minor tweeks
Added ES,IT and PL languages. Modified first run procedure to get FW
working on printers without LCD
2016-03-08 20:34:39 +01:00
michalprusa 4ce950c994 Minor tweeks
Magic constants moved to one place, fixed gcode for reseting Live
adjusting Z
2016-03-08 16:24:50 +01:00
michalprusa feb82d42eb M119 report fixed and added new gcode
Fixed reporting enstop status and added PRUSA LiveZ to reset live Z
adjusting
2016-02-25 12:27:08 +01:00
michalprusa 12cce64f90 Variants name changed for better readability and match command reply 2016-02-21 18:12:32 +01:00
Josef Prusa f8c65e39ae Reorginized the repository and added license 2016-02-21 15:02:31 +01:00