Commit Graph

1158 Commits

Author SHA1 Message Date
Robert Pelnar ebd8375313 New ML support - external flash W25X20CL - upgrade is working!!! (hardcoded to german)
+print test (LT_PRINT_TEST)
2018-06-09 17:49:41 +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
XPila 31357379ff
Merge branch 'MK3' into time_remaining 2018-06-08 18:31:32 +02:00
XPila 8963757c3c
Merge branch 'MK3' into crash_detection_stop 2018-06-08 18:28:43 +02:00
PavelSindler 5e120e6e52 power panic flow factor hotfix 2018-06-08 18:13:50 +02:00
PavelSindler 332a23bef5 Crash detection stops and waits for user if it fails multiple times in short time frame 2018-06-08 16:08:07 +02:00
Robert Pelnar 70bb851c62 New ML support - added missing file 2018-06-08 15:38:16 +02:00
XPila 739de5224e
Merge branch 'MK3' into MK3-new_lang 2018-06-08 14:38:00 +02:00
Robert Pelnar e69fd05fce Optimized LiquidCrystal class
removed dependecies to arduino Print and String classes
spared 522 bytes of flash and 84bytes of ram
2018-06-08 14:35:47 +02:00
3d-gussner c29042dead Fix warning:
Another fix from PR https://github.com/prusa3d/Prusa-Firmware/pull/138 and discussed in Issue https://github.com/prusa3d/Prusa-Firmware/issues/807

Ardunio IDE 1.6.8 and 1.8.5 result with Compiler warnings set to "More" or "All"
´´´
sketch\mesh_bed_calibration.cpp: In function 'sample_mesh_and_store_reference':

sketch\mesh_bed_calibration.cpp:2852:53: warning: 'zmax' may be used uninitialized in this function [-Wmaybe-uninitialized]

                 zmax = min(zmax, mbl.z_values[j][i]);

                                                     ^

sketch\mesh_bed_calibration.cpp:2848:15: note: 'zmax' was declared here

         float zmax = zmax;

               ^

´´´
2018-06-08 10:13:43 +02:00
Robert Pelnar 37f82118c8 New ML support - lang select menu fix 2018-06-08 02:03:25 +02:00
Robert Pelnar 59e65b7f47 New ML support - language select menu
+cond. translation for W25X20CL
2018-06-08 01:19:49 +02:00
Robert Pelnar bd1e410228 New ML support - W25X20CL external spi flash support 2018-06-08 00:20:28 +02:00
PavelSindler 877f8f2a61
Merge pull request #795 from 3d-gussner/MK3_fix5
Fix warning: This is kind of important
2018-06-07 22:22:54 +02:00
PavelSindler a15f0138de show estimated time to end of the print if available in gcode: initial version 2018-06-07 20:50:30 +02:00
PavelSindler 42cfcb2601
Merge pull request #794 from stahlfabrik/M860-enhanced
Improved M860 - now wait for cooling of PINDA, too
2018-06-06 12:01:06 +02:00
Marek Bel eb1d17c3c6 Compile without c++11. 2018-06-05 21:55:54 +02:00
XPila 1290326210
Merge pull request #790 from PavelSindler/power_panic_flow_rate
power panic: extruder_multipliers added
2018-06-05 20:58:15 +02:00
XPila 6a8425f62d
Merge pull request #809 from mkbel/Use_Timer
Use timer
2018-06-05 20:54:41 +02:00
XPila 7f7f1e4560
Merge pull request #808 from zavorka/MK3
Eliminated the -Wliteral-suffix warnings from ultralcd.cpp
2018-06-05 20:53:03 +02:00
PavelSindler d49c4508a7 removing some debug code 2018-06-05 20:39:42 +02:00
PavelSindler 264daaf715 typo fixed 2018-06-05 20:33:05 +02:00
PavelSindler aacaf67eaa Crash detection/filament sensor: restore print from stored line number in case that we are printing over USB, retraction fix; debug: cmd queue on LCD 2018-06-05 20:28:41 +02:00
Marek Bel 01af8a806b Merge branch 'MK3' into Use_Timer 2018-06-05 19:03:11 +02:00
Marek Bel f819392d10 Do not create static object in function. Saves 8B RAM and 16B flash, because there is no need to guard constructor against concurrent calls. 2018-06-05 18:38:25 +02:00
Marek Bel 7cc8b743c2 Add .gitignore. Setup doxyfile. Create project documentation main page. Document property of static object constructors on gcc-avr. 2018-06-05 18:30:02 +02:00
Marek Bel 75f048ac4b Add default doxyfile. 2018-06-05 18:23:48 +02:00
Marek Bel 5f033d5a1a Do not create static object in global function. Saves 8B RAM and 14B flash, because there is no need to guard constructor against concurrent calls. 2018-06-05 17:47:18 +02:00
Roman Beránek e25b869b5e
Eliminated the -Wliteral-suffix warnings from ultralcd.cpp 2018-06-05 13:49:58 +02:00
PavelSindler 746ac17e4e debugging 2018-06-04 16:40:56 +02:00
Robert Pelnar 47c68c884c New ML support - fixed duplicate strings 2018-06-01 14:35:03 +02:00
Robert Pelnar 53d9d8bd8a New ML support - lang codes
+script tunning
2018-06-01 10:47:47 +02:00
3d-gussner 5004433b20 Fix warning: This is kind of important
Again another fix from https://github.com/prusa3d/Prusa-Firmware/pull/138 made by @Thess for the MK2 branch which i think is quite important.

Ardunio IDE 1.8.5 result with Compiler warnings set to "More" or "All"
```
sketch\Marlin_main.cpp:3265:44: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]

               if((echange<-MIN_RETRACT && !retracted) || (echange>MIN_RETRACT && retracted)) { //move appears to be an attempt to retract or recover

                                            ^

sketch\Marlin_main.cpp:3265:82: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]

               if((echange<-MIN_RETRACT && !retracted) || (echange>MIN_RETRACT && retracted)) { //move appears to be an attempt to retract or recover

                                                                                  ^

sketch\Marlin_main.cpp:3268:28: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]

                   retract(!retracted);

                            ^

sketch\Marlin_main.cpp:3870:15: warning: statement has no effect [-Wunused-value]
```

I don't know if that helps making small pull requests as they are easier to review or it would make sense to combine few more.

Prusa should really review this pull [request](https://github.com/prusa3d/Prusa-Firmware/pull/138) again for the MK3 branch, as it was one that made warnings disapear in the MK2 branch and made finding new flaws in the code much much easier.
2018-06-01 10:17:03 +02:00
Robert Pelnar 5a2b056d47 Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang 2018-06-01 00:43:16 +02:00
Christoph Stahl 7c4fce7876 whitespace correction 2018-05-31 18:55:14 +02:00
Christoph Stahl 73708ec883 Improved M860 - now wait for cooling of PINDA, too
The M860 - wait for PINDA temperature - gcode has been improved. Until now it could only wait until the PINDA has been warmed up to a set temperature. Now it also can wait until the PINDA has cooled down to a set temperature. The calling syntax has not been changed at all. The logic now looks if the bed or hotend have a target temperature different from 0. If so, the code waits until PINDA has warmed up. Otherwise it waits until PINDA has cooled down.

Applications:
- Possibility to start a Print at exactly the right PINDA temperature. (Do not start the heater until PINDA is cooled down)
- Much easier manual temperature calibration (automating the wait for cool down in between calibration runs)
- Possibility for temp calibration verification on one heat bed by printing multiple objects with different PINDA temperatures one after the other
2018-05-31 16:41:59 +02:00
XPila 957b3cfac5
Merge pull request #783 from 3d-gussner/MK3_fix1
Fixed redefined warning
2018-05-31 14:21:41 +02:00
XPila d70d38bb0c
Merge pull request #784 from 3d-gussner/MK3_fix2
Fixed unused variable c as in pull request #138
2018-05-31 14:15:17 +02:00
XPila 80c641ae5d
Merge pull request #789 from 3d-gussner/MK3_fix4
Fixed warning: invalid suffix on literal; C++11 requires a space betw…
2018-05-31 14:09:49 +02:00
tarikku 731fef3d32 Fix remaining forgotten comments 2018-05-30 23:15:01 +02:00
Robert Pelnar 77f3160531 language.h - debug output conditional translation 2018-05-30 20:15:43 +02:00
Robert Pelnar 37e575f4bc New ML support - debug output, bootloader
bootapp - automaticaly erase flash when necessary
+test code
2018-05-30 19:29:52 +02:00
PavelSindler 9104b0601a power panic: extruder_multipliers added 2018-05-30 18:59:33 +02:00
3d-gussner eeca0f683b Fixed warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 2018-05-30 16:06:22 +02:00
PavelSindler 3bf47d7f83 "run xyz cal first" message 2018-05-30 15:29:59 +02:00
PavelSindler dcb77e8c7e Merge remote-tracking branch 'upstream/MK3' into temp_cal_coordinates_fix 2018-05-30 15:22:20 +02:00
PavelSindler 987f8969c0 Merge remote-tracking branch 'upstream/MK3' into temp_cal_coordinates_fix 2018-05-30 15:20:40 +02:00
PavelSindler 72a382b34d fix in macro definition 2018-05-30 15:07:24 +02:00
PavelSindler 2561ab9c7d
Merge pull request #786 from XPila/MK3-new_lang
Mk3 new lang
2018-05-30 14:54:47 +02:00
Robert Pelnar 3e29312b41 fixed compilation (c++11) 2018-05-30 14:53:14 +02:00
3d-gussner d8706be8de Fixed forgotten comment 2018-05-30 13:39:24 +02:00
3d-gussner dce2d45499 Fixed forgotten comment 2018-05-30 13:35:48 +02:00
3d-gussner 2f9b63275f Fixed unused variable c as in pull request #138 2018-05-30 13:26:31 +02:00
3d-gussner 167bc61ef9 Fixed redefined warning 2018-05-30 12:57:51 +02:00
Robert Pelnar 4746c77195 New ML support - bootloader support and update proces test 2018-05-29 21:03:47 +02:00
Robert Pelnar 0ddb31d4eb Removed hexfile 2018-05-29 17:28:33 +02:00
Robert Pelnar b47a29b388 New ML support - fixed invalid characters, added some cz translations 2018-05-29 15:56:00 +02:00
PavelSindler d307868a90 merge with upstream 2018-05-28 20:38:55 +02:00
PavelSindler 26724c4a48 removed message 2018-05-28 20:31:57 +02:00
PavelSindler 7e79ce8e53 MK3: crash detection for Z axis is active during auto home and mesh bed leveling (normal mode is forced for Z movents); temp cal coordintes corrections; temp cal: xy movents always in safe Z distance from heatbed, Z-axis homing improved 2018-05-28 20:26:15 +02:00
Robert Pelnar b3f4e1f6e4 New ML support - language menu 2018-05-28 19:41:16 +02:00
Robert Pelnar baa66a0887 New ML support - secondary language name, language selection 2018-05-28 17:14:55 +02:00
Robert Pelnar 3bf2552b6c fixed #761 from hzapper (#elif instead of #else if) 2018-05-28 13:41:36 +02:00
XPila 28a767b460
Merge pull request #760 from PavelSindler/safety_timer_fixes
Safety timer not active during filament runout procedure
2018-05-28 13:28:24 +02:00
PavelSindler 58ae70c4e1
Merge branch 'MK3' into MK3-new_lang 2018-05-28 13:22:14 +02:00
Robert Pelnar 15207e4d5e Linearity correction fix - (eeprom storage changed to byte instead of word)
+enabled for XYZ axes
2018-05-28 01:47:08 +02:00
Robert Pelnar def9ab56f6 New ML support - language.c - fixed return origial string for zero length translation 2018-05-27 16:24:21 +02:00
Robert Pelnar 55157640c5 New ML support - czech version is working!!!
postbuild.sh, make_lang.sh - fixed (id and offset calculation)
language.c, language.h - fixed (==||==)
config.h - reserved space for _SEC_LANG changed
Marlin_main.cpp - debug output + hardcoded lang_select(1) //means cz
2018-05-27 15:14:04 +02:00
PavelSindler 2ffb95c72a bugfix: use absolute coordinates for steel sheet removal position, because there is no homing at the beginning of calibration in case that position is already known 2018-05-24 20:28:00 +02:00
PavelSindler 64f7272ea7 M27: returns print saved (fixes setting temperatures to zero during crash detection) 2018-05-24 18:49:35 +02:00
Robert Pelnar 2cf20c8c99 New ML support - migration - fix_source_1.sh script (replace 'MSG_xx' with '_T(MSG_xx)')
+ output + fixed source
2018-05-23 16:37:08 +02:00
Robert Pelnar da3432e237 New ML support - changed _SEC_LANG reserved space to 10kb, added debug code 2018-05-23 16:11:12 +02:00
Robert Pelnar f00a9ce636 New ML support - language.c, language.h - code fixed, Marlin_main.cpp - debug output 2018-05-23 15:46:08 +02:00
Robert Pelnar d979c3dffc New ML support - messages.c - some strings fixed 2018-05-23 14:18:37 +02:00
PavelSindler 0091b41fb5
Merge pull request #744 from PavelSindler/M860_fix
M860 fix: send busy messages
2018-05-23 13:15:46 +02:00
Robert Pelnar 7e3f675469 New ML support - migration - fixed some messages
all variants verified according to lang_en.txt (release only)
config.h updated (enabled ML support)
2018-05-22 20:30:55 +02:00
PavelSindler 8c9b670c76
Merge pull request #746 from MRprusa3d/MK3
menu returns corrections
2018-05-22 16:08:08 +02:00
PavelSindler 137e1c5027 whitespace 2018-05-22 13:33:31 +02:00
PavelSindler d63a17c696 Safety timer not active during filament runout detection 2018-05-22 13:31:21 +02:00
Robert Pelnar bd587faab9 New ML support - migration - replaced source, removed original ML support files (backup) 2018-05-22 03:20:03 +02:00
Robert Pelnar 8573b65b05 _MIN_ENDSTOP_INVERTING redefinition in variant files (constant -> define) 2018-05-21 23:28:28 +02:00
XPila a184d2b824
Merge pull request #756 from XPila/MK3-new_lang
Mk3 new lang
2018-05-20 13:26:28 +02:00
Robert Pelnar a528f8837c Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang 2018-05-20 13:24:52 +02:00
Robert Pelnar 5b015907aa New localization - macro declarations fixed 2018-05-20 13:15:46 +02:00
Robert Pelnar 9b7eeaecaa version changed 2018-05-18 14:42:35 +02:00
Marek Bel 503d5551e6 Fix build of MK2. Global variable distance_from_min was removed, do not update it.
Expression
float y = vec_x[1] * pgm_read_float(bed_ref_points_4+mesh_point*2) + vec_y[1] * pgm_read_float(bed_ref_points_4+mesh_point*2+1) + cntr[1];
is identical with expression in count_xyz_details().
2018-05-16 18:40:36 +02:00
PavelSindler 3eb21b65ed wizard fix: don't reset calibration status when repeating first layer cal. 2018-05-15 23:19:23 +02:00
MRprusa3d 83aa710da6 menu returns corrections
Settings::FilamentSensor & FilamentAutoload

removing Calibration::ShowEndStops @ MK3
2018-05-15 20:23:22 +02:00
PavelSindler c59e9bd6be M860 fix: send busy messages 2018-05-15 18:27:25 +02:00
PavelSindler 553779a65d
Merge pull request #723 from mkbel/refactor_bed_geometry
Refactor bed geometry
2018-05-14 17:18:03 +02:00
Marek Bel b71a29ad96 Use ShortTimer instead of long_press_timer global variable. 2018-05-11 17:05:12 +02:00
Marek Bel 02ecd08786 Convert Time class to template, instantiate LongTimer for longer and ShortTimer for shorter periods. 2018-05-11 16:31:42 +02:00
Marek Bel 07a7ce1acf Remove unused lcd_ping_allert(). 2018-05-11 15:09:27 +02:00
Marek Bel e8730c2899 Merge branch 'MK3' into read_xyz_cal
# Conflicts:
#	Firmware/ultralcd.cpp
2018-05-10 18:31:31 +02:00
Marek Bel 329ea199ec Show measured bed offset from expected position even if not homed. Remove redundant lcd_quick_feedback() calls. 2018-05-10 18:24:49 +02:00
PavelSindler dd89226537
Merge pull request #722 from MRprusa3d/MK3
build instructions update
2018-05-10 14:44:55 +02:00
PavelSindler 2bfc7475a8 version changed 2018-05-09 18:58:24 +02:00
Marek Bel 2a5a7ab9d2 Add bed calibration points macro definitions to MK25 variants.
Homing and full print area printing tested on MK25.
2018-05-09 17:09:57 +02:00
Robert Pelnar 59f3f9d8ec New localization - includes fixed 2018-05-09 16:55:41 +02:00
MRprusa3d 80efafd7b9 menu returns corrections
Statistics

Calibration::ShowEndStops

Support::ExtruderInfo
Support::BeltStatus
Support::Temperatures
Support::Voltages
2018-05-09 00:27:32 +02:00
Marek Bel f00bde09a4 Re-factor bed calibration point coordinates to match bed CAD data. Tested successfully on MK3 (auto home position not calibrated and calibrated printer and print area position of calibrated printer). MK25 not tested. 2018-05-08 21:54:11 +02:00
PavelSindler 737cb9608c
Merge pull request #716 from mkbel/calibrate_Z_via_live_adjust
Set calibration status to calibrated also by using live adjust Z.
2018-05-04 16:40:34 +02:00
Marek Bel c359d11858 Do not disable bed heating, when the print is paused.
Also remove duplicate handleSafetyTimer() call.
2018-05-04 15:21:22 +02:00
Marek Bel 1d7b3ea2de Set calibration status to calibrated also by using live adjust Z.
This fixes problem, that if the first layer calibration is never done, live adjusting Z during printing is not applied after printer reset. Also repeatedly using live adjust Z on uncalibrated printer leads to steadily decreasing meaningless stored live adjust Z value.
2018-05-03 22:03:38 +02:00
PavelSindler 777beac66a
Merge pull request #713 from PavelSindler/fan_error_fix
fan error synchronization with planner
2018-05-03 16:01:00 +02:00
PavelSindler cd3851e175
Merge pull request #715 from MRprusa3d/MK3
Mk3
2018-05-03 14:54:43 +02:00
MRprusa3d 8a92d9b6a3 MaR::180501b 2018-05-02 23:49:21 +02:00
MRprusa3d d02333918f MaR::180501 2018-05-02 22:13:47 +02:00
Marek Bel 72364648dd Hot fix: Can not move X and Y axis in stealth mode, when the printer is not homed.
Disable endstops in move axis menu.
2018-05-02 20:50:47 +02:00
PavelSindler d86d1beeaa fan error synchronization with planner 2018-05-02 16:16:48 +02:00
XPila 3d595cc523
Merge pull request #712 from XPila/MK3-V3_2
Mk3 v3 2
2018-05-02 13:43:07 +02:00
Robert Pelnar 964d019dd1 MK3 - extruder current = 30 2018-05-02 13:42:05 +02:00
PavelSindler 420d1079af terminate temperature calibration in case that Z probing function returns false 2018-04-30 17:51:44 +02:00
PavelSindler b691225d0b
Merge pull request #701 from XPila/MK3-V3_2
Decreased stallguard sensitivity for Z axis because meshbedleveling f…
2018-04-30 16:58:18 +02:00
Robert Pelnar 1fc3f9816c Merge remote-tracking branch 'upstream/MK3' into MK3-V3_2 2018-04-30 16:29:02 +02:00
Robert Pelnar 47868145e6 Decreased stallguard sensitivity for Z axis because meshbedleveling failed on some printers (PFW298). 2018-04-30 16:28:26 +02:00
PavelSindler e2b3553aee
Merge pull request #689 from PavelSindler/MK3_for_merging
version change
2018-04-27 20:01:37 +02:00
PavelSindler e1b95ed2a7 version change 2018-04-27 19:59:22 +02:00
PavelSindler 12dda6a6ca
Merge pull request #688 from PavelSindler/MK3_for_merging
MK3 variants file change
2018-04-27 18:41:49 +02:00
PavelSindler 068ee08454 MK3 variants file change 2018-04-27 18:41:00 +02:00
PavelSindler 2a57325bd5
Merge pull request #685 from mkbel/add_safety_timer_notice
Show full screen blocking notification message after heater turned off
2018-04-27 17:24:33 +02:00
PavelSindler 2b42db8ace
Merge pull request #687 from PavelSindler/MK3_for_merging
M861: steps value for 35C
2018-04-27 17:24:18 +02:00
PavelSindler 265d4761a3 M861: steps value for 35C 2018-04-27 17:07:10 +02:00
Robert Pelnar e69134eb1c Rambo 1.0 support (MK25, MK2) 2018-04-27 17:04:55 +02:00
Marek Bel eced66f0f6 Show full screen blocking notification message after heater turning off by safety timer. 2018-04-27 16:23:20 +02:00
PavelSindler 6fb0fa1458 variants for MK3: temporary change 2018-04-27 15:19:28 +02:00
PavelSindler 99be28d335 variants file: force selftest enabled again 2018-04-27 14:59:56 +02:00
PavelSindler 986f9fd3a6 selftest correction 2018-04-27 14:49:37 +02:00
PavelSindler acd308e3d4 safety timer prolonged to 30 minutes 2018-04-27 14:03:09 +02:00
PavelSindler ce855f30e2
Merge pull request #678 from PavelSindler/calibrate_autohome
MK3 selftest: move Z axis higher before calibrating autohome
2018-04-27 13:35:45 +02:00
PavelSindler 9e0e152279
Merge pull request #674 from mkbel/hot_fix_print_area_crop
Hot fix print area crop on MK3.
2018-04-27 13:35:31 +02:00
PavelSindler 254804cc8d MK3 selftest: move Z axis higher before calibrating autohome 2018-04-27 09:23:56 +02:00
Marek Bel 75075bed31 Hot fix print area crop on MK3. Move print area -2mm in Y axis (Y_PROBE_OFFSET_FROM_EXTRUDER to 3). Do not limit print area for skewed axis (increase Y_MAX_POS to 212.5). Preserve Z homing point for uncalibrated printer (DEFAULT_Y_OFFSET to 2.f). 2018-04-26 22:01:28 +02:00
XPila aeca8cbf69
Merge pull request #671 from PavelSindler/temp_comp_unsigned
M861 update: unsigned values
2018-04-26 21:07:45 +02:00
PavelSindler 84d5771845
Merge pull request #670 from XPila/MK3-V3_2
XYZcal - findpointcenter starting Z coordinate down by 50um
2018-04-26 19:56:50 +02:00
PavelSindler e7cf68e038 whitespace 2018-04-26 19:27:07 +02:00
PavelSindler 2dd0d84845 M861: usteps and z_shift variables correction 2018-04-26 19:14:28 +02:00
PavelSindler 9c3e0aab36 M861 update: use signed values 2018-04-26 18:55:08 +02:00
Robert Pelnar d50dd9a6e9 XYZcal - findpointcenter starting Z coordinate down by 50um 2018-04-26 18:41:56 +02:00
Marek Bel ab68221976 Always show XYZ cal. details menu. 2018-04-26 16:36:03 +02:00
Marek Bel 1a80fc28e8 Add zero point offset information support menu.
Note: XYZ menu is shown only if not printing and printer must me homed to show non-zero value.
2018-04-26 16:36:03 +02:00
Marek Bel b6888470cf Save 42 bytes of flash by removing duplicate string "--------------------". 2018-04-26 16:36:02 +02:00
Marek Bel c1dd269a92 Fix missing degree symbol after returning to status screen. Those lcd_set_custom_characters* calls were redundant. 2018-04-26 16:36:02 +02:00
Marek Bel d6aa149cfa Conserve 58 bytes of flash by returning by reference. 2018-04-26 16:36:02 +02:00
Marek Bel ae08788c99 Split lcd_service_mode_show_result screens to separate functions. Make them non blocking. Remove global array distance_from_min, pass it as function return value. Make Support submenus returning to Support menu. 2018-04-26 16:36:02 +02:00
PavelSindler 2657d3febd MK25: SILENT_MODE_NORMAL changed to SILENT_MODE_POWER 2018-04-26 15:12:45 +02:00
PavelSindler 14cf4abb64
Merge pull request #668 from XPila/MK3-V3_2
Timer in autoloadmenu - dirty hack (unable to compile under 4.8.1)
2018-04-26 14:53:49 +02:00
PavelSindler 84a53370d3 temporary change in MK3 variants file: disable forced selftest 2018-04-26 14:50:16 +02:00
Robert Pelnar f64d266c89 Timer in autoloadmenu - dirty hack (unable to compile under 4.8.1) 2018-04-26 14:50:01 +02:00
PavelSindler 4681361883 correction in M27 message 2018-04-26 11:50:48 +02:00
PavelSindler 9a6cc8a035
Merge pull request #664 from MRprusa3d/MK3
Mk3
2018-04-25 22:20:45 +02:00
PavelSindler cf0c83a6c1 M27 fix 2018-04-25 21:23:38 +02:00
MRprusa3d 7e462b3224
Merge branch 'MK3' into MK3 2018-04-25 19:15:36 +00:00
MRprusa3d 2f49574822
Add files via upload 2018-04-25 18:48:15 +00:00
MRprusa3d 0b6644915a
Add files via upload 2018-04-25 18:47:19 +00:00
PavelSindler d85a8077a8 M115 update 2018-04-25 20:39:10 +02:00
PavelSindler e7ad81e159
Merge pull request #660 from mkbel/fix_z_home_point
Update documentation of mesh_bed_calibration.cpp.
2018-04-25 17:27:22 +02:00
PavelSindler d2736fdacf
Merge pull request #662 from mkbel/fix_return_autoload
Return from Autoload filament and Load filament menu item to parent m…
2018-04-25 17:26:56 +02:00
Marek Bel f207145752 Return from Autoload filament and Load filament menu item to parent menu.
Exception is Load filament, when temperature is sufficient to load filament, in such case, load filament is started and GUI returns to status screen.
2018-04-25 16:51:35 +02:00
Robert Pelnar 0271ab3643 Meshbedleveling, calibration Z
check crash Z (MK3)
 check deviation of Z-probe (>50um == error, all printers)
kill with message "debris on nozzle..."
2018-04-25 16:19:16 +02:00
Robert Pelnar 5f12289339 CalibrationZ/MK3 - check crash Z after homeaxis (kill with message "debris on nozzle...") 2018-04-25 14:43:32 +02:00
Marek Bel 3abfeb831f Update documentation of mesh_bed_calibration.cpp. 2018-04-25 12:21:20 +02:00
XPila 5bb9451b5d
Merge pull request #658 from XPila/MK3-V3_2
Meshbedleveling/MK3 - check crash Z after homeaxis (kill with message…
2018-04-24 20:54:53 +02:00
Robert Pelnar 1553e99d8e Meshbedleveling/MK3 - check crash Z after homeaxis (kill with message "debris on nozzle...") 2018-04-24 20:12:29 +02:00
PavelSindler 5a9cc39562
Merge pull request #654 from XPila/MK3-V3_2
New current setting for MK3
2018-04-24 17:10:19 +02:00
PavelSindler f9d64bdfb1
Merge pull request #655 from mkbel/fix_z_home_point
Fix z home point
2018-04-24 16:51:57 +02:00
XPila 79b9f736aa
Merge pull request #657 from PavelSindler/temp_cal_update
Temp calibration update
2018-04-24 15:16:13 +02:00
PavelSindler 8efe66ef99 remove tab 2018-04-24 14:34:49 +02:00
PavelSindler ffe93b2ca9 whitespace correction 2018-04-24 14:33:48 +02:00
PavelSindler cc74edfa13 whitespace 2018-04-24 14:23:52 +02:00
PavelSindler 010ceceff9 add another homing after steel sheet is removed; added timeout for pinda cooling; if PINDA doesn't trigger before reaching Z = -1mm, temp. calibration fails 2018-04-24 13:43:51 +02:00
Marek Bel 468645e92e Set DEFAULT_Y_OFFSET to 4 mm for MK3 printer. 2018-04-23 20:34:04 +02:00
Marek Bel 37ebe5c35d Move default correction matrix of not calibrated printer to world2machine_default() function. Use world2machine_reset() to uncorrected matrix. Call it from world2machine_revert_to_uncorrected() and from world2machine_default() if there is no default shift to remove code duplication. 2018-04-23 20:33:39 +02:00
Marek Bel 9bd4d580d7 Use right calibration point. This change is only formal, as both original and new point have same coordinates. 2018-04-23 20:33:25 +02:00
Marek Bel cccd8246ab Fix world2machine(const float &x, const float &y, float &out_x, float &out_y) not using input parameters if only WORLD2MACHINE_CORRECTION_SHIFT is applied. 2018-04-23 20:33:14 +02:00
Robert Pelnar 864284f043 New current setting for MK3
X, Y: no change
Z: +26.1%
E: -28.5%
2018-04-23 20:17:45 +02:00
PavelSindler 2467b19dd2
Merge pull request #647 from XPila/MK3-V3_2
XYZ cal fix (better histogram processing)
2018-04-23 14:54:23 +02:00
Marek Bel 82b31e8552 Set [0;0] point offset for uncalibrated printer. 2018-04-20 15:01:11 +02:00
Robert Pelnar 65aa62ebab XYZ cal fix (better histogram processing) 2018-04-20 13:17:18 +02:00
PavelSindler 043c8c66be waiting for pinda probe cooling 2018-04-19 16:55:00 +02:00
Marek Bel 31ae097dba mesh bed leveling / auto home Y coordinates updated 2018-04-18 17:09:12 +02:00
PavelSindler 5791d9f0d8 EEPROM address conflict fix; forcing selftest can happen only in case that we have TMC2130 drivers 2018-04-18 14:17:28 +02:00
PavelSindler cf99808aef
Merge pull request #624 from mkbel/update_version
Update version.
2018-04-13 19:55:21 +02:00
Marek Bel af6c1f8acb Update version. 2018-04-13 19:53:51 +02:00
PavelSindler b90e8999df
Merge pull request #623 from mkbel/fix_safety_timer
Fix safety timer.
2018-04-13 19:43:36 +02:00
Marek Bel c88f0108af Fix safety timer.
Constant parameter greater than 16 bits must by stated as unsigned long.
2018-04-13 19:30:08 +02:00
PavelSindler c5af3aaaf2
Merge pull request #622 from mkbel/fix_menu_return_fail_stats
Fix returning from Fail stats menu.
2018-04-13 18:35:03 +02:00
Marek Bel 6f985d23d6 Fix returning from Fail stats menu. 2018-04-13 17:20:30 +02:00
Marek Bel 03d03aeac4 Return to main menu from filament unloading. 2018-04-13 16:51:47 +02:00
mkbel e4a4c88be9
Merge pull request #615 from PavelSindler/selftest_MK25_fix
selftest for MK2.5: fan error fix
2018-04-13 13:59:15 +02:00
PavelSindler f3209e1aec fixed possible feedmultiply change cause by entering main menu with negative encoder position 2018-04-13 10:27:55 +02:00
PavelSindler b1bb6841c9
Merge pull request #617 from mkbel/fix_farm_reset_1
Fix farm reset
2018-04-13 10:02:54 +02:00
PavelSindler 5f3fed33cf
Merge pull request #613 from MRprusa3d/MK3
Add files via upload
2018-04-13 10:02:44 +02:00
Marek Bel 388d6eea36 Fix printer resets in farm mode if command "PRUSA SN" is received and 32U2 processor is not responding. 2018-04-12 18:44:33 +02:00
Marek Bel 08740356b8 Move "PRUSA SN" gcode to separate function. 2018-04-12 18:41:11 +02:00
PavelSindler 591cb881cc selftest: false fan error fix, added message in case that manual fan error fails 2018-04-12 18:24:30 +02:00
MRprusa3d d09f190c2b
Add files via upload 2018-04-11 18:48:50 +00:00
PavelSindler 78245ce566
farm preheat temperature for heatbed 2018-04-11 18:54:27 +02:00
PavelSindler e150d502ac removed configuration_prusa 2018-04-11 18:49:42 +02:00
PavelSindler 53d903e600
Merge pull request #610 from MRprusa3d/MK3
Add files via upload
2018-04-11 18:46:18 +02:00
XPila 6b5835fd9f
Merge pull request #612 from PavelSindler/M861_gcode
M861 gcode, temp cal is automaticly activated after calibration process
2018-04-11 18:45:57 +02:00
PavelSindler 45d1dbbfe0 temp cal. active set to false 2018-04-11 18:37:07 +02:00
PavelSindler ce66699340 dont use default temp table for new printers and dont automaticly activate temp. cal. (new pinda probes have different characteristics) 2018-04-11 18:36:38 +02:00
PavelSindler 52de4891fe typo fixed 2018-04-11 18:32:27 +02:00
PavelSindler 47eab97d2d temp. calibration is automaticly activated after calibration process 2018-04-11 18:16:16 +02:00
PavelSindler 0ba7850146 pinda temp table changed back 2018-04-11 17:40:04 +02:00
XPila c69524c3fb
Merge pull request #611 from XPila/MK3-V3_2
removed Configuration_prusa.h
2018-04-11 17:33:37 +02:00
Robert Pelnar 89efcb84b1 removed Configuration_prusa.h
fixed - compilation for MK25
2018-04-11 17:32:31 +02:00
PavelSindler 919fba531a wait for PINDA gcode changed 2018-04-11 16:48:47 +02:00
MRprusa3d c8f1c55ec0
Add files via upload 2018-04-11 14:41:41 +00:00
PavelSindler f70685a92d
Merge pull request #542 from stahlfabrik/MK3_PINDA_TEMP_WAIT_GCODE
MK3 Add Gcode to wait for minimum PINDA temp
2018-04-11 16:40:21 +02:00
PavelSindler 1e1531a4f8
Merge pull request #608 from MRprusa3d/MK3
Mk3
2018-04-11 16:37:34 +02:00
Robert Pelnar 8da2330b93 FSensor PAT9125 - i2c ACK check + two attempts in init function (PFW).
ultralcd_implementation_hitachi - fixed link
2018-04-11 16:03:54 +02:00
MRprusa3d 716f1c63bf
Add files via upload 2018-04-10 18:08:57 +00:00
MRprusa3d 6b77e68924
Add files via upload 2018-04-10 18:07:08 +00:00
PavelSindler 02fda70529 farm mode: preheat menu updated 2018-04-10 14:07:44 +02:00
Robert Pelnar da43aa0250 XYZ calibration tunning 2018-04-04 20:03:39 +02:00
Robert Pelnar 3b26e1635a XYZcal - better filtering. 2018-04-03 20:10:50 +02:00
Robert Pelnar 630041ecb2 XYZcal - threshold changed from 32 to 16 2018-04-03 18:49:15 +02:00
Robert Pelnar 339d2ebdef Z-axis stealth mode
XYZcal fix
2018-04-03 18:26:39 +02:00
Robert Pelnar 869a99d8ad XYZ calibration - diagonal find_point_center 2018-04-03 15:05:57 +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
Robert Pelnar baade7db61 Removed unused files (ST7565R-dogm, digipot)
renamed functions digipot_init and digipot_current
fixed cond. trans. (menus)
fixed variant files - MK25, MK3
2018-03-29 23:01:13 +02:00
XPila dba2fd7e75
Merge pull request #589 from XPila/MK3-V3_2
New SPI, LiquidCrystal renamed
2018-03-29 18:20:29 +02:00
Robert Pelnar 363a9d24b3 LiquidCrystal class renamed to LiquidCrystal_Prusa 2018-03-29 17:50:43 +02:00
Robert Pelnar 186e630299 New SPI (do not use Arduino SPI class)
saved ~300bytes flash, 4bytes ram
2018-03-29 17:42:41 +02:00
Marek Bel cedb30303f Add possible action on menu item back. This fixes broken Merge pull request #586 from mkbel/ustep_linearity_2 06d5ec5. 2018-03-29 11:42:44 +02:00
XPila d5636fd023
Merge pull request #585 from PavelSindler/farm_mode_MK3
checking if file is complete temporarily not active in farm mode
2018-03-28 19:39:00 +02:00
XPila 06d5ec5659
Merge pull request #586 from mkbel/ustep_linearity_2
Ustep linearity
2018-03-28 19:38:34 +02:00
XPila ffdd11e960
Merge pull request #587 from XPila/MK3-V3_2
Mk3 v3 2
2018-03-28 19:38:20 +02:00
Robert Pelnar bde097cad1 bugfix - PFW233 - first homing in silent mode Y crash. 2018-03-28 19:22:20 +02:00
Marek Bel 9cb036fbcb Merge remote-tracking branch 'prusa3d/MK3' into ustep_linearity_2 2018-03-28 19:11:02 +02:00
Marek Bel 40a064ffbc Add extruder linearity correction to settings menu. 2018-03-28 18:53:37 +02:00
PavelSindler 6e15a77c9b preheat menu update 2018-03-28 17:50:16 +02:00
PavelSindler 95e751dd65 farm mode: preheat menu update 2018-03-28 17:04:46 +02:00
PavelSindler 2c3c6c54f3 checking if file is complete temporarily not active in farm mode 2018-03-28 17:00:17 +02:00
Robert Pelnar 8ba83a9789 bugfix - PFW226 - selftest error 2018-03-28 16:13:54 +02:00
Marek Bel 678cd17e7b Increase size of EEPROM_TMC2130_WAVE_*_FAC to 16 bits. 2018-03-28 16:13:16 +02:00
Robert Pelnar cf43b85de9 XYZ calibration - accuracy improvement 2018-03-27 17:27:41 +02:00
Marek Bel 57bbb0e17d Fix wraparound from lowest value to highest value in menu value edit. 2018-03-26 20:25:23 +02:00
Marek Bel 397e7d4791 Increase resolution of wave factor. 2018-03-26 15:17:06 +02:00
XPila 903dce9716
Merge pull request #576 from PavelSindler/MK3_for_merging
stealth mode / silent mode
2018-03-23 20:42:08 +01:00
PavelSindler 2ce75293f3 stealth mode / silent mode 2018-03-23 19:49:59 +01:00
XPila 5a7e76e02b
Merge pull request #575 from PavelSindler/adc_pins
Adc pins, pinda temp table
2018-03-23 19:36:23 +01:00
PavelSindler dc32bd24fc correction 2018-03-23 18:20:55 +01:00
PavelSindler 2d30261976 bed voltage menu hidden 2018-03-23 16:49:06 +01:00
PavelSindler 7ad6fb526c typo removed 2018-03-23 15:53:44 +01:00
PavelSindler 78f9f6b611 use defines for adc pins, temp table for PIDNA update 2018-03-16 11:01:06 +01:00
PavelSindler e5faba7226 serial port set back (was previously changed for debugging purposes) 2018-03-15 14:42:03 +01:00
PavelSindler 08ec920d33 merge with upstream 2018-03-15 14:25:17 +01:00
Marek Bel 3d299cc412 Document. 2018-03-14 21:05:47 +01:00
Robert Pelnar 4bc1671953 version=3.2.0-alpha buildnumber=370 repository=Unknown 2018-03-14 16:33:50 +01:00
Robert Pelnar 67e90b576a Disabled force selftest
XYZ calibration tunning
2018-03-14 16:25:32 +01:00
PavelSindler 863fe1f054 show message that printer is not connected to monitoring on printer start 2018-03-14 15:35:39 +01:00
Robert Pelnar 3ff5686336 MK2-25-3 variant files 2018-03-14 13:53:36 +01:00
Robert Pelnar 2f98ac989a Variant file for MK2 + cond. translation 2018-03-13 23:14:44 +01:00
Robert Pelnar 81cd96b8fe Variant file for MK25 + cond. translation 2018-03-13 23:02:46 +01:00
Robert Pelnar c163d8a9f7 Variant file for MK3 2018-03-13 22:40:20 +01:00
Robert Pelnar 46cecb1bdf deleted unused file 2018-03-13 20:44:06 +01:00
Robert Pelnar ac1a56b493 Merge branch 'MK25' into MK3 2018-03-13 20:43:19 +01:00
PavelSindler 27cc5e51c3 removed duplicit declaration of prusa_statistics function 2018-03-13 19:12:36 +01:00
PavelSindler 5d389a2c36 Farm mode: when print finishes, ask which filament was used for print; statistics modified 2018-03-13 19:11:02 +01:00
PavelSindler a3ad74a6be status screen fix 2018-03-13 19:08:19 +01:00
PavelSindler 8ec3c0fd7e removed "Printer disconnected" message 2018-03-13 18:50:56 +01:00
PavelSindler f45f206faf sorting files disabled in farm mode, start printer status needs reponse from monitoring 2018-03-13 18:50:11 +01:00
PavelSindler ddeb7b8c84 statistics improved, initial version of function which forces user to connect printer to monitoring 2018-03-13 18:43:42 +01:00
Robert Pelnar 16f9f35451 static_assert replaced with error directive 2018-03-13 16:47:38 +01:00
PavelSindler 0c97f46f25
Merge pull request #551 from XPila/MK3-new_xyz_cal
New XYZ calibration with image processing
2018-03-13 16:17:50 +01:00
XPila a23ac6db7d
Merge pull request #550 from mkbel/safety_timer_MK3
Safety timer (disable heaters after 15min idle)
2018-03-13 15:03:45 +01:00
XPila 701dc55f4e
Merge pull request #549 from mkbel/safety_timer
Safety timer (disable heaters after 15min idle)
2018-03-13 15:02:09 +01:00
XPila f487691070
Merge pull request #536 from mkbel/menu_return
Menu return
2018-03-13 14:30:48 +01:00
PavelSindler 98e96c9182
Merge pull request #457 from bubnikv/MK3_fast_dbg
Mk3 fast dbg
2018-03-13 14:13:29 +01:00
Robert Pelnar 65a91b366d New XYZ calibration with image processing 2018-03-13 12:55:35 +01:00
Marek Bel 6b08cdeaf1 Safety timer (disable heaters after 15min idle) 2018-03-12 23:45:10 +01:00
Marek Bel 262e800db7 Safety timer (disable heaters after 15min idle) 2018-03-12 23:35:50 +01:00
Christoph Stahl 1df91e5656 MK3 Add Gcode to wait for minimum PINDA temp
The PINDA temperature compensation is defined for values above 35C. To achieve an optimal first layer consistently it is vital to start the print with a temperature of >= 35C on the pinda probe.
When doing a manual pinda temperature calibration it is necessary to begin homing and mesh bed leveling at an exact temperature. This gcode is perfect for this.

Example startup code:

G28 W ; home all without mesh bed level
G0 Z50 ; raise Z to not heat PINDA before bed is warm
M104 S215 ; set extruder temp
M140 S60 ; set bed temp
M190 S60 ; wait for bed temp
M109 S215 ; wait for extruder temp
G0 X50 Y50 Z0.15 ; this is a good PINDA heating position
M666 S35 ; the new code - wait until PINDA is >= 35C
G28 W ; home all without mesh bed level
G80 ; mesh bed leveling

See my forum post later for more explaination on my manual temperature calibration procedure. I will link it then.
2018-03-09 20:46:07 +01:00
Robert Pelnar 66dc65ecd4 version changed 2018-03-09 14:15:47 +01:00
PavelSindler d512c9c9c2 version changed 2018-03-08 14:48:01 +01:00
Robert Pelnar 976e5a6a19 Temperature calibration - remove steel 2018-03-07 21:45:55 +01:00
PavelSindler b902d91760 changed version 2018-03-07 21:02:07 +01:00
Marek Bel b41d680adf Replace problematic character in comment. 2018-03-07 20:58:15 +01:00
Marek Bel 8ff028820a Remove redundant parameter. 2018-03-07 20:55:01 +01:00
PavelSindler abb9aa0a16 not using homing currents in axis selftest 2018-03-07 20:42:15 +01:00
Marek Bel 2a53686d2f Document valid usage of lcd_goto_menu(), remove redundant parameter. 2018-03-07 20:40:59 +01:00
Marek Bel 1aba608133 Document valid usage of lcd_goto_menu(), wrap lcd_second_serial_set() by HAS_SECOND_SERIAL_PORT macro. 2018-03-07 18:30:33 +01:00
Marek Bel 0c961dedc4 Reset menu stack in lcd_return_to_status().
Mark menuStack.reset() as redundant in lcd_status_screen(), but leave it there to be sure.
2018-03-07 18:15:24 +01:00
Marek Bel 716098c434 Preserve position in menu move axis Extruder. 2018-03-07 17:27:27 +01:00
Marek Bel d0a98dc6cc Document valid usage of lcd_goto_menu(). 2018-03-07 17:18:10 +01:00
Marek Bel 0871925353 Remove special handling of lcd_move_z after long button press. Convert lcd_move_z after long button press to ordinary menu_action_submenu.
Known bug (feature) is, that with current maximum stack depth, when long press is activated in menu > settings > move axis > Move X and then Move Z is deactivated, menu is returned to "move axis" and not to "Move X".
2018-03-07 17:03:17 +01:00
Marek Bel 77c3d7d7f7 Review and document lcd_adjust_bed_reset() lcd_goto_menu() usage. 2018-03-07 16:47:20 +01:00
PavelSindler f41584524e
Merge pull request #534 from PavelSindler/M221_fix
Fix of a regression bug, caused by pre-calculating the extrudemultiply
2018-03-07 16:13:16 +01:00
bubnikv 6ba07a358b Fix of a regression bug, caused by pre-calculating the extrudemultiply
for precission and performance: calculate_extruder_multipliers()
has to be called after extrudemultiply is changed from the printer panel.
2018-03-07 16:08:19 +01:00
PavelSindler 33a7723fba
Merge pull request #533 from bubnikv/M221_fix
Fix of a regression bug, caused by pre-calculating the extrudemultiply
2018-03-07 16:03:50 +01:00
bubnikv fb4230f80d Fix of a regression bug, caused by pre-calculating the extrudemultiply
for precission and performance: calculate_extruder_multipliers()
has to be called after extrudemultiply is changed from the printer panel.
2018-03-07 15:46:46 +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
Marek Bel b7df176a46 Preserve position in menu Live adjust Z. 2018-03-06 22:45:47 +01:00
Marek Bel ed0e7a8b58 Preserve position in menu move axis. 2018-03-06 21:27:06 +01:00
Marek Bel 020269a83c Fix unable to go back from main menu to status screen. 2018-03-06 21:26:14 +01:00
Marek Bel e551ed1f6e Replace lcd_goto_menu(...) by menu_action_back() in lcd_menu_fails_stats(); 2018-03-06 19:51:13 +01:00
Marek Bel 235803bc2a Move encoder stack to separate class MenuStack. Add menu record to MenuStack.
It was needed to add menuFunc_t menu to stack, as in some places in menu, it is impossible to hardcode parent menu. Example: lcd_babystep_z can be invoked both from main_menu() and settings_menu() depending on printer status.
2018-03-06 19:47:27 +01:00