Commit Graph

5052 Commits

Author SHA1 Message Date
Alex Voinea 6979555fab
more comments 2020-03-23 16:30:51 +02:00
3d-gussner bb43fa9878 typo dedine doesn't work 2020-03-23 14:51:40 +01:00
3d-gussner 0067dc0d9d Merge branch 'MK3' into MK3_EEPROM_doc 2020-03-23 14:15:35 +01:00
3d-gussner f4037b9cb4 Fixes after testing 2020-03-23 14:13:24 +01:00
Alex Voinea 5c4b3eea87
Struct comments 2020-03-23 14:57:03 +02:00
DRracer 73349033d5
Merge pull request #2469 from wavexx/fix_current_pos_init
Initialize current_position correctly during startup
2020-03-23 12:26:32 +01:00
3d-gussner fc793b59d7 changed default values for bowden length after test 2020-03-23 12:02:57 +01:00
DRracer 5a6148670a
Merge pull request #2494 from DRracer/create-mod-filetime-sort
Use combined creation/modification file time stamps for sorting
2020-03-23 11:53:52 +01:00
3d-gussner 32bff79fd6 minor changes + added EEPROM_FREE_NRx ...
Some EEPROM allocations do not use the hole allocated space:

- EEPROM_FARM_NUMBER is only numeric 000-999 and only uses 2 bytes to store the Farm number BUT allocated 3 bytes. Added EEPROM_FREE_NR1 as free space that can be used
- EEPROM_CRASH_DET just changes 1 byte to save it status [on/off] but allocated 5 bytes. Added EEPROM_FREE_NR2 to EEPROM_FREE_NR5 as free space that can be used
2020-03-23 11:40:07 +01:00
Alex Voinea ea1a2bb362
Documentation update 2020-03-23 12:37:56 +02:00
DRracer 468b0e210c
Merge pull request #2372 from leptun/MK3_fix_verbosity
Fix SUPPORT_VERBOSITY
2020-03-23 10:53:39 +01:00
DRracer 0f32c46307
Merge pull request #2371 from 3d-gussner/MK3_Fix_Language_Debug
MK3 fix language debug
2020-03-23 10:53:14 +01:00
3d-gussner 0c65505741 Added PRUSA3DFW at 0x0000 2020-03-23 07:23:36 +01:00
3d-gussner 1b0c86cb51 minor fix 2020-03-22 15:23:41 +01:00
3d-gussner 2778fa9aa0 Added author and version of document 2020-03-22 15:22:14 +01:00
3d-gussner b178252eb9 Added Italic and Bold to highlight some settings 2020-03-22 15:18:45 +01:00
3d-gussner 028a27021b All done...
hope not I forgot one. I will re-test all `D3 Axyyyy Cz` before creating a PR.
2020-03-22 14:08:21 +01:00
3d-gussner 2591f8d593 Added and tested more...
... have to take a short break
2020-03-20 12:36:26 +01:00
3d-gussner c8fc5b2fed Simpler tabel syntax 2020-03-20 10:44:12 +01:00
odaki 684b47e417 Update reference URL
There was an official website of Toshiba called "FlashAir Developers '', and
there was information necessary for FlashAir development, but since it closed in September 2019.
Instead, I will point an archive site for developers.
2020-03-15 19:04:02 +09:00
3d-gussner 4d40ed67f6 remove LF 2020-03-12 12:36:48 +01:00
3d-gussner 2818316366 Started EEPROM Table doxygen documentation 2020-03-12 12:34:33 +01:00
MRprusa3d ff479afd88 version for testing / final review 2020-03-10 15:51:48 +01:00
MRprusa3d f71bbfe95e tresholds specification, steady delay 2020-03-10 00:11:17 +01:00
Alex Voinea e914f8e0da
Show "Sorting folders" when folders are being sorted 2020-03-05 13:06:37 +02:00
Alex Voinea 890c137298
Initialize all axis as absolute at the beginning. 2020-03-05 11:29:16 +02:00
Alex Voinea 5fcf18718f
Decouple XYZ relative from E relative. 2020-03-05 11:22:35 +02:00
Alex Voinea 355b003b7f
menu_data_reset() 2020-03-04 22:20:53 +02:00
Alex Voinea 40ebd455f2
Safer menu interrupt call 2020-03-04 22:14:53 +02:00
Alex Voinea 22432b1053
Reset menu state after lcd_sd_refresh 2020-03-04 21:07:51 +02:00
Alex Voinea 5edc1ef297
Fix updir and dir again 2020-03-04 21:03:57 +02:00
Alex Voinea 57c149e7b5
Comment cleanup 2020-03-04 21:01:08 +02:00
Alex Voinea 7b19715c99
Cache sdSort 2020-03-04 20:41:17 +02:00
Alex Voinea f35e553373
Code cleanup 2020-03-04 20:33:43 +02:00
MRprusa3d f09323a78f heaters-checking update 2020-03-03 14:57:45 +01:00
Alex Voinea 8e47cb35a3
Possible fix to longpress in sdcard menu 2020-03-03 15:29:10 +02:00
Alex Voinea d1968f6ff0
Option to refresh/resort SDcard files when flashAir type is selected 2020-03-03 15:17:50 +02:00
Alex Voinea f69a68b966
Fix subdir enter and exit 2020-03-03 14:55:08 +02:00
Alex Voinea 53e130fc6d
Merge branch 'MK3' into MK3_NEW_SD_COMPILATION 2020-03-03 14:14:43 +02:00
MRprusa3d 0eaa4edfee configuration update 2020-03-02 21:18:11 +01:00
MRprusa3d 2a9504b20a !!! for testing only !!!
filament sensor auto-detection
2020-03-02 19:07:23 +01:00
MRprusa3d ec5e54de25 state fixing 2020-03-02 17:52:25 +01:00
vintagepc e06beb61c3 Ditch charswitch, show ... for measuring 2020-02-21 18:14:13 -05:00
Yuri D'Elia 497637ee84 Remove hard-coded X/Y jerk limits 2020-02-18 12:23:42 +01:00
DRracer 2e18a48b87 Version changed (3.9.0-RC1 build 3272) 2020-02-17 16:47:56 +01:00
DRracer f234ef2104 Use combined creation/modification file time stamps for sorting 2020-02-14 09:09:15 +01:00
vintagepc 1aaefffdb0 Change to raise_z_above() 2020-02-13 07:37:27 -05:00
vintagepc 5abee3d3e5 Better display handling 2020-02-11 19:44:26 -05:00
vintagepc 278bb032d7 Change to raise_z_above() 2020-02-11 18:37:26 -05:00
vintagepc a4458fb57b Removed duplicate #defines
cleaned up display routine
2020-02-11 18:33:40 -05:00
vintagepc e4b1a1e9c4
Remove delay for belttest, similar to #2439
There's a separate PR to remove the first delay in the selftest. (#2439). Mirroring that to the belt test function, which I suspect also inherited it.
2020-02-09 21:39:48 -05:00
vintagepc 721b27fcb6
Reorg/cleanup
Removed unused progress variable
reorganized flow to avoid early returns (ensures forced high power mode is disabled regardless of outcome)
2020-02-08 12:33:23 -05:00
vintagepc 1384e783bf
Force high power mode when running belt test 2020-02-07 16:14:33 -05:00
DRracer a10b7f3963
Merge pull request #2470 from leptun/MK3_Adjusted_mintemp
Adjusted hotend, bed and Ambient mintemp values
2020-02-07 08:54:50 +01:00
Yuri D'Elia f1618bfbd6 Initialize current_position correctly during startup
Just after setting up the w2m matrix, call "clamp_to_software_endstops"
on the current_position (initially [0,0,0]) to move it to the effective
minimal position, which is usually [0,0,non-zero] due to MIN_Z and the
negative probe offset.

This is required to calculate correctly the first relative move:
planning X+10 would unexpectedly calculate a Z shift otherwise.
2020-02-06 22:41:47 +01:00
Yuri D'Elia 9e45b5d41e Improve PAT9125 filament / optical quality checks
Tune the "soft" filament recheck to be more in-line with the latest
changes. Relax the thresholds so that a poorly tracking filament
that managed to trigger a recheck can still pass as long as /some/
motion is detected.

Hide the unused fsensor_oq_result() behind the FSENSOR_QUALITY define,
which is likely broken currently anyway.

Cleanup and simplify all the OQ defines.
2020-02-06 18:27:44 +01:00
Yuri D'Elia 853bb79b6b Return correct status from pat9125_update_bs 2020-02-06 16:39:08 +01:00
Yuri D'Elia bd0544fe9e FS: Use two different speeds when checking for runout
When doing a PAT9125 "soft check", use two different speeds between
retraction and extrusion. This increases the chances that we can
track the surface.
2020-02-06 15:27:22 +01:00
Yuri D'Elia 3be859ece9 FS: Improve reliability on speeds with poor optical tracking
Depending on the filament surface and moving speed, the PAT9125 sensor
can stop being able to track movement.

In such cases, instead of triggering false errors and/or relying on
previous states, read and use the exposure data off the sensor and
increase error counts only for poorly exposed images instead, which
is a good indicator of a far-away (or missing!) tracking surface.
2020-02-06 15:27:22 +01:00
Yuri D'Elia cdc17e8da1 Read all 12 bits correctly from PAT9125 DELTA_* registers
Widen ucXL/ucYL/ucXYH types to 16 bits, since the following shifts
will otherwise truncate the results.
2020-02-06 14:39:04 +01:00
Yuri D'Elia 3af35844e1 Remove redundant check (always trigger the fsensor isr)
Since fsensor_st_block_chunk is already called on fsensor_chunk_size
boundaries, there's no need to check a second time.
2020-02-06 14:39:04 +01:00
Yuri D'Elia 1eddc40ed4 Comment existing code 2020-02-06 14:39:04 +01:00
Yuri D'Elia e84f82a675 Rewrite filament sensor PAT9125 error handling
Rewrite the logic behind the "chunking"/error count behind the PAT9125.

Basic idea: check the _direction_ of movement returned by the optical
sensor and compare it to the direction of the stepper. To avoid doing
this continuosly (and because the optical sensor doesn't necessarily
have the accuracy to track small distances), do so in chunks.

Each time a chunk doesn't match the expected direction, increase the
error count.

Several improvements were done to the previous code:

- Increase the chunk window: this ensures that a filament with
  poor response returns an usable direction, while also moving the
  average return values from the sensor in the middle of the 12 bits
  available for maximum effectiveness.
- Since the returned values are more reliable, reduce the error count
  (1.25mm*4 = ~5mm before runout detection)
- Track _both_ positive and negative movement, although only trigger
  errors during extrusion (necessary due to several assumptions made
  in the mmu/unloading code)
- Do not reset the counters for each block: accumulate distances
  correctly, allowing detection of any block lenght.
2020-02-06 14:37:46 +01:00
vintagepc 34f43d7389
Update mmu.cpp
Fix runout if filament is unknown
2020-02-05 21:41:31 -05:00
Yuri D'Elia 5c4235b886 Correctly reset the PAT9125 filament counters
When the error count is cleared, the cumulative deltas as well as the
segment lenght which is kept inside the stepper isr need to be reset.

Introduce a helper function fsensor_reset_err_cnt to clear all the
required variables in one place which can be used in most cases
(the only exceptions being quality measument).

Introduce a new function st_reset_fsensor to also clear the segment
lenght within the isr.
2020-02-05 16:21:27 +01:00
Yuri D'Elia 6fbd632c84 Isolate all PAT9125-specific code, fix build on !MK3 variants
- Hide all prototypes related to PAT9125 to force all callers
  to check for the proper sensor, since the handling differences
  are substantial
- Remove unneeded lenght accounting from the stepper isr as as
  consequence.
- Keep detailed soft failure counts for the MK3 on the "last print
  failures" status screen, but fix build on variants without a PAT9125
  by fixing the lcd stats function.
2020-02-05 16:20:12 +01:00
Yuri D'Elia d47363d85a Update the filament axis resolution when E resolution is changed
The filament sensor "chunk lenght" needs to be updated every time the
E axis resolution is changed in order to trigger at the same distance.

Introduce a new function fsensor_set_axis_steps_per_unit() and use
it consistent during init, in M92 and M350.
2020-02-05 16:20:12 +01:00
Yuri D'Elia ce74b746f1 FS: Trigger a runout with repeated soft-failures (clog?) 2020-02-05 16:20:12 +01:00
Yuri D'Elia 8fb8ff4bf4 Include fsensor recovery stats in the last print stats 2020-02-05 16:20:12 +01:00
Yuri D'Elia e8ce5e140e FS: Detect runout earlier 2020-02-05 16:20:12 +01:00
DRracer 4774b44e21
Merge pull request #2461 from leptun/MK3_FIX_MINTEMP_FIXED
HEATER -> HOTEND
2020-02-04 16:35:07 +01:00
Alex Voinea f1ccfd481a
HEATER -> HOTEND 2020-02-04 17:30:44 +02:00
DRracer d4d1f051ba
Merge pull request #2149 from leptun/MK3_TONE
PFW-1056: Re-enable Tone on timer4
2020-02-04 11:04:15 +01:00
Alex Voinea 3ae5fa70ca
Fix comments 2020-02-03 19:20:43 +02:00
Alex Voinea 1f482adf55
Improved lcd_menu_statistics() implementation 2020-02-03 18:40:46 +02:00
DRracer 007395acb4
Merge pull request #2458 from wavexx/la15_compat
Adjust E-jerk in LA10 compatibility mode
2020-02-03 15:57:21 +01:00
Yuri D'Elia 453f5dd874 Adjust E-jerk in LA10 compatibility mode
When upgrading K values of a LA1.0 print, also adjust E-jerk settings
(<2) if permissible according to current accell limits. The same is also
true when jerk is set mid-print via 'M205 E'.

Existing values are always restored when switching to another
compatibility mode.

TODO: Since this is stateful, we will need to save the current print
mode / acceleration and jerk in the eeprom for this to survive a power
panic (see prusa3d#2456).
2020-02-03 15:42:27 +01:00
Yuri D'Elia 4b85664b27 Raise default extruder jerk to 4.5
This should be the new default for LA1.5 for direct drive printers and
newer PrusaSlicer profiles too (hopefully).
2020-02-03 15:42:27 +01:00
DRracer 796dcd6a3d
Merge pull request #2457 from wavexx/la15_fixes
Linear Advance 1.5 fixes
2020-02-03 15:27:02 +01:00
DRracer 685c8156b6
Merge pull request #2451 from wavexx/fix_printstats_reset
Do not clear last print fail stats prematurely
2020-02-03 11:21:41 +01:00
Yuri D'Elia 47db75d5fd Fix overflow and infloop with LA15 and low step rates
When calculating the advance tick interval, be sure to check for integer
overflow. Very low step rates can result in values exceeding uint16_t
causing premature LA tick delivery.

An overflow resulting in zero would also block in an infinite loop
within advance_spread().

Even though such rates are worthless in terms of compensation and often
result in 0 extra ticks as well, do not disable LA for the block (as
doing so would reset the count for short segments) and do not check for
zero in multiple paces either.

Saturate the interval instead, delaying any further tick to the next
block.
2020-02-02 22:49:39 +01:00
Yuri D'Elia 3bbc143821 Fix build with LA_LIVE_K
Do not check for LA_LIVE_K in messages.c (Configuration_adv.h is not
included here).

Rely on the linker to drop the symbol when LA_LIVE_K is disabled.
2020-02-02 18:02:37 +01:00
DRracer d6522a643c
Update ultralcd.cpp
indent
2020-01-31 16:57:18 +01:00
DRracer fd42361236
Update ultralcd.cpp
do delay(2000) everytime, even if IR_SENSOR_ANALOG
2020-01-31 16:55:40 +01:00
DRracer 10d468cceb
Merge branch 'MK3' into remove-unnecessary-delay 2020-01-31 16:51:27 +01:00
DRracer d30960b8e8
Merge pull request #2431 from MRprusa3d/PFW-x001
selfTest workflow optimalization
2020-01-31 16:49:41 +01:00
3d-gussner a355fdd00d
And another one
sorry
2020-01-31 15:40:07 +01:00
3d-gussner b466dad1d7
Fix copy paste issues D2 D5
Fixed copy paste
2020-01-31 15:27:19 +01:00
Yuri D'Elia 84ecf96be5 Do not clear last print fail stats prematurely
M24 was always cleaning the last print failstats. But because M24 is
used to restore a print after power failure (by setting the seek
offset), it would also reset the stats incorrectly after resuming.

Check for the file index position and reset the stats only when a print
is started from the beginning of the file.

Apply the same logic to M32 and similarly handle the LA10->15 conversion
(do not re-apply the adjustment for a resumed print).
2020-01-31 15:08:24 +01:00
3d-gussner 857f9d8d9e Hard reset and readded change 2020-01-31 14:47:44 +01:00
DRracer d70a147af5
Merge pull request #2436 from leptun/MK3_PSU_DELTA_cleanup
Do not clear axis known position when Z is set to silent
2020-01-31 09:08:14 +01:00
DRracer 0b62ed3325
Merge pull request #2450 from leptun/MK3_FIX_MINTEMP_FIXED
Show correct fixed message
2020-01-31 09:03:11 +01:00
DRracer 1ceadcb162
Merge pull request #2448 from wavexx/save_restore_fix
Save and restore fixes
2020-01-30 16:41:01 +01:00
Alex Voinea 886c2fdc4e
Show correct fixed message 2020-01-30 17:24:32 +02:00
DRracer 1b7677c768
Merge pull request #2394 from wavexx/fsensor_no_recursion
Avoid more recursive behavior in fsensor_update
2020-01-30 14:18:07 +01:00
Yuri D'Elia 1db024f17a Always raise the extruder 25mm during power recovery
Avoids oozed material (drooping more than ~1mm) to scrape and
potentially detach the print.
2020-01-30 13:12:12 +01:00
Yuri D'Elia 571906a494 Do not update saved_target if there's no current_block
There is a chance that current_block can be NULL despite
the queue being non-empty. This can happen early after a block has been
queued, but before the isr has picked it up for processing, and/or when
the current block is at the last step and is being discarded.

Check for current_block directly to avoid this race.
2020-01-30 13:12:12 +01:00
DRracer 48a0532e37
Merge pull request #2447 from leptun/MK3_BED_LEVELING_PWM
Turn off bed while probing during MBL
2020-01-30 11:18:34 +01:00
leptun 8c2902a660
Revert "Mesh bed leveling testing"
This reverts commit 28e812d91f.
2020-01-29 23:07:53 +02:00
Alex Voinea b86aafb56e
Documentation 2020-01-29 23:07:24 +02:00
Alex Voinea 755230e2e7
fix small mistake 2020-01-29 23:07:24 +02:00
Alex Voinea a5198e32a3
Just keep the current state. ON or OFF. No switching allowed 2020-01-29 23:07:24 +02:00
Yuri D'Elia 02d1525445 Display "POWER PANIC DETECTED" when possible
Both during early init and in uvlo_tiny, display "POWER PANIC DETECTED"
if enough charge is left.

This is not worth doing in regular uvlo_, as we want to give full
priority to the X motor
2020-01-29 21:08:56 +01:00
Yuri D'Elia 2b46fdac2d Only trigger a quick reset if there's a pending saved state
Thanks to @leptun
2020-01-29 17:56:26 +01:00
Alex Voinea 99e81812ce
Merge branch 'MK3' into MK3_BED_LEVELING_PWM 2020-01-29 17:56:10 +02:00
Alex Voinea 4fd913ddf3
Remove commented out code 2020-01-29 17:45:47 +02:00
Yuri D'Elia b46dc59fad Refuse to start a print if power is lost before arming uvlo
If power has been lost during startup already a falling edge would be
skipped, causing the print to continue and lose its state without
being able to save again.

Check for a low line after arming the interrupt and simply wait
for reset.
2020-01-29 16:06:54 +01:00
Yuri D'Elia 200cdde1af Setup the UVLO interrupt later during initialization
Do not allow uvlo_tiny() to trigger before the previous print has
already been recovered.

A quick repeated power failure could cause uvlo_tiny to overwrite
the Z position before it has been correctly recovered.
2020-01-28 21:50:12 +01:00
DRracer 3e70b73a1f Remove unnecessary delay in lcd_selftest, which occured there as a result of merge. 2020-01-27 19:02:15 +01:00
Yuri D'Elia 3da20db024 Really poweroff Z motors when PSU_Delta is defined
enable/disable_z behave differently when PSU_Delta is defined.

During powerpanic and kill however we do *really* need to save energy
and poweroff the motors.

Rename enable/disable_z as poweron/poweroff_z and define some aliases so
that we can use the low-level function where needed.
2020-01-27 18:50:17 +01:00
Yuri D'Elia 5d88573711 Save/restore hotend temperatures above 255C in PowerPanic
Use 2 bytes to store extruder temperature during UVLO.

Re-use the storage of EEPROM_UVLO_TINY_Z_MICROSTEPS which has been freed
by previous changes.

Fixes #2303
2020-01-27 14:59:18 +01:00
Yuri D'Elia 50a9fe003a Bump the unparking speed to 50mm/s (same as M600 recovery) 2020-01-27 11:08:28 +01:00
Yuri D'Elia eb2ca78167 Rewrite uvlo handling for accurate Z re/positioning
- In both uvlo_ and uvlo_tiny, calculate Z usteps properly and adjust
  the Z position to a true fullstep before disabling the motor. This
  avoids shifs during recovery.
- In uvlo_tiny, instead of moving up indefinitely, adjust Z just
  once using the smallest move possible (new def UVLO_TINY_Z_AXIS_SHIFT)
- Perform all the uvlo/recovery processing in physical coordinates
  and MBL off: there should be no automatic Z movement!
- Disable heaters in both handlers to conserve more power.
- Add timing information to uvlo_tiny too.
- During recovery, to switch between physical and logical positioning
  introduce a new "PRUSA MBL" gcode as most of the procedure is
  enqueued, and no existing gcode was available.
2020-01-26 17:46:50 +01:00
Yuri D'Elia 11a0e95f60 Re-enable the code that moves the extruder during PP
There is frequently plenty of power left during a PP. Take advantage of
it by moving the extruder to either side of the axis to detach
completely the nozzle from the print.

Re-enable Z during this move to avoid losing the current step.
2020-01-26 17:46:50 +01:00
Yuri D'Elia 0702e0de6e Use world2machine instead of repeating code 2020-01-26 17:46:50 +01:00
Yuri D'Elia ec5cbf73b9 During PP keep the watchdog waiting for longer
When the printer is connected to a USB host during a PP (and the host
does not lose power), the rambo can linger for longer, sometimes for
long enough to recover the print state. Drain some more power.
2020-01-26 17:46:50 +01:00
Yuri D'Elia ec8b5aaa34 Do not attempt to "zero-phase" the microstep counter
If the motors are off-phase, this is more likely to "bump" them to an
incorrect/reverse full-step, doing worse.

We need to ensure the motors are already positioned on a fullstep
during power panic instead.

Remove the PSU_DELTA exception: Z _always_ needs to be powered here.
2020-01-26 17:46:26 +01:00
Yuri D'Elia 5310181970 Cancel a recovering print when using the LCD "Stop"
Also clear the UVLO flag when using lcd_print_stop. This prevents an
aborted print which has been cancelled while unparking (just prior to
recover) to come back again at the next startup.
2020-01-26 17:45:47 +01:00
Alex Voinea 4055977a95
Do not clear axis known position when Z is set to silent
Also removed unused (forgotten) variable.
2020-01-25 11:41:27 +02:00
3d-gussner 6d721c9b82 Merge remote-tracking branch 'upstream/MK3' into MK3-Fix_M120_M121
Fix merge with FW3.9.0-beta
2020-01-23 14:46:48 +01:00
Alex Voinea 2e50954710
Merge branch 'MK3' into MK3_fix_selftest_Z_crash2 2020-01-22 14:56:54 +02:00
MRprusa3d 73527d6069 selfTest workflow optimalization 2020-01-22 04:45:13 +01:00
Yuri D'Elia 7f3d4a8491 Restore the last E axis position correctly after powerpanic
- Initially restore the last E position from the eeprom in any case, not
  just when using absolute mode (although unnecessary: since it will be
  reset later), fixing a possible unitialized position and crash during
  recovery (thanks to @leptun)
- Remove useless extra calls to put the extruder in relative mode:
  the extruder already starts in relative mode and is later switched to
  absolute.
- Replace incorrect calls to STRINGIFY with sprintf_P
- Retract after pressure has been restored in uvlo_tiny, to be
  consistent with a regular uvlo (remove the bogus double unretract
  as a result).
- Set the real E position prior to the panic *after* the retraction,
  using the now-fixed G92.
2020-01-21 17:41:43 +01:00
Yuri D'Elia 4c8f1e8b89 Use eeprom_update_word instead of EEPROM_save_B 2020-01-21 16:36:34 +01:00
Yuri D'Elia 9ac80f73f2 Remove an useless/duplicate Z move
Likely a result of a merge
2020-01-21 16:34:09 +01:00
Yuri D'Elia 8437630122 Inhibit serial processing in uvlo_
Do not process serial commands when re-enabling the global isr.
While printing via USB and a power panic is triggered, *any* extra
command should be ignored.

Abuse the "saved_printing" variable to inhibit serial processing.
2020-01-21 16:29:12 +01:00
Yuri D'Elia e8f05d0668 Heat both nozzle/bed together while recovering a print 2020-01-21 16:26:16 +01:00
Yuri D'Elia 67decb466d Avoid another call to st_get_position_mm
current_position is already filled by planner_abort_hard.
2020-01-21 16:24:19 +01:00
Alex Voinea e6ba9e633c
Adjusted hotend, bed and Ambient mintemp values 2020-01-21 14:50:53 +02:00
odaki a2692665f8 Merge remote-tracking branch 'upstream/MK3' into flashair_display_ip 2020-01-18 22:26:52 +09:00
DRracer 95a2ad533d Version changed (3.9.0 build 3175) 2020-01-16 16:03:34 +01:00
odaki b09761ed71 Remove '/*' from M46 source
I forgot to remove the unintended comment start mark when merge.
It has been deleted.
2020-01-16 21:38:39 +09:00
odaki 24b748c4ac Merge remote-tracking branch 'upstream/MK3' into flashair_display_ip 2020-01-16 21:25:55 +09:00
Alex Voinea 1d17a37250
all axis -> all axes 2020-01-16 09:15:44 +02:00
leptun ccd3885d84
rephrase G28 W 2020-01-15 23:01:09 +02:00
Alex Voinea 6a1eb63a52
Add @todo to M999 2020-01-15 22:41:02 +02:00
Alex Voinea d676542229
Revert code changes 2020-01-15 22:38:00 +02:00
Alex Voinea 47ddc2e902
M204 - better old_new separation 2020-01-15 22:35:34 +02:00
Alex Voinea 622319f86c
Add missing LF 2020-01-15 22:30:53 +02:00
Alex Voinea ea51696a68
Merge Special sections as requested 2020-01-15 22:30:43 +02:00
Alex Voinea aac66d4a4b
Add missing quote 2020-01-15 22:21:23 +02:00
Alex Voinea d95029bbc7
Merge remote-tracking branch '3d-gussner/MK3-Gcode_documentation' into MK3-Gcode_documentation 2020-01-15 20:17:51 +02:00
Alex Voinea cabfc37f15
The other changes 2020-01-15 20:17:26 +02:00
3d-gussner 5ff6c1f22c Merge remote-tracking branch 'upstream/MK3' into MK3-Gcode_documentation 2020-01-15 16:36:08 +01:00
Alex Voinea 4cf4720a15
Even more formatting fixes 2020-01-15 17:27:54 +02:00
Alex Voinea 7118007efe
Adjustments 2020-01-15 15:52:56 +02:00
Alex Voinea 7ea00a7efd
Fix typo in page description 2020-01-15 15:31:28 +02:00
Alex Voinea 8449136520
Separate M117 from the TMC2130 commands 2020-01-15 15:31:14 +02:00
Alex Voinea 4a4d7976d1
Fix PRUSA typo 2020-01-15 15:30:48 +02:00
Alex Voinea 55f3e7acaf
Merge branch 'MK3' into MK3-Gcode_documentation 2020-01-15 15:12:18 +02:00
DRracer 27f6807bd5
Merge pull request #2416 from wavexx/fix_G92_e_reset
Fix incorrect usage of plan_set_e_position() in G92 E*
2020-01-15 12:52:13 +01:00
DRracer 7230b99448
Merge pull request #2393 from wavexx/sync_before_resume
Sync before resume
2020-01-15 12:49:56 +01:00
DRracer 1a8420f3f9
Merge pull request #2383 from wavexx/fix_usb_resume_check
Fix fan_check_error check in usb print resume
2020-01-15 12:48:48 +01:00
DRracer 43870c4028
Merge pull request #2368 from wavexx/unretract_after_lcd_pause
Unretract when resuming a paused print
2020-01-15 12:47:24 +01:00
Yuri D'Elia bab756699f Fix incorrect usage of plan_set_e_position() in G92 E*
To maintain an accurate step count (which is required for correct
position recovery), any call to plan_set_position&co needs to be done
synchronously and from a halted state.

However, G92 E* is currently special-cased to skip the sync (likely to
avoid the associated performance cost), causing an incorrect E step
count and position to be set. This breaks absolute position recovery,
miscalculation of the LA factor and possibly other weird issues.

We rewrite the handling of G92 to always sync but still special-case the
frequent "G92 E0" for performance by using a free bit in the block flags.

To avoid a sync, we relay the request for reset first to the planner
which clears its internal state and then relays the request to the final
stepper isr.
2020-01-14 20:24:14 +01:00
odaki 99545a006c M46 "Show the assigned IP address" activated
According to the reprap wiki, M46 has been assigned to display its assigned IP address, but has been disabled.
Now that Toshiba FlashAir IP address processing is working, I activate the M46 code so that I can read the IP address information via serial.
2020-01-12 12:45:43 +09:00
odaki 2ca1bc0acb Support W-04 firmware 4.0.0.01+
W-04 needs to use  CMD17 instead of CMD48 to retrieve iSDIO register memories.
To supporting both W-03 and W-04 card, I changed the readExt() code to use CMD48 first and use CMD17 if it returned some error.
This method is from the FlashAir developer sample code.
https://flashair-developers.github.io/website/docs/tutorials/arduino/2
2020-01-11 21:47:16 +09:00
DRracer 4c74866864
Merge pull request #1933 from prusa3d/enable_cutter
Enable MMU cutter.
2020-01-09 13:47:44 +01:00
Alex Voinea 32c9cd2307
Merge branch 'MK3' into fix_lcd_stop 2020-01-09 14:17:56 +02:00
DRracer b088500eaf
Merge pull request #1909 from wavexx/MK3_LA15
Linear Advance 1.5 Returns
2020-01-09 11:22:06 +01:00
Alex Voinea 29d0537004
Adjusted progress bar 2020-01-08 21:32:45 +02:00
Alex Voinea e295c83d09
Folder sorting shellSort 2020-01-08 21:16:08 +02:00
3d-gussner 6a7ae6231d Merge remote-tracking branch 'upstream/MK3' into MK3_Dutch 2020-01-08 16:02:00 +01:00
3d-gussner d895890608 Merge remote-tracking branch 'upstream/MK3' into MK3-Fix_M120_M121 2020-01-08 15:59:16 +01:00
3d-gussner f3668cab92 Merge remote-tracking branch 'upstream/MK3' into MK3-Gcode_documentation
Fix merge issues with G90 and G91
2020-01-08 15:47:38 +01:00
Alex Voinea 7028583e9b
Merge branch 'MK3_ShellSort' into MK3_NEW_SD_COMPILATION 2020-01-08 16:27:31 +02:00
Alex Voinea 37dc5fed45
Merge branch 'MK3_revised_filename_scrolling' into MK3_NEW_SD_COMPILATION 2020-01-08 16:26:51 +02:00
DRracer df300a2488
Merge pull request #2403 from leptun/MK3_unknown_Z_mark
Show ? near Z value if the position is unknown
2020-01-08 14:55:37 +01:00
DRracer e15d5e21f5
Merge pull request #2402 from leptun/MK3_sheet_on_status_screen
Do not show sheet on status screen if less than 2 are initialized
2020-01-08 14:42:29 +01:00
DRracer 2f2e415eae
Merge pull request #2382 from wavexx/fix_lcd_stop
Fix lcd "Stop" when used within a pause
2020-01-08 14:40:54 +01:00
DRracer 3ef1c52a0a
Merge pull request #2381 from wavexx/remove_relative_mode
Remove "relative_mode", only use "axis_relative_modes"
2020-01-08 14:39:43 +01:00
Alex Voinea 8b0f0695a8
Merge branch 'MK3_fix_shorter_sheet_name_on_status_screen' into MK3_sheet_on_status_screen 2020-01-08 15:31:33 +02:00
Alex Voinea 9abdf4e535
Show ? near Z value if the position is unknown 2020-01-08 13:46:51 +02:00
Alex Voinea c5324291ad
Do not show sheet on status screen if less than 2 are initialized 2020-01-08 12:48:41 +02:00
Alex Voinea d9e5283526
Fix pause->stop->PrintFromSD scenario 2020-01-07 21:02:13 +02:00
Alex Voinea 1996fc7940
Remove commented-out code 2020-01-07 20:43:56 +02:00
Alex Voinea 4422fc29f8
Set XYZ to absolute and E to relative 2020-01-07 20:42:21 +02:00
Alex Voinea f8a0d5d773
Fix lcd_print_stop function 2020-01-07 19:54:06 +02:00
Alex Voinea df0d781c20
Merge branch 'MK3' into fix_lcd_stop 2020-01-07 19:53:55 +02:00
Alex Voinea 1ba89b9689
Merge branch 'MK3' into MK3_ShellSort 2020-01-07 14:18:31 +02:00
Alex Voinea b05ee33fc9
Merge branch 'MK3' into MK3_BED_LEVELING_PWM 2020-01-07 07:58:32 +02:00
odaki f923427dc1 Show the FlashAir IP address
Displays the FlashAir IP address in the "Support" menu if the card is available.
If no IP address has been assigned yet, "0.0.0.0" will be displayed.
2020-01-04 12:51:20 +09:00
Yuri D'Elia 853991865c Improve raise_z_above to always raise when at Z_MIN
When check_z_endstop is set, Z_MIN_PIN is checkend regardless of the
moving direction to support Z calibration. This prevents the ability
to use _just_ SG when moving upwards.

But since we know the extruder is at Z_MIN, it's always safe to raise
irregardless, so we can dodge the issue.
2020-01-02 18:07:30 +01:00
Yuri D'Elia 5660fcffb0 Do not enqueue a E/Z moves unless requested
Do not unconditionally enqueue a Z move if no move has been requested.
Since Z is calculated using the absolute current (saved) position and
scheduled for later execution, the queue order becomes relevant.
2019-12-30 14:49:07 +01:00
Yuri D'Elia 86696156af Improve K error checking, allow to manually reset the version
Properly check K independently for each version by delegating it to la10c_value()

Handle -1 as a special case to allow manual reset.
2019-12-30 14:31:39 +01:00
Yuri D'Elia 57be14fca6 Complete all pending moves before restoring a saved print 2019-12-30 13:30:06 +01:00
Yuri D'Elia fd0ed1f0ea Move LA reset from G28 to G80, do not reset on 0
In preparation for #2161, use MBL (G80) as a "new print" boundary
instead of just re-homing to ensure the reset is issued only once for
each print.

Similarly, do not reset the autodetection when LA is disabled via M900
K0. This can/will be used during a print if different quality settings
are used for different filling roles.
2019-12-30 11:32:27 +01:00
Yuri D'Elia d78636c308 Do not synchronize on M900
Since the advance factor is computed per-segment in LA15, there's no
need to stop the planner. Allow changing K freely at each segment.

This allows varying quality factors for different filling roles, see:
https://github.com/supermerill/Slic3r/issues/108

During pause/resume/crashdetect or powerpanic K might temporarily be out
of sync when used this way. If this becomes an issue, we might need to
store K for each block, as done for the feedrate.
2019-12-29 23:25:16 +01:00
Yuri D'Elia f5d382f9f4 Remove useless st_synchronize calls when unparking 2019-12-29 22:20:24 +01:00
Yuri D'Elia 186f881600 Avoid calling fsensor_update() one level earlier
Move the common checks between filament sensors out of fsensor_update().

Disable the runout check if a saved state is already present (this check
was missing in the PAT9125 variant) as this is currently not supported.

Note that the CHECK_FSENSOR looks completely redundant besides
e_active().
2019-12-29 22:08:44 +01:00
Yuri D'Elia bd80ee88a0 Set the IN_HANDLER busy state while checking the filament 2019-12-29 21:27:42 +01:00
Yuri D'Elia 97170ed68d Do not call process_commands() within fsensor_update()
Plan moves directly to reduce the required stack size.
2019-12-27 19:37:20 +01:00
Yuri D'Elia fe4c00fb8a Lift the extruder when checking for the filament
This avoids leaving marks on the print
2019-12-27 19:35:08 +01:00
Yuri D'Elia 301d64042b Set fsensor_watch_runout earlier to prevent re-entry
Do not set/clear fsensor_watch_runout within fsensor_oq_meassure_start
which is used outside of fsensor_update where it could have a different
starting value.

Set it within fsensor_stop_and_save_print to immediately prevent
re-entry.
2019-12-27 19:34:36 +01:00
Yuri D'Elia a31319888c Fix fan_check_error check in usb print resume
Also check for fan_check_error == EFCE_OK in addition to EFCE_FIXED.

Reorganize the check in order to fix both #if[n]def FANCHECK cases,
as similarly done in the SDSUPPORT case a few lines below.
2019-12-23 19:12:46 +01:00
Yuri D'Elia 7b29ce29b4 Add a Linear Advance 1.0->1.5 compatibility layer
Allow existing gcode using LA10 to transparently take advantage of LA15
by using a simple linear conversion function based on experimental
results with the MK3 implementation of linear advance.

Autodetect LA10 values based on the first M900 instruction contained in
the print. In order to support printing mixed files without resetting
the printer we also reset the autodetection status when starting a new
SD print and/or when explicitly disabling LA.

Since we cannot reliably detect whether a new print is started when
printing via USB, also reset the detection status when homing in G28,
which is generally performed once at each print. Note that this doesn't
clear the previous K value, it only allows a subsequent M900 to provide
LA10 values when printed after a LA15 file.
2019-12-21 23:22:35 +01:00
Yuri D'Elia c0ae92cd2a Remove "relative_mode", only use "axis_relative_modes"
axis_relative_modes can cleanly handle G90/G91 and M82/M83 without the
need of "relative_mode" entirely.

Change G90/G91 to simply reset all axes according to the requested
state, which avoids to check two variables in get_coordinates(),
fixing the following incorrect handling:

G91   ; all axis relative
M83   ; set extruder absolute
G1 E1 ; should be an absolute move, but still relative
2019-12-20 18:47:30 +01:00
Yuri D'Elia 8d60e4d6db Merge remote-tracking branch 'upstream/MK3' into MK3_LA15 2019-12-18 18:28:41 +01:00
Alex Voinea f071aec747
Fix sheet minimum width on the status screen 2019-12-18 08:52:25 +03:00
Alex Voinea f0f7db57ea
Fist attempt at "saved position SD menu" 2019-12-17 00:45:25 +02:00
Alex Voinea 3ad611ca16
Merge branch 'MK3' into MK3_revised_filename_scrolling 2019-12-16 21:39:27 +02:00
Yuri D'Elia 8d490f941a Make use of the CRITICAL_SECTION macros in lcd_print_stop 2019-12-16 16:39:20 +01:00
Yuri D'Elia 0cc68228f8 Unretract when resuming a paused print 2019-12-16 16:33:11 +01:00
DRracer 955c88cf68
Merge pull request #2370 from wavexx/no_resume_while_resuming
Do not allow to resume a print twice while waiting for the hotend
2019-12-16 16:26:02 +01:00
Yuri D'Elia faa76df2fe Fix the "Stop print" behavior from the LCD
Correctly cleanup the printer state when stopping the current print:

- Disable interrupts while aborting the planner/queue to ensure
  new serial commands are not inserted while aborting
- _Always_ call planner_abort_hard() to interrupt any pending move!
- Clear the saved_target, which might be set when calling stop
  from within a paused state. Create a new function to clear the
  paused state for future use.
- Do not disable/reset the MBL: doing so will destroy the ability to
  restart correctly using M999.
2019-12-16 15:52:37 +01:00
Alex Voinea a8e6020238
Fix VERBOSITY 2019-12-16 15:21:55 +02:00
Yuri D'Elia 348bbbffb0 Do not allow to resume a print twice while waiting for the hotend
Clear isPrintPaused just prior to restore_print_from_ram_and_continue.
2019-12-15 22:22:44 +01:00
DRracer d4fab1a713
Merge pull request #2304 from 3d-gussner/MK3-Fix_M81
Fix M81 Turn off Power Supply...
2019-12-15 11:52:56 +01:00
DRracer c45d4f4bba
Merge pull request #2088 from rhounsell/MK3
Fix for Toshiba FlashAir (or other) SD card initialization
2019-12-15 11:46:56 +01:00
DRracer 44288bfe90
Merge pull request #2309 from leptun/MK3_fix_MMU_pause_time
Fix MMU needs user attention Statistics error
2019-12-15 11:04:57 +01:00
DRracer d6ac9e4638
Merge pull request #2342 from vintagepc/2306-hard-reset-homing-fails
Fix #2306 hard reset homing fails
2019-12-15 10:51:52 +01:00
DRracer c122399020
Merge pull request #2270 from leptun/MK3-PFW-1024
PFW-1024
2019-12-15 10:25:37 +01:00
DRracer d68d9c7fef
Merge pull request #2058 from leptun/MK3_fix_warnings
Fix "LANG_MODE 0" warnings
2019-12-15 09:29:27 +01:00
Alex Voinea 770fcd7c42
Merge branch 'MK3' into MK3-PFW-1024 2019-12-14 10:08:52 +02:00
DRracer 6ab3b20ce1
Merge pull request #2348 from leptun/MK3_fix_kill
Fix kill messages
2019-12-13 18:30:27 +01:00
DRracer 1423de10a9
Merge pull request #2362 from leptun/MK3_Fix_Lang_64K_limit
Fix optiboot erase function after address 0xFFFF. Allows language files greater than 64K
2019-12-13 13:59:23 +01:00
DRracer 30cee7afca
Merge pull request #2353 from wavexx/lcd_pause_fixes
Fix the LCD pause (regression)
2019-12-13 13:53:29 +01:00
DRracer 838cec75ec
Merge pull request #2352 from wavexx/fix_m603_regression
Use lcd_print_stop() in M603, fix octoprint regression
2019-12-13 13:52:40 +01:00
DRracer a1bc4cc5dc
Merge pull request #2332 from leptun/MK3_Octoprint_fIxes
Do not check for fanError if it is not enabled on resume
2019-12-13 13:47:56 +01:00
Alex Voinea 89dfb00b04
Fix optiboot erase function after address 0xFFFF 2019-12-08 08:43:43 +02:00
Yuri D'Elia 0b9123ce24 Fix Live K, allow "Advance K" to be translated 2019-12-05 15:18:24 +01:00
Yuri D'Elia 5122f79a39 Merge remote-tracking branch 'upstream/MK3' into MK3_LA15 2019-12-04 17:27:23 +01:00
Yuri D'Elia 19589f02f1 Remove an unused define 2019-12-04 17:22:21 +01:00
3d-gussner 17e23693eb Fixed stuipid copy paste error 2019-12-04 14:21:43 +01:00
3d-gussner 0cafd10378 minor fix 2019-12-04 13:43:19 +01:00
3d-gussner f7bfca3061 Fix merge issues 2019-12-04 13:39:56 +01:00
3d-gussner 7da1db2f25 Merge remote-tracking branch 'upstream/MK3' into MK3-Gcode_documentation 2019-12-04 13:35:09 +01:00
3d-gussner fb3c65b3dc fixed links to RR Wiki 2019-12-04 12:38:43 +01:00
3d-gussner cdc6beaf6f Added M910 -> M918 2019-12-04 12:25:33 +01:00
3d-gussner a5f3027ee1 D2130 updated
Needs review
2019-12-04 11:38:29 +01:00
Yuri D'Elia 8448b8d413 Keep destination updated in an aborted plan as well
When aborting the plan destination is updated anyway to reflect the latest
position. There's no use in this additional check.
2019-12-03 20:37:13 +01:00
Yuri D'Elia 063d0421ac Call long_pause from the main loop (again)
After calling stop_and_save_print_to_ram, perform the parking moves
within the main loop as done before PR#1899 to avoid planning within
an interrupted move (which would clear the abort flag too soon).
2019-12-03 20:37:13 +01:00
Yuri D'Elia d60230e494 Add some documentation 2019-12-03 20:37:13 +01:00
Yuri D'Elia 792d7ca6dc Turn off heaters just prior to retraction to limit oozing 2019-12-03 20:37:13 +01:00
Yuri D'Elia 4fce74140a Also abort planning in stop_and_save_print_to_ram
Similarly to resume_print_from_ram_and_continue, abort any
planning in mesh_plan_buffer_line already in stop_and_save_print_to_ram
in case it is called for pausing only.
2019-12-03 20:37:09 +01:00
3d-gussner 0ce7c51c1d Added more D-codes to RR Wiki and doxygen
D-1, D80, D81, D106
2019-12-03 20:02:58 +01:00
Yuri D'Elia 454e99dbb5 Use lcd_print_stop() in M603, fix octoprint regression
M603 shouldn't report a fatal error state.
Use lcd_print_stop().

Regression introduced in PR #2274
2019-12-03 16:51:59 +01:00
Alex Voinea 63655a906a
Merge branch 'MK3' into MK3_revised_filename_scrolling 2019-11-30 01:31:48 +02:00
Alex Voinea 56193ea252
Merge branch 'MK3' into MK3_TONE 2019-11-29 23:16:46 +02:00
Alex Voinea e7f2577233
Fix kill messages 2019-11-29 22:49:22 +02:00
Alex Voinea 103e29d38a
Merge branch 'MK3' into MK3_ShellSort 2019-11-29 16:52:20 +02:00
DRracer 15bfb7013d
Merge pull request #2274 from wavexx/fix_mesh_plan_buffer_line
PFW-1028: Fix recovery from filament sensor checks / crash detect / power panic
2019-11-29 15:18:15 +01:00
Alex Voinea 779423f0e7
Move hardcoded values to variants 2019-11-29 15:06:54 +02:00
Alex Voinea a413cfbb9a
Merge branch 'MK3' into MK3-PFW-1024 2019-11-29 13:07:45 +02:00
Yuri D'Elia dbe2ed4150 Fix pause/resume when using M25/M601
Remove the conflicting and mostly useless card.paused flag (the printing
is either paused, or not) and switch to isPrintPaused only which
accounts for both cases (SD/USB) correctly.

Fix M27/getStatus to show the current real status of the SD print.

Synchronize the queue on M601, as required to precisely pause the print
at the correct instruction.

Alias M25 to M601, which when combined with PR #1899 fixes issue #1614.

Guard against incorrect usage in M601, M602 and M603.
2019-11-28 17:37:58 +01:00
Yuri D'Elia 18eaf21baf Halve memory usage of saved feedrate
Truncate the saved feedrate to an uint16_t.
This is more than sufficient for recovery.
2019-11-28 17:16:37 +01:00
Yuri D'Elia 17176c1df2 Save/restore the default feedrate correctly
Since the global feedrate can be similarly modified for moves ahead of
time, save the original feedrate in the planner as we do for
gcode_target.

This avoids having to undo feedmultiply (and machine limits!) from
"nominal_speed" as previously done.

Thanks @leptun
2019-11-28 17:16:37 +01:00
Yuri D'Elia 4f0af648fb Save/restore feedmultiply independently of the feedrate 2019-11-28 17:16:36 +01:00
Yuri D'Elia 6ecff003b7 Fix M600 insertion by the filament sensor
Remove incorrect usage of stop_and_save_print combined with the
fsensor_recovert internal instruction which would result in a
broken sequence of events and/or broken stack.

Re-use the now safe stop/recover functions in the same spot
(fsensor_checkpoint_stream) to effectively cut a hole in the current
gcode stream to insert an M600 instruction, which removes all
recursive behavior without the need of extra state variables.
2019-11-28 17:13:37 +01:00
Yuri D'Elia 4268c2fdae Fix recovery from relative/chunked moves
When starting to replay existing USB/SD commands from a recovery state,
an immediate relative move needs to compensate for a previously
interrupted move. This is almost the norm for the E axis.

Instead of saving the relative status of the move (which needs to
account for the world2machine conversion and is not always available on
a chunked move split by MBL) save directly the calculated target
position for the move in the original plan, which is easy to replay.
2019-11-28 16:42:35 +01:00
Yuri D'Elia faa9e925fe Replace a few loops with set_current_to_destination() 2019-11-28 15:57:21 +01:00
Yuri D'Elia 5fa7c178b5 Do not set current_position in mesh_plan_buffer_line
This is a task which _has_ to be performed by the caller,
such as prepare_move().
2019-11-28 15:57:21 +01:00
Yuri D'Elia 0f6b9b4051 Unroll the stack in restore_print_from_ram_and_continue
While handling moves in a recursive plan, such a filament check,
ensure restore_print_from_ram_and_continue unwinds the stack by
aborting early from any call that waits on the planner.

This currently only handles G1 moves, but hard-coded behavior that can
trigger recursive behavior (such as filament change) will probably have
to be checked too.
2019-11-28 15:57:20 +01:00
Yuri D'Elia 404802b5e6 Clear "sdprinting" state only when all SD moves are complete
Ensure card.printingHasFinished sees all the planned moves before
clearing sdprinting. To do that, we need to ensure all SD commands
exited the command queue.
2019-11-28 15:57:20 +01:00
Alex Voinea 7753750fa7
Change for to while 2019-11-27 17:31:47 +02:00
3d-gussner 660b646b57 RR Wiki for Dcodes
open D-1, D80, D81, D106, D2130
2019-11-27 11:29:55 +01:00
Alex Voinea 11ba616d73
Define for dumping sorting process 2019-11-27 11:03:34 +02:00
3d-gussner 475551431c How does M862.5 P works??? 2019-11-26 20:21:05 +01:00
3d-gussner 84cb373905 More G codes documented in RR wiki
M44, M45, M47, M403, M509, M851, M601, M602, M603, M862
2019-11-26 20:11:55 +01:00
Alex Voinea 66e51aa298
Folder sorting finished 2019-11-26 15:49:45 +02:00
Alex Voinea f5bdbcc0bd
Cleanup file compare statement 2019-11-26 14:10:44 +02:00
Alex Voinea a7f2e640e0
Put folders at the beginning 2019-11-26 13:57:08 +02:00
3d-gussner 5eaf6f0133 Merge branch 'MK3' into MK3-Gcode_documentation
Merge with MK3 branch
2019-11-26 12:48:21 +01:00
Alex Voinea 960f4a88ed
Status bar, lcd optimization, compile warning fix 2019-11-26 13:36:28 +02:00
Alex Voinea f87b5a2be7
SORTING_DUMP 2019-11-26 12:18:11 +02:00
Alex Voinea b803b2a2dd
Another first implementation 2019-11-26 11:29:57 +02:00
DRracer 35ce2896bb
Merge pull request #2339 from leptun/PFW-943
PFW-943: IR sensor gen. II - Updated PR
2019-11-25 06:23:24 +01:00
DRracer abb220ff69
Merge pull request #2323 from Panayiotis-git/MK3_Fix_M603
Add oversighted ‘break’ statement at the M603 command's source
2019-11-25 06:04:41 +01:00
Alex Voinea d40656e3ca
Small changes to rendering 2019-11-24 19:16:22 +02:00
Alex Voinea 273d834b19
Fix card removal 2019-11-22 20:27:24 +02:00
Alex Voinea 2fd192a95d
Set scroll delay to 300ms 2019-11-22 20:14:55 +02:00
Alex Voinea fdab70fa3a
Dir fixes 2019-11-22 14:39:21 +02:00
vintagepc 982c4cbf7b
Candidate fix for homing fail hard reset 2019-11-21 18:51:02 -05:00
Alex Voinea 8a806bceea SDDIR 2019-11-21 21:32:52 +02:00
Alex Voinea 6538262e75 First build that actually works 2019-11-21 19:04:45 +02:00
Alex Voinea 8f901d2613 Temporary fix 2019-11-21 14:58:13 +02:00
Alex Voinea b3a587f5a4 SD first attempt. Broken 2019-11-20 20:25:51 +02:00
Alex Voinea 45b89c5728 Fix typo 2019-11-19 13:55:37 +02:00
Alex Voinea e66574ac5f Updated branch to use TOGGLE 2019-11-19 13:51:10 +02:00
MRprusa3d 6e2793566c
Merge branch 'MK3' into PFW-943 2019-11-18 14:43:46 +01:00
Alex Voinea b077303156 Fix compile error 2019-11-17 11:10:13 +02:00
Alex Voinea 14104e7bf9 Clear error flag when fanError is disabled 2019-11-17 10:44:11 +02:00
Alex Voinea 2e0034d915 Update Toggles and Translations 2019-11-17 09:53:14 +02:00
Alex Voinea 359c447127 Do not check for fanError if it is not enabled on resume
Fix typos
2019-11-16 22:44:34 +02:00
Alex Voinea 07b6173aaa Merge branch 'MK3' into MK3-PFW-1024 2019-11-16 11:28:29 +02:00
DRracer e2e32b455a
Merge pull request #2247 from mkbel/reset_live_Z+offset
Show current Z offset in reset dialog before first layer calibration
2019-11-15 17:52:29 +01:00
DRracer 460f6c3b5e
update message 2019-11-15 17:47:39 +01:00
DRracer 86ea24c364
Merge pull request #2273 from wavexx/do_not_wait_for_disabled_heater
Do not wait forever if the heater on the extruder is disabled
2019-11-15 17:19:11 +01:00
DRracer 715794d854
Merge pull request #2092 from leptun/MK3_Translations
PFW-1062: Mk3 Toggle and Translations
2019-11-15 16:53:17 +01:00
DRracer 3a41405f52
Merge pull request #2146 from vintagepc/MK3-2093-sheet-display
PFW-1061: #2093 - Relocate sheet menu, show sheet on info screen
2019-11-15 16:07:51 +01:00
vintagepc f6c35c5d5f
Removed separate fix for #2089
Per PR fix request
2019-11-15 08:58:58 -05:00
DRracer 8fae50ec79
Merge pull request #2315 from mkbel/finda
PFW-1047: Show FINDA state as N/A if last received response is older than 1s.
2019-11-15 12:53:01 +01:00
DRracer 56251c4f99
Merge pull request #1937 from arons/MK3
added new function belt test under calibration menu
2019-11-15 09:39:42 +01:00
DRracer 9e780f0b2b
remove ESC sequence 2019-11-15 09:26:56 +01:00
Alex Voinea e559a6b67f Merge branch 'MK3' into MK3_BED_LEVELING_PWM 2019-11-13 14:32:57 +02:00
leptun 28e812d91f Mesh bed leveling testing 2019-11-13 14:32:33 +02:00
Panayiotis-git 23cf076242 Add oversighted ‘break’ statement at the M603 command's source 2019-11-12 21:32:39 +02:00
Alex Voinea 11428388c6 MBL toggle and cleanup 2019-11-09 20:58:56 +02:00
Alex Voinea 20a59f5f40 Temp cal. 2019-11-08 19:44:48 +02:00
3d-gussner 422e7fde4a Merge branch 'MK3' into MK3-Gcode_documentation 2019-11-08 18:16:56 +01:00
DRracer c82fa07299
Merge pull request #2195 from leptun/MK3-fix-LFN
Fix short filenames scrolling in sdprint menu and status screen
2019-11-08 16:52:53 +01:00
DRracer 21dd8eadd1
Merge pull request #2188 from mkbel/cut_last_try
Use MMU cutter only as last resort.
2019-11-08 16:49:28 +01:00
DRracer ce5efb107a
Merge pull request #2155 from leptun/MK3_SD_scroll_workaround
SD Scroll workaround
2019-11-08 16:48:38 +01:00
DRracer 4cf2f05d1d
Merge pull request #2057 from leptun/MK3_fix_M350
M350 for all axis - MK3
2019-11-08 16:15:15 +01:00
DRracer a14d7545a5
Update Marlin_main.cpp 2019-11-08 16:06:42 +01:00
DRracer b33c79e6c7
Merge pull request #1899 from wavexx/fix_lcd_pause_function
Fix the LCD pause function
2019-11-08 14:55:13 +01:00
DRracer 42d70f3dea
Merge pull request #1768 from wavexx/unknown_z_improvements
"Unknown z" improvements
2019-11-08 14:52:56 +01:00
Alex Voinea 1de353dd09 Merge branch 'MK3' into MK3_Translations 2019-11-07 17:02:45 +02:00
3d-gussner 5bd995b21b Added more info to doxygen G-Codes 2019-11-06 11:14:06 +01:00
3d-gussner e6eeafd20c More M-Commands ... 2019-11-05 15:47:04 +01:00
3d-gussner ca234a11ed M-Commands to M240 2019-11-05 12:40:51 +01:00
3d-gussner 8114bd5b1c Merge with MK3 and few spaces 2019-11-05 09:05:05 +01:00
3d-gussner 58404b9c9d Merge branch 'MK3' into MK3-Gcode_documentation 2019-11-05 09:04:52 +01:00
DRracer e56cb14bb9
Merge pull request #1739 from draeath/MK3-fix-sdcard-sorting
use modification times for sdcard time sorting. fixes #477
2019-11-04 17:31:38 +01:00
DRracer 3c26f7855b
Merge pull request #1704 from leptun/MK3_Enable_fan_waiting_cooldown
Enable print fan while waiting for cooldown
2019-11-04 16:52:26 +01:00
leptun 459385708e Fix MMU needs user attention Statistics error 2019-11-02 13:15:13 +02:00
leptun cd5ff783cf General fixes and improvements to code 2019-10-31 19:07:20 +02:00
Marek Bel 76c39ce689 Show FINDA state as N/A if last received response is older than 1s. 2019-10-31 17:45:22 +01:00
3d-gussner 4501f9d760 M commands documentation #2 2019-10-31 15:46:23 +01:00
3d-gussner 21dcfb23f4 Follow RepRap Wiki G-codes documentation
M120 is Enable endstops
M121 is disable endstops
I guess this was just a typo issue.
2019-10-31 15:31:08 +01:00
3d-gussner c899320590 Fix M81 Turn off Power Supply...
... as it should be active if PS_ON_PIN is defined and assinged to an actual pin.
2019-10-31 15:08:07 +01:00
leptun 1e09f8c003 Wake on certain events
EEPROM DIM and BRIGHT values swapped!!!
2019-10-30 21:11:19 +02:00
3d-gussner ce8dbb5013 M commands documentation #1 2019-10-30 18:52:25 +01:00
3d-gussner b9dca5f895 other doxygen format changes 2019-10-30 15:52:27 +01:00
3d-gussner d472f0730c Change doxygen format 2019-10-30 15:50:23 +01:00
3d-gussner 986ac95c45 G codes documented ... next M commands 2019-10-30 11:19:51 +01:00
3d-gussner 8f05627747 Update #1 gcodes doxygen documentation
added some RepRap G-codes Wiki external links.
2019-10-25 13:04:04 +02:00
3d-gussner c772fd2cae Merge branch 'MK3' into MK3_Dutch 2019-10-24 16:44:27 +02:00
Marek Bel 023ce01f9d Version 3.8.1 final. 2019-10-24 16:12:46 +02:00
3d-gussner a4211da8f0 Merge branch 'MK3' into MK3_Dutch 2019-10-24 15:39:32 +02:00
XPila b603528bfd
Merge pull request #2291 from DRracer/lang-381-fixes-4
Lang 381 fixes 4
2019-10-23 15:04:39 +02:00
Yuri D'Elia e25befa175 Fix include guard to silence duplicate declaration warnings 2019-10-22 15:49:10 +02:00
Yuri D'Elia 50231b76da Improved handling of unknown Z position
- Introduce raise_z_above to move Z carefully when the current position
  is potentially unknown, using stallguard
- Use raise_z_above for:
  * filament loading/unloading clearance
  * extruder spacing when preheating (to avoid buildplate marks on PEI)
  * before homing to avoid damaging the build plate and to avoid
    repeated Z moves as well

Since raise_z_above is conditional, it will only raise when needed.

Calling raise_z_above when the extruder position is unknown and already
at maximum travel is safe and will prevent further vertical moves.
2019-10-22 15:49:10 +02:00
DRracer d32fd1d893 Better EN for new messages 2019-10-22 09:11:47 +02:00
leptun 4943e17bda Preserve power during PP by turning off backlight 2019-10-19 18:45:31 +03:00
leptun d7b12faa95 Add "Brightness" to Tune menu 2019-10-19 18:45:04 +03:00
leptun 0ed4a23ae7 And another compile fix... 2019-10-18 12:42:55 +03:00
leptun 9fc42526e7 Backlight always on during calibration 2019-10-18 12:18:43 +03:00
leptun 91e94aa0e8 Adjustable timeout 2019-10-18 10:32:41 +03:00
leptun d432c3644d Enable beeping after fan error is fixed 2019-10-18 09:13:19 +03:00
leptun ea8d9ae49d Merge branch 'MK3' into MK3_Octoprint_fIxes 2019-10-18 08:45:22 +03:00
leptun ace1d7049a Reenable command processing when issue is fixed if printer not active 2019-10-17 17:49:15 +03:00
leptun 812eafd09c Fix compile for miniRambo 2019-10-17 13:14:32 +03:00
leptun 25e0d23efe Backlight overhaul and UI changes 2019-10-17 13:11:32 +03:00
DRracer 04bfe674df tiny lang fixes, part 1 2019-10-16 16:32:49 +02:00
leptun 3b005ae38f Backlight detection 2019-10-16 14:40:45 +03:00
DRracer 5a4126e00c
Merge pull request #2263 from leptun/MK3-Fix_PSU_DELTA_SILENT
PSU_DELTA fix force_high_power_mode()
2019-10-16 13:22:22 +02:00
Yuri D'Elia 7f3ba499a0 Do not wait forever if the heater on the extruder is disabled 2019-10-15 20:54:00 +02:00
leptun 5a662413e6 Fix compile for printer without backlight support 2019-10-13 14:34:04 +03:00
leptun 75f389a71d Auto-Dimming initial 2019-10-13 14:31:43 +03:00
leptun 4703853a3d Small fixes 2019-10-12 13:19:17 +03:00
leptun 350e27810a fix selftest Z crash. Use stallGuard when testing Z 2019-10-11 21:00:51 +03:00
leptun b2a1dc6786 Compile fix for firmware without LCD_BL_PIN 2019-10-11 19:23:38 +03:00
leptun 68491c9d4d First implementation 2019-10-11 19:06:37 +03:00
leptun e3ac2e2509 PSU_DELTA fix force_high_power_mode() 2019-10-10 19:01:57 +03:00
leptun dde61bb444 Automaton changes. Keep heater ON during probing only if pwm is high 2019-10-06 12:44:45 +03:00
leptun 7650e2b60c Handle disable_heater() 2019-10-06 12:43:03 +03:00
leptun 570b5989f4 Disable bed PWM while probing bed. 2019-10-06 10:50:11 +03:00
Marek Bel 219a5e0625 Initialize EEPROM_SILENT in one place both for MK3 and MK25 printers and make it more clear. 2019-10-03 21:25:52 +02:00
3d-gussner b52f42b397 Merge branch 'MK3' into MK3_Dutch 2019-10-03 18:54:53 +02:00
Marek Bel 0dde5e3167 Increase version. 2019-10-03 17:37:22 +02:00
Marek Bel 4fc4cf9c11 Increase version and commit number. 2019-10-03 17:30:14 +02:00
Marek Bel 7feb763643 Move check for clear EEPROM just after factory_reset() to ensure nothing is written to EEPROM before check.
Fix wizard not starting after Factory RESET / All Data on MK25 printer.

This was broken by:

Author:      leptun <voinea.dragos.alexandru@gmail.com>
Date:        3 weeks ago (9/12/2019 6:16:31 AM)
Commit hash: 78708903e8

Also update eeprom value
2019-10-02 18:38:46 +02:00
3d-gussner a4e9f08e16 Merge branch 'MK3' into MK3_Dutch 2019-10-02 11:11:28 +02:00
Marek Běl 05e23d1468
Merge branch 'MK3' into MM_lay1_cal 2019-10-01 23:08:11 +02:00
DRracer ff7260dc6e
Merge pull request #2246 from mkbel/reset_live_Z
Reset live z
2019-10-01 23:02:40 +02:00
Marek Bel 74a1c9341b Revert "Use content supplied strings for lcd_first_layer_calibration_reset(), as we have translations prepared for release. It will be reverted later to show current Z offset."
This reverts commit ca9ef3aba1.
2019-10-01 22:57:59 +02:00
Marek Bel ca9ef3aba1 Use content supplied strings for lcd_first_layer_calibration_reset(), as we have translations prepared for release. It will be reverted later to show current Z offset. 2019-10-01 22:57:15 +02:00
Marek Běl 210d7f6bf1
Merge pull request #2245 from DRracer/knob-long-press
Knob long press fixes
2019-10-01 22:33:26 +02:00
Marek Bel 087d3cb250 Continue to lcd_v2_calibration() after selection is made in lcd_first_layer_calibration_reset(). Do not ask for selection if sheet is not calibrated, it is calibrated to zero offset or no first layer calibration was ever made. 2019-10-01 21:04:00 +02:00
Marek Bel aabf7655dc Do all text formatting in first layer calibration reset dialog in one line. 2019-10-01 19:20:36 +02:00
leptun 6bd35bfa2f Increase MENU_DEPTH_MAX to 7 to allow sheet calibration with MMU 2019-10-01 19:43:30 +03:00
Marek Bel 7c3f397a62 Print sheet name and Z offset in first layer calibration reset dialog. 2019-10-01 18:22:12 +02:00
leptun b39f09b68e Merge branch 'MK3' into MM_lay1_cal 2019-10-01 19:20:50 +03:00
DRracer d044d3b7b5
Merge pull request #2244 from MRprusa3d/PFW-1008
EEPROM_BABYSTEP_Z using removal
2019-10-01 18:04:09 +02:00
DRracer f3c3526aa5 fix the knob long-press causing hang in modal dialogs 2019-10-01 17:13:36 +02:00
MRprusa3d ed13788e0c EEPROM_BABYSTEP_Z using removal 2019-10-01 16:57:37 +02:00
DRracer 9ae75612b5 Fixes after first feature tests 2019-10-01 15:31:01 +02:00
DRracer 06187f52f3
Merge pull request #2230 from leptun/MK3_Octoprint_fIxes
Mk3 Fan error fix
2019-10-01 11:34:55 +02:00
DRracer 72aed3c544 Allow knob-long-press only in listed menus 2019-10-01 10:51:02 +02:00
Marek Bel 543ad6eb41 Ask to reset Z offset before first layer calibration. 2019-09-30 19:58:09 +02:00
leptun 9d57f9c365 Fix fan_error_selftest() mistake 2019-09-30 20:30:09 +03:00
leptun 61c7479579 Code cleanup: Move texts to messages.c/h 2019-09-30 20:16:01 +03:00
leptun 30f325c81d Extract fan_error_selftest to function for readability 2019-09-30 20:01:31 +03:00
DRracer aa50479da5
Merge pull request #2231 from MRprusa3d/PFW-873c
default nozzle diameter for farm mode
2019-09-30 18:36:25 +02:00
Marek Bel aba9d1c360 Merge branch 'MK3' into MM_lay1_cal 2019-09-30 18:13:57 +02:00
DRracer d31abd4bce
Merge pull request #2240 from leptun/MK3_fix_SD_workDirDepth
fix workDirDepth not reset after card init.
2019-09-30 17:32:46 +02:00
leptun bf09eb943d fix workDirDepth not reset after card init. 2019-09-29 21:09:11 +03:00
Marek Bel 8c7015df53 Document set current command. 2019-09-27 15:42:31 +02:00
leptun ff9a6c8177 Prevent fan error while checking fan functionality 2019-09-26 20:52:29 +03:00
leptun dfd3f34351 Check for minimum fan speed. Should be achievable by both fans in 1s. 2019-09-25 22:35:35 +03:00
leptun 9c22692827 Fix Cancel Print command processing 2019-09-25 22:34:31 +03:00
leptun 4d149f0dfa Do not send useless keepalive messages after print is canceled from lcd 2019-09-25 18:50:29 +03:00
leptun 532d1fc4ae Fix "Resume Print" missing when doing a normal pause 2019-09-25 18:32:35 +03:00
leptun 14b72d2b46 Prevent timeout when printing from SD with USB host connected 2019-09-25 18:12:19 +03:00
leptun c3b7b5ebb5 Check fans before resuming 2019-09-25 15:58:07 +03:00
MRprusa3d 89de5aac77 default nozzle diameter for farm mode 2019-09-23 17:13:33 +02:00
leptun 3c17f7e145 No need to check the fan in the menu 2019-09-22 14:04:58 +03:00
3d-gussner 049cca297b Merge branch 'MK3' into MK3_Dutch
Merge with MK3 and fix merge issues
2019-09-21 11:54:31 +02:00
leptun 2363f19a62 Minor tweaks for usb printing 2019-09-20 21:07:20 +03:00
DRracer 139c37c744 allow only one string translation constraint defintion per line 2019-09-20 13:01:07 +02:00
leptun fd01942db8 FAN Error fix - Initial 2019-09-19 20:48:59 +03:00
D.R.racer 2afeb65811 return failStatsFmt that fell out in merge 2019-09-19 18:39:25 +02:00
D.R.racer f50cef8361 Merge remote-tracking branch 'upstream/MK3' into translations-doc
and resolve ultralcd.cpp conflicts
2019-09-19 18:10:20 +02:00
Marek Běl 68359687f8
Merge pull request #2202 from DRracer/lang-381-fixes
dialogs' layouts fixes + FR polished
2019-09-19 16:33:26 +02:00
D.R.racer 17cca89993 Merge remote-tracking branch 'upstream/MK3' into translations-doc 2019-09-18 15:17:28 +02:00
DRracer e7273ea505 Fix [French translation] Wrong display during mesh bed calibration #2218
minor code/doc improvements
2019-09-18 12:49:44 +02:00
DRracer c1bf4a6288
Merge pull request #2216 from michalrudolf/MK3-miniopravy
Mk3 miniopravy
2019-09-18 11:34:17 +02:00
DRracer 9ff0b7c3a5
Merge pull request #2199 from leptun/MK3_MK2.x_fix_Default_stepper_power
Mk3 mk2.x fix default stepper power
2019-09-18 11:05:23 +02:00
Marek Bel 19a8537901 Document. 2019-09-17 20:35:18 +02:00
Marek Bel 027b6238fd Mark code unused when PINDA_THERMISTOR is defined by macro. Saves 1B of RAM and 4B of FLASH memory. 2019-09-17 20:26:03 +02:00
Marek Bel 966d9baf2b Document. 2019-09-17 19:00:03 +02:00
DRracer 14933f6b0e Fix. Sound [assist], Z-probe [5], menu_fmt_float13off format for last
string parameter from PROGMEM
2019-09-17 16:50:51 +02:00
michalrudolf b660cb3908
ultralcd.cpp 2019-09-17 11:46:29 +02:00
D.R.racer 77c4720c8b Merge remote-tracking branch 'upstream/MK3' into translations-doc 2019-09-17 11:32:27 +02:00
michalrudolf b4e0c2f455
Update ultralcd.cpp
Menu Support -> XYZ calibration details -> 3. obrazovka "point offset"
X value is no longer moved to the left if there’s no negative sign
2019-09-17 10:51:43 +02:00
Marek Bel c66b4bd876 Do not ask for preheat temperature twice if calibrating first layer from wizard without filament. 2019-09-16 21:14:17 +02:00
Marek Bel e1cfd6dc4f Remove option to heat nozzle only from mFilamentItem() when activated from wizard, as it has no use after filament unload was removed from wizard. 2019-09-16 18:48:52 +02:00
Marek Bel ff4450489b Document. 2019-09-16 18:38:44 +02:00
Marek Bel 002a7d31a4 Make lcd_wizard() more debug friendly. 2019-09-16 18:31:12 +02:00
Marek Bel b99038736c Use eeprom_update_byte instead of eeprom_write_byte 2019-09-16 18:22:34 +02:00
MRprusa3d d491a9801d
Update ultralcd.cpp 2019-09-16 16:04:45 +02:00
MRprusa3d 0e1d559f03
Merge branch 'MK3' into PFW-943 2019-09-16 15:29:28 +02:00
MRprusa3d 011468598e IR sensor gen. II
disconnected PCB detection
2019-09-16 00:43:37 +02:00
3d-gussner 9a7a909c6f Prepare adding new language 2019-09-14 15:49:33 +02:00
leptun 695f938348 Fix conversion warnings 2019-09-14 12:24:45 +03:00
leptun e828798209 Fixes after merge and line buffer
General fixes to the lcd_edit_off item and improved way to generate the toggles.
The old process is this: Write '>' if required -> print base -> pad everything before the last character with spaces -> write the eol character -> jump back and print the toggle over the blank characters. This resulted in noticeable flickering when the toggle was redrawn and was showing the same thing. Now the process is similar, except that everything happens in a "line buffer" (a char buffer that holds an entire line) and gets printed in one go, avoiding jump instructions for the lcd and prevents flickering since it doesn't write ' ' and the letters afterwards.
This should get even better when the lcd_buffer gets implemented since the line_buffer will get compared to the existing data on the screen and avoid overwriting what is on the lcd with the same thing.
2019-09-13 21:21:42 +03:00
Marek Bel 015b34de05 Alert user in wizard about more sheets presets. 2019-09-13 17:09:11 +02:00
DRracer 4423106fad dialogs' layouts fixes (support menu dlgs, statistics etc.)
French translation polished
2019-09-13 16:55:05 +02:00
Marek Bel e754780717 Fix condition for returning to wizard. eFilamentAction == FilamentAction::Preheat was never true as eFilamentAction is set to eFilamentAction::None in lcd_return_to_status(). 2019-09-13 00:19:37 +02:00
Marek Bel f1d190d2d5 Do not ask same filament related question twice if starting first layer calibration from wizard. 2019-09-12 23:41:42 +02:00
Marek Bel ebf405d589 Preselect "yes" for filament question in first layer calibration wizard. 2019-09-12 23:20:03 +02:00
Marek Bel d256c18635 Fix first layer calibration wizard. Do not jump to WizState::LoadFil if calibration is supposed to be performed. 2019-09-12 23:17:19 +02:00
Marek Bel 73642632f5 Do not force PLA filament in first layer calibration from wizard. Remove duplicate variable wizard_active. Saves 410 B of FLASH and 1 B of RAM. 2019-09-12 22:37:28 +02:00
Marek Bel 07a0f527d8 Reset lcd_encoder_diff in lcd_show_fullscreen_message_yes_no_and_wait_P() also when it times out. 2019-09-12 20:30:27 +02:00
Marek Bel 6630591f9e Consume lcd_encoder_diff in lcd_show_fullscreen_message_yes_no_and_wait_P().
This fixes problem encountered in lcd_v2_calibration(). Selected menu item skips to another if returning to menu after this message is used.
2019-09-12 20:20:33 +02:00
Marek Bel d48197656c Fix lcd_v2_calibration menu not redrawn after full screen message or question. 2019-09-12 20:05:16 +02:00
Marek Bel 770e470fd5 Extract common code to function preheat_or_continue(). Saves 138B of FLASH memory. 2019-09-12 18:53:24 +02:00
Marek Bel d80b8280a0 Remove commented out and unused functions prototypes. 2019-09-12 18:41:17 +02:00
Marek Bel 3a541488b2 Rename extr_unload_() to mmu_unload_filament() and move it to ultralcd.cpp as it is menu. 2019-09-12 18:40:02 +02:00
Marek Bel 0cdfa7a5e8 Remove dead code. 2019-09-12 18:33:02 +02:00
Marek Bel e83b2ebe1f Rename mFilamentMenu to lcd_generic_preheat_menu to match naming convention for global function and be more descriptive. 2019-09-12 18:15:15 +02:00
Marek Bel c26d7e50f7 Remove redundant lcd_update_enable(true) call. 2019-09-12 18:07:46 +02:00
Marek Bel 6674cbf0d7 Select material / temperature before first layer calibration. 2019-09-12 17:54:05 +02:00
leptun ae839aee31 Merge branch 'MK3' into MK3_Translations 2019-09-12 16:28:36 +03:00
Marek Bel 6661d3aa45 Merge remote-tracking branch 'prusa3d/MK3' into MM_lay1_cal 2019-09-12 14:28:52 +02:00
DRracer 521c5eb8ef
Merge pull request #2141 from mkbel/preheat_menu
Unify preheat menu, add ASA material
2019-09-12 14:25:38 +02:00
leptun 444daceca3 Move define as requested 2019-09-12 13:39:04 +03:00
leptun 78708903e8 Also update eeprom value 2019-09-12 07:16:31 +03:00
Marek Bel 43705aae2e Rename lay1cal_preheat() to lay1cal_wait_preheat(). 2019-09-12 00:19:20 +02:00
Marek Bel ae3e6530e6 Do not ask for PLA filament in the beginning of first layer calibration. Do not ask if filament is present if it can be detected by IR sensor. 2019-09-12 00:14:24 +02:00
Marek Bel 14dc6b86e0 Change undocumented behaviour of M190 (Wait for bed temperature). Document M190 and M109 (Wait for extruder temperature).
Do not remember CooldownNoWait property set by M190 and M109. If M190 was invoked without parameters, CooldownNoWait property was set if it was previously set by "M109 S" or "M109 S" or printer was after power up. Otherwise CooldownNoWait was not set. Now CooldownNoWait is never set if M190 is invoked without parameters.

Saves 44 B of FLASH memory.
2019-09-11 23:37:09 +02:00
Marek Bel acb0341a1f Do not set temperature in lay1cal_preheat(). 2019-09-11 22:42:40 +02:00
leptun bf9f668574 Fix short filenames scrolling in sdprint menu and status screen 2019-09-11 22:04:48 +03:00
Marek Bel 608aa6ff3c Increase number of MMU load tries, so the same number of retries are done without cutter as before enabling cutter. 2019-09-10 18:49:23 +02:00
Marek Bel 0fda4e5594 Merge branch 'cut_last_try' into enable_cutter 2019-09-10 18:37:09 +02:00
Marek Bel bb1fb49894 Use MMU cutter only as last resort. Cut filament only before last load retry. 2019-09-10 18:36:14 +02:00
Marek Běl 5a1005e143
Merge pull request #2186 from DRracer/enable-fan-pin-test-MK3
Enable fan pin test even for MK3
2019-09-10 18:21:17 +02:00
DRracer d94356802c
Merge pull request #2187 from prusa3d/MK3_3.8.0
Mk3 3.8.0
2019-09-10 18:19:36 +02:00
DRracer e1e40213b2 Enable fan pin test even for MK3 (was disabled in 3.7.2 due to lack of
FLASH)
2019-09-10 16:49:22 +02:00
DRracer 898e85e69f
Merge pull request #2038 from Eriobis/MK3
Add a threshold distance to Z calibration
2019-09-10 16:20:24 +02:00
DRracer 76c062b980
Merge pull request #2169 from mkbel/format
Use same format for all instances where "ok" is send to serial line.
2019-09-10 14:14:47 +02:00
DRracer 059c6b6cbf
Merge pull request #2148 from leptun/MK3_MK2.x_fix_Default_stepper_power
Mk3 mk2.x fix default stepper power
2019-09-10 14:13:51 +02:00
DRracer 60de313b8a
Merge pull request #1759 from wavexx/enhanced_longpress
Default to "Live Adjust Z" when longpressing during a print (closes #1604)
2019-09-10 14:13:00 +02:00
DRracer f6f8f5b3b6
Merge pull request #2171 from 3d-gussner/patch-3
Update reserved space bytes as mentioned in
2019-09-10 14:07:56 +02:00
DRracer 90f85f7128
Merge pull request #2181 from leptun/MK3_fix_lcd_warning
Mk3 fix lcd warning
2019-09-10 14:07:28 +02:00
leptun 818befb91b Fix compile warning
function was defined as static in lcd.cpp and redefined in lcd.h
2019-09-09 14:05:20 +03:00
leptun 2480bd90fc Revert lcd_putchar to type int and retrun 0
Discussion: https://github.com/prusa3d/Prusa-Firmware/pull/2008#issuecomment-514500738
2019-09-09 13:59:20 +03:00
MRprusa3d 7cc9fe2e4f
Update 1_75mm_MK3S-EINSy10a-E3Dv6full.h 2019-09-09 02:20:39 +02:00
MRprusa3d 70de4d58f6
Update 1_75mm_MK3-EINSy10a-E3Dv6full.h 2019-09-09 02:20:14 +02:00
MRprusa3d fb561b15ad
Update 1_75mm_MK25S-RAMBo13a-E3Dv6full.h 2019-09-09 02:19:52 +02:00
MRprusa3d 325e4a3403
Update 1_75mm_MK25S-RAMBo10a-E3Dv6full.h 2019-09-09 02:19:27 +02:00
MRprusa3d 0b50b2295c
Update 1_75mm_MK25-RAMBo13a-E3Dv6full.h 2019-09-09 02:18:54 +02:00
MRprusa3d e581263bf1
Update 1_75mm_MK25-RAMBo10a-E3Dv6full.h 2019-09-09 02:18:22 +02:00
MRprusa3d ca6937edaf
Update 1_75mm_MK2-RAMBo13a-E3Dv6full.h 2019-09-09 02:17:42 +02:00
MRprusa3d a9a3d9d084
Update 1_75mm_MK2-RAMBo10a-E3Dv6full.h 2019-09-09 02:17:00 +02:00
MRprusa3d 978ace7fd7
Update Marlin_main.cpp 2019-09-09 02:16:06 +02:00
MRprusa3d 28c1486df2
Update Configuration.h 2019-09-09 02:14:10 +02:00
DRracer eec8e5f8c0 Version changed (3.8.0 build 2684) 2019-09-06 19:47:05 +02:00
3d-gussner d408fd2f42
Update reserved space bytes as mentioned in
https://github.com/prusa3d/Prusa-Firmware/pull/2170#pullrequestreview-284810840
2019-09-06 15:54:04 +02:00
DRracer 3ba2197dd3 more space for the second lang 2019-09-06 08:37:59 +02:00
Marek Bel e73b0a88d5 Use same format for all instances where "ok" is send to serial line. 2019-09-05 22:35:01 +02:00
Marek Bel 3a5daf1c64 Change default sheet names. 2019-09-05 17:27:21 +02:00
3d-gussner d51b3d6207 Added doxygen todos for missing LCD layout and positioning 2019-09-01 09:51:51 +02:00
vintagepc 339771a5fb Fixed info screen when selected_sheet hasn't been initialized. 2019-08-31 21:27:08 -04:00
leptun 10cdcb3ae3 SD Scroll workaround 2019-08-31 17:00:39 +03:00
leptun 795b1d1cf7 Toggle Sound 2019-08-31 16:56:14 +03:00
Yuri D'Elia 2345288d40 Fix the LCD pause function
Do not call long_pause recursively!

long_pause() is called before resetting the lcd_command_type. As
long_pause uses st_synchronize() internally, there could be time to
schedule another call to long_pause().
2019-08-31 15:28:31 +02:00
leptun 3c4fffef60 Merge branch 'MK3' into MK3_Translations 2019-08-31 15:30:51 +03:00
leptun a5a5f5cf0b Toggle RPi port
Probably works, needs to be tested.
2019-08-31 15:25:00 +03:00
leptun f69035323a Toggle SD Settings
This includes FlashAir support and SD Sorting type
2019-08-31 14:55:51 +03:00
leptun a821002f02 Toggle MMU Mode 2019-08-31 07:38:40 +03:00
vintagepc d347a36509 Merge branch 'MK3' of https://github.com/prusa3d/Prusa-Firmware into MK3-2093-sheet-display 2019-08-30 19:17:27 -04:00
vintagepc 871e29621f Fix "stuck" rename cursor 2019-08-30 19:14:22 -04:00
Marek Běl a789a8995f
Merge pull request #2145 from mkbel/fix_sheet_reset
Fix sheet reset
2019-08-30 16:49:34 +02:00
leptun 6a8330a43b Toggle "HW Setup"*
All toggles from "HW Setup" were changed.
This includes:
-"Nozzle d."
-all "Checks"
Also added an option to provide a string from sram (not from progmem) as the toggle argument. This can be useful when toggling numbers or even when toggling sheets in the future.
2019-08-30 17:36:21 +03:00
Marek Bel 865484590b Change default sheet name from "<number>" to "Sheet <number>". 2019-08-30 16:11:41 +02:00
Marek Bel 3d292350d4 Do not activate selected_sheet in lcd_v2_calibration() as this leads to calibrating random sheet if activated from calibration menu.
selected_sheet is initialized to 0 and contains index of last Sheet menu visited.
2019-08-30 14:45:25 +02:00
Marek Bel 26423f98bc Switch to next sheet if currently selected sheet is not initialized. Move next_initialized_sheet() and change_sheet_from_menu() to eeprom.cpp, rename it to eeprom_next_initialized_sheet() and eeprom_switch_to_next_sheet(). Rename default_sheet_name() to eeprom_default_sheet_name(). 2019-08-30 12:24:13 +02:00
Marek Bel 6c78c2fad5 Fix compiler warning. 2019-08-30 12:03:35 +02:00
leptun 90e5f14309 Fix compile error on MK3 2019-08-30 13:02:00 +03:00
Marek Bel 50a8c16f27 Use EEPROM update instead of write. 2019-08-30 12:00:33 +02:00
leptun 56c949b9af Fix typo 2019-08-30 12:14:43 +03:00
leptun d8d0069f97 Fix MK2.x Default stepper power out of sync 2019-08-30 12:12:29 +03:00
leptun b86a92a7d6 Toggle Mode (stepper power) 2019-08-30 07:59:58 +03:00
vintagepc 8df6691819 Relocate sheet menu, show sheet on info screen
-Sheet is shown instead of percentage done either if idle, or during
print preheat.
-Relocated sheet menu to below SD menu for additional visibility to
current sheet.
2019-08-29 18:07:24 -04:00
leptun db6e2e0525 Toggle Crash det. 2019-08-29 22:31:30 +03:00
Marek Bel 8c8619be05 Convert reset sheet sub menu to function. 2019-08-29 20:52:53 +02:00
Marek Bel abf84e36f5 Fix sheet menu back caption to Steel sheets to match parent menu caption. 2019-08-29 20:23:02 +02:00
Marek Bel d647cdc02c Convert sheet switcher from sub menu to function. Handle null characters in sheet name. 2019-08-29 20:13:10 +02:00
Marek Bel cd7805ba46 Document 2019-08-29 18:26:24 +02:00
Marek Bel 0b196da6fc Migrate old vale of EEPROM_BABYSTEP_Z only if active sheet is not initialized. 2019-08-29 18:07:49 +02:00
Marek Bel 32f435d1a0 Increase number of configurable steel sheets to 8. Move sheets into sub menu of HW setup. 2019-08-29 17:21:08 +02:00
leptun 7f51e0bad8 Move SpoolJoin and Cutter to MSGs 2019-08-29 17:35:26 +03:00
Marek Běl 3413d5d486
Merge pull request #2139 from DRracer/assist-mode-fixes
Fix sound mode [assist]: encoder clicking indefinitely when MMU wants to
2019-08-29 15:55:49 +02:00
Marek Běl fec92b33ae
Merge pull request #2137 from DRracer/illegal-fat-characters-revised
Support for more special characters allowed in file names (^ + = [ ] ;
2019-08-29 15:55:36 +02:00
leptun 0b21acec46 Minor fix to Toggle Cutter 2019-08-29 15:49:26 +03:00
leptun d0f9f10ed6 Toggle Cutter 2019-08-29 15:43:41 +03:00
leptun 1937cf2074 Toggle SpoolJoin 2019-08-29 15:40:04 +03:00
leptun 5eea8d26fe Merge branch 'MK3' into MK3_Translations 2019-08-29 12:08:48 +03:00
Marek Bel f3bb72be64 Reset calibration status if there is no calibrated sheet after reset. 2019-08-29 03:33:33 +02:00
Marek Bel f64252b59b Hide sheet switcher from main menu, if there are less than 2 sheets calibrated. 2019-08-28 19:08:53 +02:00
Marek Bel 9692f94683 Move sheet menu up to be after Print from SD. 2019-08-28 19:01:48 +02:00
Marek Bel 3903dc819a Extract function next_initialized_sheet from change_sheet_from_menu(). Make it more general to depend on sizeof(Sheets::s) instead of hard coded value of 2. 2019-08-28 18:59:48 +02:00
Marek Bel 33675c6d1e Change default sheet names. 2019-08-28 18:16:35 +02:00
Marek Bel 49bc11037c Remove statements with no effect. 2019-08-28 18:14:10 +02:00
DRracer 1d23cc52e9 endstop sound alert fixes 2019-08-28 09:39:28 +02:00
Marek Bel 29c8cb2927 Fix bad merge. 2019-08-27 22:22:36 +02:00
Marek Běl 3f04c4db87
Merge branch 'MK3' into preheat_menu 2019-08-27 22:20:23 +02:00
Marek Bel 07169ad84a Make file local variable static. 2019-08-27 20:48:53 +02:00
Marek Bel e57fcc04a7 Fix compiler warnings. 2019-08-27 20:23:48 +02:00
Marek Bel d927d5b05d Port wizard_active to mFilamentItem(). 2019-08-27 20:19:03 +02:00
Marek Bel cef7f31b9f Set FilamentAction to None if mFilamentMenu left by cooldown or menu back action. 2019-08-27 20:13:55 +02:00
Marek Bel ffc5a64154 Remove commented out code. 2019-08-27 20:06:48 +02:00
Marek Bel 269aef1696 Remove unused code guarded by WATCH_TEMP_PERIOD macro as most of the functionality is duplicate to what is implemented in temp_runaway_check(). This will release us from porting setWatch() to unified preheat menu and maintaining it. 2019-08-27 20:05:10 +02:00
DRracer 1a1be5c518 Fix sound mode [assist]: encoder clicking indefinitely when MMU wants to
select filament
2019-08-27 17:10:29 +02:00
Marek Bel bf2097342d Add ASA preheat into mFilamentMenu(); 2019-08-27 17:01:41 +02:00
DRracer 11ce786aaa Support for more special characters allowed in file names (^ + = [ ] ;
,)
2019-08-27 13:47:58 +02:00
DRracer 6aaa40b9a3
Merge pull request #2134 from mkbel/fix_power_panic
Fix repeated power panic restarted print from beginning or jumped at …
2019-08-27 08:13:26 +02:00
DRracer a1e68c3d7f
Merge pull request #2135 from prusa3d/MK3_3.8.0
Increase version to 3.8.0-RC2 and build number to 2639.
2019-08-27 08:12:27 +02:00
Marek Bel 3da43ae8c2 Do not port print fan preheat speed preset, as it was never used. And it was broken until recently fixed when adding ASA profile. 2019-08-26 21:14:07 +02:00
Marek Bel 4792559536 Add farm preheat items. Add setWatch() call. 2019-08-26 21:00:30 +02:00
Marek Bel aa13f9e809 Fix formatting. 2019-08-26 20:19:34 +02:00
Marek Bel 668e89e5a9 Preheat menu: Add ASA, hide menu item back when in wizard. 2019-08-26 20:18:34 +02:00
Marek Bel 52ae62bbba Fix formatting. 2019-08-26 20:14:00 +02:00
Marek Bel 3628d893ee Remove duplicate preheat menu.
Known limitations: farm_mode missing, wizard_active missing, cooldown missing, ASA missing, print fan missing.
2019-08-26 20:11:52 +02:00
Marek Bel b9b0d6049e Fix formatting. 2019-08-26 19:48:39 +02:00
Marek Bel 159a1a70d8 Update documentation. 2019-08-26 17:19:57 +02:00
Marek Bel c27fcf9cff Increase version to 3.8.0-RC2 and build number to 2639. 2019-08-26 17:03:18 +02:00
Marek Bel 52cb37770b Fix repeated power panic restarted print from beginning or jumped at most 65536 B back in file printed from SD card.
As sdpos_atomic was not updated after printer power up and first power panic recovery, it was equal 0. When the first command from SD card was queued its size on SD card was computed as current SD index position minus sdpos_atomic. This was equal to offset from beginning of the file limited to 16 bit storage type. When next power outage occurred earlier then this command was finished and wiped out of queue, this command size (extraordinarily big) was subtracted from sdpos_atomic and saved to EEPROM. This led to up to 65536 B jump back in file printed after next power panic recovery.
2019-08-23 19:30:20 +02:00
Marek Bel 3eb36ca194 Fix cmdqueue_dump_to_serial.
Header was historically made bigger to contain size of the command on SD card, but those debug functions wasn't updated.
2019-08-23 16:48:30 +02:00
XPila 5bb510dd2a
Merge pull request #2129 from DRracer/bed-noise-performance
Improve performance of bed PWM automaton
2019-08-22 14:45:01 +02:00
DRracer c6df3fe012
Merge pull request #2127 from DRracer/code-size-reduction-1
Code size reduced by almost 5KB
2019-08-22 14:25:23 +02:00
3d-gussner d3123a74b0 Updated LCD menu documentation to new form/syntax 2019-08-22 04:58:16 +02:00
3d-gussner 514b062107
Added `lcd_menu` format description
Added some documentation how the LCD menus look like and added max character values for translations.

There are more things needed and also the placement in the code is an open task. Depending on the decision if we use `messages.c/h`
2019-08-21 10:28:28 +02:00
DRracer a7c2aec04c Code size reduced by almost 5KB 2019-08-21 09:59:51 +02:00
Marek Bel 3ed6d0637c Re-enable tmc2130_sg_stop_on_crash only if crash detection enabled from menu.
This fixes bug, that disabling crash detection from menu doesn't work during recovery from crash detection.
2019-08-20 19:32:39 +02:00
Marek Bel f204cdea81 Refactor
Remove variable CrashDetectMenu. Read this state from EEPROM_CRASH_DET instead in bool lcd_crash_detect_enabled().
Rename crashdet_enable() to lcd_crash_detect_enable() and move it to ultralcd.cpp.
Rename crashdet_disable() to lcd_crash_detect_disable() and move it to ultralcd.cpp.
Rename lcd_crash_mode_set() to crash_mode_switch().
Remove forward function declarations from *.cpp file.

Saves 34B of FLASH and 2B of RAM.
2019-08-20 17:22:27 +02:00
DRracer f07635d08a
Merge pull request #2116 from mkbel/fix_mmu_lay1cal
Fix mmu lay1cal
2019-08-19 19:07:10 +02:00
Marek Bel f0642f88f1 Fix power panic broken when PSU_Delta defined.
Remove disable_z() call from uvlo_() and uvlo_tiny() power panic interrupt handlers. As historically this function was empty. And in case PSU_Delta macro defined it switches Z trinamic to silent mode, which could take some time and is not needed. Remove alignment to to full step from disable_force_z(), as it is not needed when switching to silent mode.
2019-08-19 17:37:23 +02:00
leptun 0d22f8039e Toggle FSENSOR and FSENSOR_AUTOLOAD 2019-08-19 11:58:16 +03:00
leptun 6e9c44af2d Fix warning 2019-08-19 11:07:11 +03:00
leptun 5a3f14b752 "N/A" toggle support and format update 2019-08-19 10:20:17 +03:00
Marek Bel 170c1ea866 Split first layer calibration load filament and intro line into separate steps. If load fails, pause print apparently flushes command buffer and intro line is not printed after issue is resolved. 2019-08-16 20:47:55 +02:00
Marek Bel e53734895f Make MMU load failed blocking to workaround lack of resume print menu item.
The same workaround used as for USB print (Octoprint).
2019-08-16 20:20:17 +02:00
Marek Bel 1036c4f755 Do not precede first layer calibration without filament if print is paused due to MMU load failed. 2019-08-16 19:00:45 +02:00
Marek Bel b10bd8340a Make local functions static. 2019-08-15 17:57:30 +02:00
Marek Bel 0b798767af Fix preheat ASA. 2019-08-15 17:54:23 +02:00
Marek Bel a6f955b62d Use unused macros *_PREHEAT_FAN_SPEED. 2019-08-15 17:47:34 +02:00
Marek Bel eb68bb9b43 Add ASA preheat. 2019-08-15 17:46:29 +02:00
Marek Bel 36a69281ee Remove unused functions forward declarations. 2019-08-15 17:36:05 +02:00
Marek Bel 469ca6e184 Merge commit 'refs/tags/v3.8.0-RC1^{}' into enable_cutter 2019-08-15 14:48:28 +02:00
DRracer 0e4e644476
Merge branch 'MK3' into MK3_3.8.0 2019-08-15 10:34:50 +02:00
DRracer ba81149afe
Merge branch 'MK3' into MK3_3.7.3 2019-08-15 10:25:51 +02:00
DRracer dc78bc7362 Improve performance of bed PWM automaton - proof of concept
There are still some artefacts on the output pin - work in progress.
2019-08-14 17:53:08 +02:00
rhounsell 32fa8caab8 reinitialize the timestamp to ensure enough time to receive response for 0xFF sent. 2019-08-11 17:57:41 -04:00
leptun 596ffe1dc2 Actual fix to the missing first two characters 2019-08-10 21:03:45 +03:00
leptun 7ce2fedac7 Fix missing first two characters in multi-lang mode 2019-08-10 09:16:23 +03:00
leptun 29dcb1cad3 Toggle FANS_CHECK 2019-08-10 08:43:07 +03:00
leptun 505deb28fd Toggle menu item 2019-08-10 08:42:33 +03:00
Paul Bransford 720ea49fa3 Merge branch 'MK3' into MK3-fix-sdcard-sorting 2019-08-08 19:48:50 -04:00
rhounsell 4e58a112e8 Fix for Toshiba FlashAir (or other) SD card initialization - add clock cycles between sending CMD0 and CMD8. Redone for MK3 branch) 2019-08-08 15:45:59 -04:00
DRracer 2ddbd606f2 Version changed (3.8.0 build 2608) 2019-08-08 16:44:16 +02:00
DRracer 84cf1b83c3
Merge pull request #2083 from DRracer/viper
Workaround for the "viper" situation bug.
2019-08-07 17:48:57 +02:00
DRracer a28c365bb1
Merge pull request #2075 from MRprusa3d/PFW-873b
farm mode update, documentation correction
2019-08-07 17:48:30 +02:00
DRracer d9dec38815 Workaround for the "viper" situation bug. 2019-08-07 17:23:19 +02:00
Robert Pelnar 7da2ee5fc3 Version changed (3.7.3 build 2370) 2019-08-06 15:37:23 +02:00
Yuri D'Elia 33037d369c Prevent LCD long-press re-entry (fixes #1196) 2019-08-05 19:00:29 +02:00
MRprusa3d b471bb7540 farm mode update, documentation correction 2019-08-05 17:51:26 +02:00
DRracer 5cb86a7e8f
Merge pull request #2074 from kuhnmarek/MK3_PFW-967_filament_sensor_check
Fw version check disabled in farm mode
2019-08-05 17:41:16 +02:00
Marek Kühn 091cd49ca5 Fw version check disabled in farm mode 2019-08-05 16:59:09 +02:00
DRracer 9f8590c572
Merge pull request #2072 from kuhnmarek/MK3_PFW-961_blind_sound
changed blind sound
2019-08-05 12:47:31 +02:00
Marek Kühn f77414be2b blind alert sound shorter 2019-08-05 12:41:27 +02:00
Marek Kühn f1a947af2c Whole hw settings hidden in farm mode 2019-08-05 10:40:21 +02:00
DRracer cb19f0958b Use _delay() and _micros() for future compatibility 2019-08-05 09:51:06 +02:00
Yuri D'Elia 7cae064611 Update EEPROM_LAST_ITEM 2019-08-04 18:39:28 +02:00
Yuri D'Elia 18b8dc89e5 Merge remote-tracking branch 'upstream/MK3' into MK3_LA15 2019-08-04 17:06:34 +02:00
Yuri D'Elia 1435e4a68d Use the computed direction in fsensor_st_block_begin 2019-08-04 16:53:48 +02:00
Marek Kühn 5f14e9c2e5 Removed sheet setting when in farm mode 2019-08-03 17:35:39 +02:00
Marek Kühn 15a095ea76 changed blind sound 2019-08-03 15:37:11 +02:00
DRracer 7c9d3dd177 Update doxydoc of new G-codes 2019-08-01 13:09:20 +02:00
DRracer 9214e30f74
Merge pull request #2062 from MRprusa3d/PFW-873
UI update
2019-08-01 07:20:09 +02:00
MRprusa3d 2cb977e4a0 UI update 2019-07-31 20:39:57 +02:00
DRracer e43e89421c
Merge pull request #2056 from BoCoKeith/patch-1
Correct bug in util.cpp is_whitespace_or_nl function.
2019-07-31 17:00:49 +02:00
Simon Benoit 49d2866b48 Add threshold distance to Z calibration
Add missing if statement
2019-07-30 19:43:07 -04:00
Marek Bel bca0fd81eb Fix loading filament 255 instead of 0 in first layer calibration wizard. 2019-07-30 19:15:33 +02:00
Marek Bel 0aed59c947 Fix unsigned char overflow cause invalid filament load. 2019-07-30 19:06:57 +02:00
leptun 9ff1f6c3ee Re-enable Tone 2019-07-30 16:05:40 +03:00
leptun 5fdaead663 Fix language related warnings in LANG_MODE 0 2019-07-29 15:55:42 +03:00
leptun 556b87edec M350 for all axis - MK3 2019-07-29 09:41:33 +03:00
Keith Spitz 952a24b45d
Update util.cpp
Correct "is_whitespace_or_nl": change 'r' to '\r'.
2019-07-28 19:40:18 -06:00
leptun 3ddb853bbd Fix shifted languages. Use \n and \x0a 2019-07-26 18:53:08 +03:00
DRracer 0687b8e4a2
Merge pull request #2044 from mkbel/fix_missing_mmu_attention
Fix missing mmu attention
2019-07-26 09:07:06 +02:00
Marek Bel 3b396fb8bf Merge branch 'MK3' into fix_missing_mmu_attention 2019-07-25 19:10:07 +02:00
Marek Bel a9e9a9857b Fix "MMU needs attention screen is missing in case of failed unload filament". 2019-07-25 19:09:52 +02:00
DRracer 3438c0e411
Merge pull request #2042 from NotaRobotexe/octoprint_bugs
fixed redundant OK messages in serial
2019-07-25 12:41:43 +02:00
DRracer 2820baf016
Merge pull request #2040 from NotaRobotexe/MK3
multiple sheets - menu switching bug
2019-07-25 09:56:07 +02:00
NotaRobotexe 64115fb146 fixed redundant OK messages in serial 2019-07-24 18:08:14 +02:00
NotaRobotexe 5021fadd5d multiple sheets - menu switching bug 2019-07-24 11:20:27 +02:00
DRracer 33195baf9d
Merge pull request #2035 from mkbel/enable_lin_corr
Re-enable linearity correction for MK3.
2019-07-24 09:08:43 +02:00
NotaRobotexe 851aaac053 Merge branch 'MK3' of https://github.com/NotaRobotexe/Prusa-Firmware into MK3 2019-07-23 19:29:36 +02:00
NotaRobotexe fb35009628 multiple sheets,fix of bug in switching sheets from menu 2019-07-23 19:25:59 +02:00
Marek Bel f9e32c4bf4 Re-enable linearity correction for MK3. 2019-07-23 19:22:54 +02:00
DRracer 3e60cf4537 enable only for MK3S (out of FLASH on the MK3) 2019-07-23 16:51:02 +02:00
DRracer 593675c667 delay, micros for the 3.7.x branch 2019-07-23 16:40:21 +02:00
DRracer 6860a572c2 detection of faulty RAMBo (incorrect capacitor on fan tach pin) for MK3/S 2019-07-23 15:55:53 +02:00
NotaRobotexe c4d5e332c8
Merge branch 'MK3' into MK3 2019-07-23 11:34:42 +02:00
NotaRobotexe b9f622f8a6 variables to PROGMEM, text formating 2019-07-23 11:31:20 +02:00
NotaRobotexe b5129ff2ec Revert "force push"
This reverts commit 19e7838c20.
2019-07-23 11:12:53 +02:00
NotaRobotexe 19e7838c20 add default names to PROGMEM, text formating edit 2019-07-22 20:35:10 +02:00
NotaRobotexe ab2eafe175 sheet menu, add hw setting, sheet change in menu, sheet name initialization in eeprom 2019-07-22 18:43:43 +02:00
DRracer 6f79ef4c9c resolve hidden conflicts in commented code 2019-07-22 17:29:43 +02:00
DRracer 65087b89ee Merge remote-tracking branch 'upstream/MK3' into code_size_optimization
and resolve conflicts (ultralcd.cpp)
2019-07-22 17:26:14 +02:00
DRracer b96c9700ce fix prusa_statistics code size optimization according to unit test
results
2019-07-22 17:10:04 +02:00
DRracer 79c326cdaa
Merge pull request #2022 from kuhnmarek/gcodes_doxygen
Updated doxygen docs to work better with confluence.
2019-07-22 12:52:27 +02:00
NotaRobotexe 9c95f8c015 sheet menu 2019-07-19 18:34:46 +02:00
Marek Kühn bd4bfbe586 Added M862 details 2019-07-19 16:15:12 +02:00
Marek Kühn 94e79806bc Updated doxygen docs to work better with confluence. 2019-07-19 13:51:55 +02:00
Marek Kühn 03e80ce4a8 PFW-917 Adjust Z value persists across update to v3.8 2019-07-18 16:50:44 +02:00
DRracer b0c41ec979
Merge pull request #2017 from NotaRobotexe/octoprint_fix
Octoprint fix
2019-07-18 16:02:38 +02:00
DRracer 14b39b0094
Merge pull request #2019 from leptun/MK3_fix_LCD_WDT_RESET
Fix lcd not initing after WDT reset
2019-07-18 13:27:32 +02:00
leptun 121e60655a Fix lcd not initing after WDT reset 2019-07-18 11:50:18 +03:00
DRracer 1ae072c332
Merge pull request #2014 from NotaRobotexe/sound_fix
crash and filament unload sound change
2019-07-18 09:41:05 +02:00
DRracer 090ea3145d
Merge pull request #2015 from NotaRobotexe/text_edits
small text edit
2019-07-18 09:39:28 +02:00
NotaRobotexe 756ce51b5e
Merge branch 'MK3' into octoprint_fix 2019-07-17 20:06:06 +02:00
NotaRobotexe b8fec59f21 octoprint fan error fix 2019-07-17 19:59:31 +02:00
NotaRobotexe 2bae208133
Merge pull request #2011 from MRprusa3d/PFW-873
GUI updates
2019-07-17 14:49:07 +02:00
NotaRobotexe 1c44eddf81 crash and filament unload sound change 2019-07-17 12:32:27 +02:00
DRracer 255db28684 merge unit test and upstream changes 2019-07-17 10:30:49 +02:00
DRracer eb705b6b17
Merge pull request #2012 from leptun/MK3_LCD_improvements
LCD fix status screen lcd_putchar
2019-07-17 08:05:56 +02:00
Yuri D'Elia 3a87ff56f6 Default to "Move Z" above a certain height even when printing
This speeds-up the ability to manually get the carriage out of the way
just after a print has finished
2019-07-16 22:04:32 +02:00
leptun d8ecb2d0c9 Fix status screen 2019-07-16 21:11:27 +03:00
MRprusa3d 034cbff10a GUI updates 2019-07-16 20:10:49 +02:00
Marek Bel 0c660a6fb1 Revert "Fix sketch/lcd.cpp:196:1: warning: no return statement in function returning non-void [-Wreturn-type]."
This reverts commit a54fd29fa4.
2019-07-16 21:10:11 +03:00
NotaRobotexe e6255e8451 octoprint fan error work 2019-07-16 19:18:31 +02:00
DRracer 1dab0f7a04
Merge pull request #2008 from leptun/MK3_LCD_improvements
Lcd optimization - 1K of flash saved
2019-07-16 19:15:57 +02:00
Marek Bel a54fd29fa4 Fix sketch/lcd.cpp:196:1: warning: no return statement in function returning non-void [-Wreturn-type]. 2019-07-16 20:02:01 +03:00
Marek Bel fecccf50e5 Remove duplicate prototypes from ultralcd.h. Make functions unreferenced outside lcd.cpp static. Disable unused functions by preprocessor to suppress warnings. 2019-07-16 20:01:49 +03:00
Marek Bel 3e292fd6b0 Fix compiler warnings:
sketch/Marlin.h:178:17: warning: extra tokens at end of #undef directive
sketch/Marlin.h:181:24: warning: extra tokens at end of #undef directive
sketch/Marlin.h:182:0: warning: "enable_z" redefined
2019-07-16 18:16:28 +02:00
Marek Bel cee875fc6a Fix compiler warnings:
warning: enumeration value '_None' not handled in switch [-Wswitch]
warning: enumeration value '_Undef' not handled in switch [-Wswitch]
2019-07-16 17:40:28 +02:00
Marek Bel 6b8a5bc3ac Fix compiler warnings
sketch/tmc2130.cpp:146:42: warning: default argument given for parameter 1 of 'void tmc2130_init(bool)' [-fpermissive]
sketch/tmc2130.cpp:146:24: warning: unused parameter 'bSupressFlag' [-Wunused-parameter]
2019-07-16 17:31:56 +02:00
DRracer 8b806f692e
Merge pull request #1664 from MRprusa3d/PFW-811
"disable_z()" for Delta PSU
2019-07-16 16:46:34 +02:00
DRracer d65b333664
Merge pull request #2003 from mkbel/heat_hysteresis
Heat hysteresis
2019-07-16 13:10:47 +02:00
DRracer 0422713b29
Merge pull request #2005 from prusa3d/MK3_3.7.2
Mk3 3.7.2
2019-07-16 08:50:38 +02:00
leptun 8b1c687629 Lcd optimization - 1K of flash saved 2019-07-15 20:32:58 +03:00
Marek Bel f0727214ed Document 2019-07-15 19:15:15 +02:00
Marek Bel 9083d151b2 wait_for_heater() in restore_print_from_ram_and_continue() only if saved_extruder_temperature differs from target hot-end temperature.
This fixes problem, that restore_print_from_ram_and_continue() blocked for heating for at least TEMP_RESIDENCY_TIME (3 seconds) even if temperature was resumed by M600 command.
2019-07-15 18:07:05 +02:00
Marek Bel ab4e789688 Partially revert "aeed49a Fix filament runout on optical filament sensors"
Revert plan move to filament change position before enqued M600.
This was workaround to problem that restore_print_from_ram_and_continue() did 3s heating pause before resuming print. This problem will be fixed properly in restore_print_from_ram_and_continue() in next commit.

Save 166B of FLASH.
2019-07-15 17:22:39 +02:00
Marek Bel 549a8a1a6b Restore print fan speed earlier then nozzle temperature.
Avoids nozzle temperature dip when fan is turned on.
2019-07-15 16:25:21 +02:00
NotaRobotexe 8fb30f886a octoprint stop fix 2019-07-15 14:30:21 +02:00
NotaRobotexe 759d9f5a2e small text edits 2019-07-15 11:41:16 +02:00
DRracer a3fde091ab More than 7.5KB saved by slight refactoring of printing to serial line 2019-07-12 10:10:56 +02:00
Marek Bel 38ff944b03 Reorder EEPROM items to allow possible future grow for Sheets struct. 2019-07-10 21:03:30 +02:00
Marek Bel 8985d2e26c Fix fix EEPROM conflict. 2019-07-10 18:50:16 +02:00
Marek Bel 6ed146c37c Fix EEPROM conflict. 2019-07-10 18:41:12 +02:00
leptun b8b167d1ca Merge branch 'MK3' into MK3_Enable_fan_waiting_cooldown 2019-07-10 19:26:43 +03:00
Marek Běl d3dd0ad271
Merge pull request #1952 from NotaRobotexe/sound
new sound
2019-07-10 18:06:32 +02:00
Marek Bel 333ade9aee Remove non-existing function prototype. 2019-07-10 17:59:04 +02:00
Marek Bel 7189f44bcd Remove commented out defines. 2019-07-10 17:40:33 +02:00
Marek Bel e0f46f128d Fix indentation. 2019-07-10 17:39:24 +02:00
Marek Bel 4e7de776cd Disable TMC2130 linarity correction for MK3 to save FLASH to enable compilation. Add symlink /Firmware/variants/printers.h to .gitignore. 2019-07-10 17:07:00 +02:00
MRprusa3d 98bae7af9f
Merge branch 'MK3' into PFW-873 2019-07-10 16:50:14 +02:00
MRprusa3d 3333d937ed some improvements 2019-07-10 16:29:40 +02:00
DRracer 9585789288
Merge pull request #1976 from NotaRobotexe/MK3_3.7.2_PP
dont fire power panic at normal power off
2019-07-10 14:19:00 +02:00
Marek Běl 4e3bf276ec
Merge pull request #1984 from leptun/MK3_compile_error_fix_multiple_sheets_Windows
Fix compile error on Windows when multiple_sheets is merged
2019-07-09 19:28:35 +02:00
Marek Bel 712fb1cceb #undef EEPROM_SHEETS_BASE so this internal define for compile-time checking only is not used outside of eeprom.h 2019-07-09 19:19:59 +02:00
Marek Běl fcfc9ca95c
Merge pull request #1979 from DRracer/heatbed_noise_suppression
Heatbed noise suppression
2019-07-09 18:33:27 +02:00
leptun dbc603d5f6 Fix compile error on windows
addresses issue #1965
2019-07-09 18:38:24 +03:00
Marek Bel 898f6d9d8b Fix EEPROM_Sheets_base overlay of EEPROM_NOZZLE_DIAMETER_uM. 2019-07-09 13:41:18 +02:00
Marek Bel cd1ea0a655 Move function declaration and structs declarations to top of eeprom.h file. 2019-07-09 13:38:58 +02:00
MRprusa3d 4d535f1217 ... incl. SupportMenu ;-P 2019-07-09 12:31:20 +02:00
MRprusa3d 8229a45187 pre-production version ;-) 2019-07-09 12:16:51 +02:00
Marek Bel 61566f7fb1 Move translated string MSG_V2_CALIBRATION from untranslated section to PROGMEM_I1, add missing ISTR macro. Revert _T(MSG_SELECT) and _T(MSG_RENAME) to _i("Select") and _i("Rename") as it is preferred macro for internationalized strings. Use MSG_V2_CALIBRATION in both occurrences. 2019-07-08 21:18:55 +02:00
DRracer a16de83535 heatbed audible noise suppression using short fast PWM pulses with
variable duty
2019-07-08 16:42:21 +02:00
NotaRobotexe 9592460281 add old delay 2019-07-04 18:43:59 +02:00
NotaRobotexe a1a8945bee more code editing 2019-07-04 15:31:44 +02:00
DRracer 1f9dce9513 next almost 200B down 2019-07-04 13:36:02 +02:00
NotaRobotexe e77898d5dc code edit 2019-07-04 13:21:27 +02:00
NotaRobotexe 81b3b71cca check eeprom inicialization 2019-07-03 19:37:11 +02:00
MRprusa3d 4db4f19128 'variant files' update ;-((( 2019-07-03 18:14:48 +02:00
MRprusa3d 7e3cb98a1f & MK3S 2019-07-03 17:50:41 +02:00
MRprusa3d a3a7f3106e print parameters checking 2019-07-03 17:21:11 +02:00
NotaRobotexe ff3c9d1a7c dont fire power panic at normal power off 2019-06-28 11:25:56 +02:00
Marek Bel a59e7090ea Increase version. 2019-06-27 17:32:40 +02:00
Yuri D'Elia b6bcb901f3 Correct initialization of eISR_Err
Further tweak the initial term to improve the linearity of the resulting
speed after BW filtering.
2019-06-27 13:21:39 +02:00
Marek Bel d344e514c4 Rename functions and macro to match with naming convention - remove 'P' where there is no pointer to progmem. 2019-06-26 15:51:58 +02:00
Marek Bel d879794922 Remove first parameter of macro menu_format_sheet_P_E, of function menu_format_sheet_P_E and menu_item_submenu_P as it was always called with the same parameter. Saves 66B of FLASH. 2019-06-26 15:47:06 +02:00
Marek Bel 53dbcdd852 Display sheet name when adjusting Z. Costs 130B of flash. 2019-06-26 15:33:54 +02:00
Marek Bel 4a16fe6902 Save z_offset, bed_temp and pinda_temp with sheet calibration. 2019-06-26 14:10:12 +02:00
Marek Bel 20dd1110f6 Remove unused parameters of function _lcd_babystep(int axis, chonst char *msg).
Saves 24B of flash memory.
2019-06-25 19:43:10 +02:00
Marek Bel ebdeb99134 Add menu to show sheet live adjust Z value. 2019-06-25 18:55:25 +02:00
NotaRobotexe 4058cd144b add delay_keep_alive without updating lcd 2019-06-25 14:30:11 +02:00
NotaRobotexe 3e9dc91cef ifdef for mk2 2019-06-24 18:01:49 +02:00
NotaRobotexe b5168bd6c2 fan error fix 2019-06-24 17:30:56 +02:00
Marek Bel b67ec501b4 Add rename sheet menu. 2019-06-24 17:11:13 +02:00
Marek Bel e6fbac08ed Move sheet selector to submenu. 2019-06-21 15:44:56 +02:00
Marek Bel 19a474eaa5 Fix compiler warnings. 2019-06-20 18:00:29 +02:00
Marek Bel 0a48082609 Add steel sheet profile selector. 2019-06-20 16:40:53 +02:00
Renzo Dani 9a904362e5 code only for TMC2130 2019-06-20 10:17:48 +02:00
Renzo e54497d802 added new function belt test under calibration menu 2019-06-20 00:09:55 +02:00
Marek Bel 89b578c899 Merge branch 'MK3' into multiple_sheets 2019-06-19 18:40:09 +02:00
Marek Bel 524121141a Remove commented out code. This code is of unknown genesis and purpose. It was added in commit "3.0.10 sync" two years ago and it was already commented out in that moment. 2019-06-19 15:54:24 +02:00
Marek Bel 6a272d83b1 Add compile time check for EEPROM stored varibles size. 2019-06-19 15:09:07 +02:00
Yuri D'Elia 2e073527fb Also avoid E direction inversions while coasting 2019-06-19 14:28:04 +02:00
Marek Bel 64903e0ae8 Remove unused defines. 2019-06-19 14:27:02 +02:00
Yuri D'Elia 4b3af0d2df Respect minimum direction change delay 2019-06-19 13:22:44 +02:00
Marek Bel 181c42fa62 Merge remote-tracking branch 'prusa3d/MK3' into enable_cutter 2019-06-18 20:03:41 +02:00
Marek Bel 8b6629ad58 Fix comment grammar. 2019-06-18 20:00:02 +02:00
Marek Bel ae9ae95187 MMU: Filter IR sensor signal when detecting whether filament tip passes to heat break. Increase number of tries when loading filament to 3. 2019-06-18 19:15:16 +02:00
KDanielK 6cb85a455f Update mmu.cpp 2019-06-18 15:08:47 +02:00
Marek Bel 24cec4091b Merge branch 'MK3' into sound 2019-06-17 17:28:19 +02:00
Marek Běl aff020a6d4
Merge pull request #1897 from NotaRobotexe/farm_mode
PFW-571 send PRN:4 instead PRN:1, PFW-874 new firmware version alert with 30s timeout
2019-06-14 20:05:30 +02:00
Marek Bel b1df1fb1f1 Fix formatting. We are never using 2 space indentation. 4 spaces are preferred, tabulator is acceptable if surrounding code uses tabs. 2019-06-14 18:18:27 +02:00
Yuri D'Elia 367a28a5a8 Default to "Live Adjust Z" when longpressing during a print (closes #1604)
- Disable longpress action when homing or calibrating
- Default to Live Adjust during a print
- Retain "Move Z" otherwise
2019-06-14 11:44:06 +02:00
Voinea d81970dd3d Merge branch 'MK3' into MK3_Enable_fan_waiting_cooldown 2019-06-14 11:07:08 +03:00
DRracer c5d130e763
Merge pull request #1914 from prusa3d/MK3_3.7.2
Increase version.
2019-06-14 09:39:41 +02:00
Marek Bel fee67d9451 Increase version. 2019-06-13 16:37:51 +02:00
Marek Bel 6717590631 Merge branch 'MK3' into MK3_LA15 2019-06-13 15:39:50 +02:00
DRracer 55dc78546b
Merge pull request #1913 from mkbel/fix_spelling
Fix spelling.
2019-06-13 15:12:30 +02:00
Marek Bel 25f0eb9a39 Fix spelling. 2019-06-13 15:01:54 +02:00
Marek Bel 72f5e87c61 Merge branch 'MK3' into use_enum_class_2 2019-06-12 19:17:35 +02:00
Marek Bel 1390d4e5b9 Use first letter capital camel case for enum class members. Change underlying type to uint_least8_t. 2019-06-12 19:11:41 +02:00
Marek Bel 5fcf760954 Use first letter capital camel case for enum class members. Rename CustomMsgTypes to CustomMsg. Remove unnecessary maping to numbers. Change underlying type to uint_least8_t. 2019-06-12 18:54:43 +02:00
Marek Bel 51df6cdfdc Remove LcdCommands::Unknown3. Remove LcdCommands mapping to numbers, as it is not needed. 2019-06-12 18:54:37 +02:00
Marek Bel cbb92860d0 Use first letter capital camel case for enum class members. 2019-06-12 18:54:32 +02:00
Marek Bel 0401490cc1 Use first letter capital camel case for enum class members. 2019-06-12 18:54:25 +02:00
Marek Bel 9ceba00426 Use first letter capital camel case for enum class members. Remove dependency of FanCheck values on TestError values as it is not used. 2019-06-12 18:53:09 +02:00
MRprusa3d b7d3766ae2
Merge branch 'MK3' into PFW-790 2019-06-12 17:32:13 +02:00
Marek Bel 6dd085bcc5 Use first letter capital camel case for enum class members. 2019-06-12 16:44:07 +02:00
Marek Bel e393d91b12 Use first letter capital camel case for enum class members. 2019-06-12 16:20:21 +02:00
Marek Bel cc80bfa020 Merge branch 'MK3' into use_enum_class 2019-06-12 16:04:26 +02:00
DRracer c7e1e73880 another almost 200B down by proper usage of smaller data types and enum
classes
2019-06-12 15:41:55 +02:00
DRracer 94a5175980 Code size reduction - saved almost 2KB 2019-06-12 15:41:34 +02:00
DRracer 8d388fa03a
Merge pull request #1911 from mkbel/layer1_cal_flash
Layer1 cal flash
2019-06-12 15:40:59 +02:00
Marek Bel 49f172a7b9 Convert uint8_t cycle control varibles changed in previous commit to uint_least8_t to be potentially more portable. 2019-06-12 15:01:57 +02:00
DRracer b15bbaf177 for cycles' variables: int -> uint8_t where appropriate, part1 2019-06-12 14:58:15 +02:00
Marek Bel 7ac098a135 Refactor. Put constants needed in functions inside fuctions to limit its scope. 2019-06-12 14:20:20 +02:00
Marek Bel 2755a3733d Document. 2019-06-12 14:15:58 +02:00
Marek Bel 342954b88c Refactor. Make constants producing first layer calibration square more clear. Note layer height discrepancy. 2019-06-12 13:31:17 +02:00
DRracer 4f8ed7f123 for cycles' variables: int -> uint8_t where appropriate, part1 2019-06-12 10:31:09 +02:00
DRracer baa36ce740 another almost 200B down by proper usage of smaller data types and enum
classes
2019-06-12 09:58:42 +02:00
Marek Bel d528a53526 Refactor. Move lcd_commands_func1() to first_lay_cal.cpp and rename it to lay1cal_square(). Remove its constant parameters. Move remaining G1 code to lay1cal_meander(). Saves 6B of FLASH memory. 2019-06-12 01:36:48 +02:00
Marek Bel 60cc3d58ec Use sprintf_P in first layer calibration. Save 30B of FLASH memory. 2019-06-11 20:00:49 +02:00
Marek Bel 47a183e96e Use loop to enquecommand_P() in first layer calibration. Save 126B of FLASH memory. 2019-06-11 19:49:56 +02:00
Marek Bel 21f4669600 Make count_e() constexpr. 2019-06-11 19:22:08 +02:00
Marek Bel 4effff9e99 Use loop to enquecommand_P() in first layer calibration. Save 10B FLASH memory. 2019-06-11 18:56:29 +02:00
Marek Bel d21f256cd0 Remove duplicate calls of lcd_timeoutToStatus.start(), move !blocks_queued() && cmd_buffer_empty() condition to outer if, rewrite using switch statement. Save 487B of FLASH memory. 2019-06-11 18:26:59 +02:00
Marek Bel 97a5d6b5f4 Make constants const. 2019-06-11 17:30:37 +02:00
Marek Bel 9b1e3213ae Variable lcd_commands_step doesn't need to be global. 2019-06-11 17:30:19 +02:00
DRracer 58948cffcd Code size reduction - saved almost 2KB 2019-06-11 17:23:01 +02:00
Marek Bel 0c9121e99e Use loop to enquecommand_P() in first layer calibration. 2019-06-11 17:08:56 +02:00
DRracer f20125a3e2 Code size reduction - saved almost 2KB 2019-06-11 16:24:40 +02:00
Marek Běl cb6a3e7e12
Merge pull request #1907 from DRracer/fan_check_error_fix
Do not allow resume printing if fans are still not ok
2019-06-11 15:12:48 +02:00
DRracer 13c3ab14fa test fan check error only when enabled by #ifdef 2019-06-11 15:05:40 +02:00
DRracer 3e37150552 Do not allow resume printing if fans are still not ok 2019-06-11 14:53:10 +02:00
Marek Bel 27145204ed Use internationalized M117, but anyway the text is not shown. 2019-06-10 21:40:12 +02:00
Marek Bel 4be8fa701e Use loop to enquecommand_P() in first layer calibration. 2019-06-10 20:41:18 +02:00
Yuri D'Elia c40e3b550d Remove stubs and live K by default 2019-06-10 19:34:00 +02:00
NotaRobotexe bb980e2fca sound edit, delete mute mode, add blind mode 2019-06-10 15:03:52 +02:00
Marek Běl 28e7772421
Merge pull request #1886 from leptun/MK3_fix_load_filament_5
Fix Load Filament 5 for MMU2
2019-06-10 14:45:55 +02:00
Marek Běl 327e6cd39b
Merge pull request #1889 from DRracer/fan_check_error_fix
Fan check error fix
2019-06-06 15:52:44 +02:00
DRracer 0cf6bc0677
Merge pull request #1903 from mkbel/filament_runout_mk3_2
Filament runout mk3 2
2019-06-06 15:51:35 +02:00
DRracer 83578c3389 documentation + minor code cleanup based on code review 2019-06-06 15:50:13 +02:00
Vojtech Pavlik a4bc91ed2f M0/M1/M117 fix: Use CUSTOM_MSG states in M0/1/M117
Now that we have the new CUSTOM_MSG states, we can use them in the M0/M1
and M117 handlers to force the user message to be displayed even when
the printer is printing from a SD card and displaying a file name.
2019-06-06 14:25:36 +02:00
Vojtech Pavlik 5494f23942 M0/M1/M117 fix: Add new CUSTOM_MSG states.
When the printer prints from a SD card, the display of progress messages
and filename takes precedence over CUSTOM_MSG_TYPE_STATUS messages used
by M0/M1/M117. Let's introduce two new CUSTOM_MSG states, one that
overrides the SD status while waiting in M0/M1 (M0WAIT) and one that
ensures the message will be displayed in at least one screen update
(MSGUPD).
2019-06-06 14:25:06 +02:00
Vojtech Pavlik 5d8eb84965 M0/M1/M117 fix: Move M0/M1 to the top of decoder.
Move M0/M1 decoding before any other command. The M0/M1 message can contain
arbitrary characters and so it also can contain substrings that other
decoders trigger on, like the letter 'G'. Any such substring would cause
misdecoding of the M0/M1 and unpredictable behavior in addition to not
making the printer stop.

M117 already received the same treatment in the past, so we take the same
approach for M0/M1.
2019-06-06 14:24:34 +02:00
Yuri D'Elia 0239f4bce1 Update/compute advance steps inside calculate_trapezoid_for_block
Do not store the block e_D ratio, store directly the computed
compression factor so that we can recompute the advance steps
quickly and update them in sync with the acceleration rates.
2019-06-05 20:25:26 +02:00
Yuri D'Elia 048628083a Remove clear_current_adv_vars()
The pressure state is already reset implicitly at the end of each block,
meaning an extruder switch will never have to reset the internal state
anyway.

We clear the internal backpressure in the following conditions:

- when switching to a non-LA block
- when quickStop is called
- when the scheduler is idling (losing pressure)
2019-06-05 20:25:19 +02:00
Yuri D'Elia 7d33089d9a Remove use_advance_lead
The per-step state is kept implicitly using nextAdvanceISR,
while the current pressure is decoupled anyway.
2019-06-05 20:25:12 +02:00
Yuri D'Elia dc436b71fe Fix position_float after a quickStop condition 2019-06-05 20:25:05 +02:00
Yuri D'Elia fa454f61e4 Drop unused "speed_lookup_table.h" from planner.cpp 2019-06-05 20:24:58 +02:00
MRprusa3d 1d8c24e8a9 "disable_z()" for Delta PSU IV
correction for (motor) mode switching
2019-06-05 19:22:04 +02:00
Marek Bel 19351df8a7 Extracted computation of z_shift for M600 into a separate function to
improve readability. Surprisingly, also the code got shorter.
2019-06-05 18:34:26 +02:00
Marek Bel 9c3bb14bae remove function forward decl: fsensor_restore_print_and_continue_IR
revert LCD_BL_PIN change
2019-06-05 18:34:10 +02:00
DRracer aeed49a80e Fix filament runout on optical filament sensors
Reworked the IR variant accordingly
Some code-size optimization in related functions
2019-06-05 18:33:41 +02:00
DRracer 10247a28a3
Merge pull request #1896 from NotaRobotexe/power_panic
documentation for power panic
2019-06-05 16:10:04 +02:00
NotaRobotexe 0cab2284ea PFW-874 new firmware alert timeout 2019-06-05 15:48:10 +02:00
NotaRobotexe 14270ac1f6 power panic documentation 2019-06-05 15:10:51 +02:00
NotaRobotexe d263728c37 documentation 2019-06-05 14:55:59 +02:00
DRracer 33b2aa5e58
Merge pull request #1894 from NotaRobotexe/power_panic
Power panic Z axis fix
2019-06-05 13:34:21 +02:00
NotaRobotexe 2c4e98dc27 power panic improvement 2019-06-05 13:12:08 +02:00
Yuri D'Elia cda9ed4a1d Reset LA state more carefully during stop conditions 2019-06-04 16:22:40 +02:00
Yuri D'Elia 1bed8cfa94 Don't call fsensor_st_next_block repeatedly during the last step
Rely on st_block_begin to perform a single call instead of calling
block_chunk for each advance tick in the last step
2019-06-04 16:22:33 +02:00
Yuri D'Elia 8ce1c04740 Remove useless "extruder under pressure" flag
That's exactly what LA does
2019-06-04 16:22:27 +02:00
Yuri D'Elia bca5618145 Save/restore K during a power panic 2019-06-03 17:33:19 +02:00
Yuri D'Elia 84009e1e8e Do a full fsensor_update() when initializing the sensor
This correctly populates the "extruder info" details even when
the menu is entered for the first time after starting a print.
2019-06-03 17:32:57 +02:00
Yuri D'Elia fa7c0fb2c9 Avoid triggering LA during a Z-priming move
When recovering from a pause, the nozzle is often primed while
being lowered. If LA is triggered under such a move, the pressure
advance will be wasted.
2019-06-03 17:32:51 +02:00
Yuri D'Elia d2432056bd Elide fsensor_st_block_begin, saving some cycles/bytes 2019-06-03 17:32:43 +02:00
DRracer 5985c0608e Revert changes to pins_Einsy_1_0.h not related to the fan check error
fix
2019-06-03 09:02:27 +02:00
Yuri D'Elia 5cd0177389 Cleanup fsensor_st_block_begin 2019-06-02 18:17:59 +02:00
Yuri D'Elia b4bf79297f Remove unneeded includes from fsensor 2019-06-02 01:08:03 +02:00
Yuri D'Elia c50b1c0351 Rework the filament counter logic
- Move direction checks out of fsensor: fsensor_counter is now
  always in the same direction as e_steps
- Check the filament chunk after e_steps have been physically done,
  using the real e_step count so far
2019-06-01 22:08:00 +02:00
DRracer 09fee4e64d remove fan error simulation automaton 2019-05-31 11:30:30 +02:00
DRracer 6755791778 Fix repeated fan error checking 2019-05-31 11:29:11 +02:00
DRracer adb5baa12b Merge remote-tracking branch 'upstream/MK3' into MK3 2019-05-31 11:05:24 +02:00
DRracer ebfad55617
Merge pull request #1888 from mkbel/always_cut_independent
Always cut independent
2019-05-31 07:00:37 +02:00
Marek Bel 00da4640e2 Document. 2019-05-30 23:29:33 +02:00
Marek Bel e79c203c96 Do not always cut if it is not enabled from menu. 2019-05-30 23:04:06 +02:00
Marek Bel ccb649b1f6 Add always cut experimental / for testing feature. 2019-05-30 23:03:59 +02:00
Marek Bel 18122049a6 Fix cut filament menu item labels. 2019-05-30 19:36:10 +02:00
Voinea 878e866401 Fix Load Filament 5 for MMU2 2019-05-30 17:28:02 +03:00
NotaRobotexe e9c870e7a0 fix of fixof power panic 2019-05-29 20:33:22 +02:00
NotaRobotexe 3b2cbc68d8 PFW-571 send PRN:4 instead PRN:1 while changing filament 2019-05-28 18:22:34 +02:00
DRracer 1c619133a3
Merge pull request #1880 from NotaRobotexe/power_panic
PFW-828  add uvlo tiny z positio back
2019-05-28 14:29:13 +02:00
NotaRobotexe bcb6129c29 delete comment 2019-05-28 14:11:38 +02:00
NotaRobotexe 8842d16832 add back uvlo tiny z positio 2019-05-28 13:50:21 +02:00
DRracer 326c061d8c testing pin 5 2019-05-27 18:27:24 +02:00
DRracer 2f96badef4
Merge pull request #1870 from NotaRobotexe/power_panic
PFW-828 after power panic printer start print in the air
2019-05-27 17:13:08 +02:00
Marek Běl 9c3b93f900
Merge pull request #1869 from DRracer/fix_mintemp_and_fsensor
Fix MINTEMP errors and fsensor runout
2019-05-27 16:32:22 +02:00
DRracer 253087a4c5 Code cleanup 2019-05-27 16:18:21 +02:00
DRracer 4d020d99f6 Code cleanup 2019-05-27 14:57:02 +02:00
Yuri D'Elia 51d6904dad Multiply the step rate when grouping advance steps 2019-05-27 14:44:09 +02:00
NotaRobotexe f070a10904 edit 2019-05-27 10:10:24 +02:00
Yuri D'Elia a742afcebd Remove version check 2019-05-26 22:43:06 +02:00
Yuri D'Elia 4772532524 Allow Live-K to be used on stock 3.7.1 using a stub 2019-05-26 22:14:31 +02:00
Yuri D'Elia 47d2562510 Typos 2019-05-26 21:06:29 +02:00
Yuri D'Elia 823f7b069c Fix filament sensor direction again 2019-05-26 21:06:22 +02:00
Yuri D'Elia 9d834925c0 Recalculate LA_phase correctly 2019-05-26 17:06:21 +02:00
Yuri D'Elia 3abb2188df Fixup initial error by defect 2019-05-26 16:59:45 +02:00
Yuri D'Elia ab478ec281 Save another 144b by avoiding a calc_timer copy 2019-05-26 16:42:03 +02:00
Yuri D'Elia 20694aeabc Save 316 bytes by avoiding advance_spread copies 2019-05-26 16:41:56 +02:00
Yuri D'Elia a28fb65bb2 Optimize advance_spread further 2019-05-26 16:41:50 +02:00
Yuri D'Elia daa8007de5 Allow to exclude Live K from the build 2019-05-26 16:41:45 +02:00
Yuri D'Elia 6f6cef65b5 Revert "Correctly handle direction for the filament sensor"
This reverts commit aae03ad83e.
2019-05-26 16:41:37 +02:00
Yuri D'Elia bddc3e84ab Use WRITE_NC directly in the isr 2019-05-25 21:52:06 +02:00
Yuri D'Elia aae03ad83e Correctly handle direction for the filament sensor 2019-05-25 21:51:59 +02:00
Yuri D'Elia 935a798236 Speedup advance_spread for common divisors 2019-05-25 21:51:52 +02:00
Yuri D'Elia fa7ecfc38e Check for serial roughtly in the middle of the stepper isr 2019-05-25 18:41:28 +02:00
Yuri D'Elia 0a26de1e7f Allow to live-tune K during a print 2019-05-25 18:41:21 +02:00
NotaRobotexe 55a2d588f1 PFW-828 printing in the air after power panic 2019-05-24 18:30:58 +02:00
NotaRobotexe 69455bfc75 PFW-828 fix printing in the air after power panic 2019-05-24 18:28:16 +02:00
Yuri D'Elia 282b502393 Improve the distribution of the advance steps 2019-05-24 17:08:32 +02:00
Yuri D'Elia 294bf4068d Improve debug messages 2019-05-24 17:08:32 +02:00
Yuri D'Elia 53b77bab36 Do not operate on the prev block when already in use 2019-05-24 17:08:32 +02:00
Yuri D'Elia aae5cce28f Use the nominal frequency to merge ticks 2019-05-24 17:08:32 +02:00
Yuri D'Elia c6dbcc494f Typo 2019-05-24 17:08:32 +02:00
Yuri D'Elia 942c38c18b Minor reformatting 2019-05-24 17:08:32 +02:00
Yuri D'Elia 9586d71adb Mention LA_DEBUG_LOGIC 2019-05-24 17:08:32 +02:00
Yuri D'Elia a1be8b6784 Initialize current_adv_steps correctly
Initialize at 0 both on startup and on reset on regular (non-LA)
segments to avoid cumulating errors.
2019-05-24 17:08:32 +02:00
Yuri D'Elia 707849e6c4 Use a define instead of hard-coding a divider 2019-05-24 17:08:32 +02:00
Yuri D'Elia a2fa8e5313 Rewrite the advance_isr scheduler 2019-05-24 17:08:32 +02:00
Yuri D'Elia 2d3fe3197c Move calc_timer into speed_lookup_table for planner reuse 2019-05-24 17:08:32 +02:00
Yuri D'Elia 9425b6b07a Planner: do not recalculate max_adv_steps, since it doesn't change 2019-05-24 17:08:32 +02:00
Yuri D'Elia 2c8e04bd5f Planner: use the correct block when updating LA factors 2019-05-24 17:08:32 +02:00
Yuri D'Elia 3b528196dd Fixup prefix echomagic for the LA config report 2019-05-24 17:08:32 +02:00
Yuri D'Elia 520cb491b2 Move speed lookup defs into a separate source 2019-05-24 17:08:32 +02:00
Yuri D'Elia ebdc5e35e7 Remove two more OCR1A direct manipulations
Use _NEXT_ISR and st_reset_timer to correctly reinitialize and
re-schedule the advance ticks.
2019-05-24 17:08:32 +02:00
Yuri D'Elia cbf1a85ec3 Switch original LA implementation with LA1.5
This discards several Prusa optimizations for LA1.0.
We'll re-implement those later if needed.

Debugging is turned on.
2019-05-24 17:08:32 +02:00
Yuri D'Elia bf0c60dd45 Factor-out some repetition into fsensor_step 2019-05-24 17:08:32 +02:00
Yuri D'Elia 124540a06f Adapt LA changes to ConfigurationStore 2019-05-24 17:08:32 +02:00
Yuri D'Elia 45563bfdd3 Formatting sanity 2019-05-24 17:08:32 +02:00
Yuri D'Elia eeea2725cb Partial LA15 support 2019-05-24 17:08:32 +02:00
DRracer 098c0979ba
Merge pull request #1848 from MRprusa3d/PFW-853
recovery from "Stop()"
2019-05-24 09:54:07 +02:00
DRracer 9cb0bc7bcf Fix MINTEMP errors and fsensor runout 2019-05-24 08:46:44 +02:00
NotaRobotexe 1399d7dcc8 support only for MK3/MK3S 2019-05-23 15:22:31 +02:00
Marek Běl df02030fe0
Merge pull request #1863 from DRracer/lcd20190523
Fix. menu texts and formatting - issues PFW-877 and PFW-879
2019-05-23 14:31:51 +02:00
Ondrej Tuma 63235625ab pause printer by flag 2019-05-23 13:13:11 +02:00
DRracer e17f3f8405 change language files accordingly 2019-05-23 11:14:26 +02:00
DRracer da98977de3 Fix. menu texts and formatting - issues PFW-877 and PFW-879 2019-05-23 10:45:55 +02:00
MRprusa3d a408f90659 recovery from "Stop()" 2019-05-18 21:28:59 +02:00
Marek Bel 15ba17f110 Fix translator columns hint for Adjusting Z: 2019-05-16 17:30:15 +02:00
Marek Bel 74d8c15b4f Fix documentation. 2019-05-16 17:23:54 +02:00
Marek Bel dcfc6348ed Fix documentation. 2019-05-16 17:22:47 +02:00
DRracer a453c6fc9d Save 236B by improving functions in menu.cpp. Beware - the label now has
to come with a ':' as its last character. Changed language files along
with this commit too.
2019-05-16 16:43:44 +02:00
Marek Bel dad2065da6 Merge branch 'MK3' into rise_z 2019-05-15 16:37:17 +02:00
Marek Bel 1f3877b221 Extract duplicate code into function. Saves 4B of flash. 2019-05-15 16:31:10 +02:00
Marek Běl fbc0c260b1
Merge pull request #1826 from ondratu/selftest_wizard
Selftest fan improvements
2019-05-15 13:43:48 +02:00
Ondrej Tuma ebfc8c1c79 Fan autotest for swapping in Selftest 2019-05-15 10:10:46 +02:00
Ondrej Tuma c851e158cc Manual fan check menu have default (selected) option 2019-05-15 10:10:46 +02:00
Marek Bel 1a78bd53ba Fix compiler warning
sketch/Marlin_main.cpp: In function 'void marlin_wait_for_click()':
sketch/Marlin_main.cpp:9646:12: warning: unused variable 'busy_state_backup' [-Wunused-variable]
2019-05-14 19:11:46 +02:00
Marek Bel 91e72a79f0 Fix compiler warning
sketch/Marlin_main.cpp:871:13: warning: unused variable 'ir_detected' [-Wunused-variable]
2019-05-14 19:07:50 +02:00
Marek Bel acfcd59369 Fix compiler warning:
sketch/menu.cpp: In function 'int menu_draw_item_puts_P(char, const char*, char)':
sketch/menu.cpp:184:1: warning: no return statement in function returning non-void [-Wreturn-type]
2019-05-14 18:32:40 +02:00
Marek Bel 89fc9e7f92 sketch/menu.h:90:115: warning: invalid conversion from 'void (*)(int)' to 'void (*)(uint8_t) {aka void (*)(unsigned char)}' [-fpermissive]
#define MENU_ITEM_FUNCTION_NR_P(str, number, func, fn_par) do { if (menu_item_function_P(str, number, func, fn_par)) return; } while (0)
                                                                                                                   ^
sketch/ultralcd.cpp:5926:5: note: in expansion of macro 'MENU_ITEM_FUNCTION_NR_P'
     MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', extr_adj, 0); ////MSG_LOAD_FILAMENT_1 c=16
2019-05-14 18:25:43 +02:00
Marek Bel 66d20f0297 Fix code formatting (indentation). 2019-05-14 16:45:15 +02:00
Marek Bel 4de93ca19c Fix eject filament menu items numbering. 2019-05-14 16:43:33 +02:00
Marek Bel 150787efbd Generate menu item texts Cut filament <nr.> during runtime to conserve flash. 2019-05-14 16:25:29 +02:00
Marek Bel 6495a8fa58 Decrease flash reserved for secondary language. 2019-05-14 16:10:04 +02:00
Marek Bel 7c4f66181f Generate menu item texts Load filament <nr.> and Eject filament <nr.> during runtime to conserve flash. 2019-05-14 15:47:25 +02:00
Marek Běl dddc1b84e6
Merge pull request #1825 from prusa3d/MK3_3.7.1
Increase version 3.7.1 final.
2019-05-13 17:29:30 +02:00
Marek Běl efa8e6e6ba
Merge pull request #1658 from Harpalyke/save-ustep-res-with-M500
Allow save of uStep resolution with M500
2019-05-13 17:08:34 +02:00
Marek Bel e93f043fee Increase version 3.7.1 final. 2019-05-13 15:09:58 +02:00
Marek Běl bbd1b60229
Merge pull request #1437 from craiglink/memory-overrun
set array size correctly to 4
2019-05-11 03:01:52 +02:00
Marek Běl 12b801fa1f
Merge pull request #1397 from jhoblitt/plumbing/sh-chmod
make all shell scripts executable
2019-05-11 02:37:09 +02:00
Marek Běl 0a343d4d66
Merge pull request #1806 from NotaRobotexe/fw_check
check if firmware is on right type of printer
2019-05-11 02:11:54 +02:00
Marek Běl 176b28bc83
Merge pull request #1813 from prusa3d/MK3_3.7.1
Enable watchdog for all variants.
2019-05-10 17:33:44 +00:00
Marek Bel a9d6ae296b Enable watchdog for all variants. 2019-05-10 16:30:08 +02:00
Marek Běl 2a39fad400
Merge branch 'MK3' into bugfixes 2019-05-10 13:43:36 +00:00
Marek Běl 084c6f2700
Merge pull request #1805 from DRracer/MK3
PFW-844
2019-05-10 13:41:59 +00:00
Marek Bel 5707d4b85c Set all target hot ends to 0 deg. Celsius instead of just hotend nr. 0 to be more safe with custom modifications. 2019-05-10 15:27:25 +02:00
DRracer dc4f30530d Fix a number overflow to last line of LCD when doing large extruder in
menu Settings -> Move axis -> Extruder
2019-05-09 13:44:35 +02:00
DRracer 714fb23de6 Merge remote-tracking branch 'upstream/MK3' into MK3 2019-05-09 13:40:28 +02:00
NotaRobotexe e7dd5c60d3 check if firmware is on right type of printer 2019-05-07 18:10:44 +02:00
Marek Běl 8692565cf0
Merge pull request #1802 from XPila/MK3
Variable bed PWM resolution/frequency (adjusted to 5bits/32Hz)
2019-05-07 15:13:02 +00:00
DRracer f431d24762 Merge branch 'MK3' of https://github.com/DRracer/Prusa-Firmware into MK3 2019-05-07 16:17:14 +02:00
DRracer 0124fbf9ee Fix: display target extruder temperature on the main screen when doing
PID calibration
2019-05-07 16:15:42 +02:00
Robert Pelnar 85806a0f38 variable bed pwm frequency fix (input value is 7bit, not 8bit) 2019-05-07 15:35:34 +02:00
Ondrej Tuma b7fe43bf68 Deleted bad cols/rows definitions for translation. 2019-05-07 12:52:23 +02:00
Robert Pelnar 58683da2fb Variable bed PWM resolution/frequency (adjusted to 5bits/32Hz) 2019-05-06 18:07:42 +02:00
Marek Běl e56be687bb
Merge pull request #1800 from XPila/MK3
return with exitcode 1 if any language not generated properly
2019-05-06 15:58:34 +00:00
Marek Bel 1a0370e1c7 Make macro ON_MENU_LEAVE() usage similar to macros MENU_ITEM_BACK_P() and MENU_ITEM_FUNCTION_P(). 2019-05-06 17:39:00 +02:00
Robert Pelnar fa1bdd6ab1 Lang - decreased reserved space for secondary language (10496 bytes) 2019-05-06 17:29:47 +02:00
DRracer ffbdb43881 Remove commented code 2019-05-06 17:26:42 +02:00
Robert Pelnar 41a827fa00 Removed unused texts, increased reserved space to 0x2e00 (11776 bytes) 2019-05-06 17:24:06 +02:00
DRracer 0794430208 Fix for linearity correction not being stored to EEPROM when doing MENU-
UP
2019-05-06 15:33:13 +02:00
Robert Pelnar 1c9d134c62 return with exitcode 1 if any language not generated properly
fix - include system_timer.h
2019-05-06 15:29:57 +02:00
DRracer e5911c42da limit printed menu text to max 18 characters 2019-05-06 12:44:36 +02:00
Robert Pelnar 3852aa4275 Different secondary language reserved space for MK3 and MK25 2019-04-30 12:42:18 +02:00
Marek Běl 177c123b4d
Merge pull request #1780 from MRprusa3d/PFW-841
"stop" immediately after "pause" patch
2019-04-29 14:49:49 +00:00
Marek Bel 8fadbf1b44 Do not call watchdog reset from updateTemperaturesFromRawValues(). 2019-04-29 16:41:38 +02:00
MRprusa3d b93f37ee02 "stop" immediately after "pause" patch 2019-04-29 14:39:19 +02:00
Robert Pelnar 18dec75b56 MK2.5 - watchdog enabled + test (command "D-1") 2019-04-29 13:19:59 +02:00
NotaRobotexe f16bea26e5 raise the Z axis before filament loading to nozzle on MMU2S 2019-04-25 17:39:09 +02:00
XPila 238079fc95
Merge pull request #1763 from mkbel/save_flash_timer2
Do not compile timer02.c if not used. Saves 148B flash.
2019-04-24 16:07:17 +02:00
mkbel e8e7fa907f
Change comment 2019-04-24 15:52:24 +02:00
Robert Pelnar 1d8b2b3e18 Secondary language reserved space resized 2019-04-24 15:22:17 +02:00
Marek Bel f25f8f1b71 Do not compile timer02.c if not used. Saves 148B flash. 2019-04-23 19:39:49 +02:00
mkbel ca449ef517
Merge pull request #1742 from XPila/MK3-bed_pwm_revert
Bed high frequency PWM disabled
2019-04-16 21:04:28 +00:00
Marek Bel 75fac9dab2 Do not kill printer if External SPI flash W25X20CL is not responding.
Remove internationalization macro for this message. It has no sense to be translated as internationalization in most cases doesn't work if it is not responding.
Show this message instead of splash screen if the error is encountered.
There is no additional delay or wait for click, as such functions doesn't work in setup function.
2019-04-16 22:20:53 +02:00
Robert Pelnar 1f9737b4a6 Bed high frequency PWM disabled 2019-04-16 16:48:01 +02:00
Paul Bransford 863c7158b2 use modification times for sdcard sort 2019-04-16 06:24:47 -04:00
PavelSindler 7168c09eec
Merge pull request #1713 from mkbel/fix_octoprint_mmu_load_failed
Fix octoprint mmu load failed
2019-04-10 18:21:06 +02:00
MRprusa3d b5f196406e (preliminary) fix @ preHeatError II 2019-04-10 00:29:58 +02:00
Marek Bel 0d3e3c506a Merge remote-tracking branch 'prusa3d/MK3' into fix_octoprint_mmu_load_failed 2019-04-09 20:54:21 +02:00
Marek Bel c7d403733a Allow load filament retry after button push unlimited times in case mmu_continue_loading() is in blocking mode. 2019-04-09 20:50:29 +02:00
MRprusa3d 32f3471862 print parameters checking
prusa_stat_diameter()
2019-04-09 15:22:08 +02:00
Voinea 173062295f Enable print fan while waiting for cooldown 2019-04-06 13:42:21 +03:00
Marek Bel 84cabd3836 Change busy_state type, save 340B of flash 2019-04-05 15:20:34 +02:00
Marek Bel bf57a59147 Extract duplicate code into function. Saves 106B flash. 2019-04-05 15:12:35 +02:00
Marek Bel 4bfa3d7e0b Reporty busy: paused for user in case MMU is not responding. 2019-04-04 19:04:15 +02:00
Marek Bel bf1a55ab02 Add mmu_continue_loading blocking variant and use it for usb printing, so that "ok" is not returned to the controller in case MMU load failed.
Known limitation: MMU load failed is not handled properly if it happens again after user clicked printer button to continue print.
2019-04-04 18:15:37 +02:00
MRprusa3d aa0edd09f5 (preliminary) fix @ (bed) preHeatError 2019-04-03 22:48:58 +02:00
MRprusa3d 4b1fc69088 "disable_z()" for Delta PSU III
stealthChop set if motor-disable (@ Z) required
2019-04-02 20:04:44 +02:00
PavelSindler fd96bde69f
Merge pull request #1667 from mkbel/Add_IR_sensor_fail_message
Add ir sensor fail message
2019-04-02 14:55:27 +02:00
PavelSindler a8d8d9e4c9 version change 2019-04-01 20:52:24 +02:00
PavelSindler c440ca7369
Revert "Phase correct PWM for bed, frequency 40KHz." 2019-04-01 18:44:13 +02:00
Marek Bel 469aa10097 Enable MMU cutter. 2019-03-29 07:27:29 +01:00
PavelSindler ae11c1e26f rename function 2019-03-28 16:39:56 +01:00
PavelSindler 97594c83bb function misleading names changed 2019-03-28 14:58:58 +01:00
PavelSindler 96a111119b document 2019-03-28 14:52:50 +01:00
PavelSindler 8f69d5a501 document 2019-03-28 14:48:35 +01:00
PavelSindler 1dd486d86d max length of menu item strings added 2019-03-28 13:18:28 +01:00
PavelSindler d22793f276 Z-probe nr. states reduced to 1; 3; 5 2019-03-28 12:02:46 +01:00
PavelSindler 02faadf0b9 MMU mode renamed 2019-03-28 09:49:08 +01:00
PavelSindler e7900aeaa1 Merge remote-tracking branch 'upstream/MK3' into 7x7_polishing 2019-03-28 08:08:54 +01:00
PavelSindler c1da07bda0
Merge pull request #1653 from XPila/MK3
Phase correct PWM for bed, frequency 40KHz.
2019-03-27 21:07:15 +01:00
PavelSindler e259967991 remove / comment debug code 2019-03-27 20:41:45 +01:00
PavelSindler 5863297538 if deviation between current Z-probe and avg, value > 50um, enlarge Z-probe movements and repeat measurement 2019-03-27 20:25:00 +01:00
PavelSindler a9ce38df71 Function for decision if we have valid Z-calibration data in eeprom fixed, mesh bed leveling: possible crash fix, temporaty debug info on serial line. 2019-03-26 17:14:05 +01:00
MRprusa3d 17a534e42b "disable_z()" for Delta PSU II 2019-03-25 23:28:25 +01:00
Marek Bel baeee5817e Make lcd_selftest_error() calls safer, as nullptr parameter is not handled. It is hard to believe, but it actually saves 4B flash. 2019-03-22 00:24:22 +01:00
Marek Bel 966e772702 Fix compile error for non TMC2130 endstops check. 2019-03-22 00:14:29 +01:00
Marek Bel 89f1a3bacf Fix compile error for non TMC2130 pulley check. 2019-03-22 00:11:02 +01:00
Marek Bel 8582babddb Fix compile error for manual fan check. 2019-03-22 00:08:44 +01:00
Marek Bel d1c5c03907 Fix compile error for manual fan check. 2019-03-22 00:03:14 +01:00
Marek Bel c45a7f8641 Fix 1_75mm_MK3-EINSy10a-E3Dv6full variant build error. 2019-03-21 23:50:01 +01:00
Marek Bel 91779a5d04 Add filament sensor false triggering message. 2019-03-21 23:36:59 +01:00
Marek Bel ba23b1b2c5 Remove unused. 2019-03-21 22:50:46 +01:00
Marek Bel 6c28ed6349 Convert lcd_selftest_error() first parameter to enum class. 2019-03-21 22:48:57 +01:00
PavelSindler fbe68cb287 variables scope changed 2019-03-21 19:37:34 +01:00
PavelSindler 576bfb17c7 whitespace 2019-03-21 18:51:54 +01:00
PavelSindler 175f840d16 return statement not used (fixes Pronterface issues) 2019-03-21 18:46:07 +01:00
MRprusa3d 632781c4a2 "disable_z()" for Delta PSU 2019-03-21 00:45:15 +01:00
Harpalyke 0f21ccee3c Adding the microstepping resolution for all axis to the eprom config which is persisted during M500 for Mk3 and Mk3S 2019-03-19 21:39:59 +00:00
MRprusa3d 7d98177716 farmMode updates 2019-03-19 19:48:40 +01:00
Robert Pelnar cfd185f315 Phase correct PWM for bed, frequency 40KHz. 2019-03-19 14:50:57 +01:00
Marek Bel 4100bd33a7 Fix Dcodes compilation errors and warnings. 2019-03-19 13:53:58 +01:00
PavelSindler e37c2e0b2e version change 2019-03-15 20:01:02 +01:00
PavelSindler 7c5e9500a8 version change 2019-03-15 20:00:07 +01:00
PavelSindler c05561d6b1
Merge pull request #1607 from PavelSindler/7x7
7x7 mbl and switching mmu modes
2019-03-15 19:55:15 +01:00
PavelSindler 0ca52216f3 Revert "variants update"
This reverts commit c3a95ab79b.
2019-03-15 13:14:32 +01:00
Marek Bel ffe45bdef3 Disable mmu filament cutter feature. 2019-03-15 03:38:37 +01:00
PavelSindler 80ef2686ae mmu mode switching fix 2019-03-14 18:17:40 +01:00
PavelSindler 6e26f61726 fixed 7x7 mesh bed leveling vs. Z calibration check 2019-03-14 14:48:01 +01:00
PavelSindler ef198856a4 increase relative movement in Z to work better with higher hysteresis PINDAs 2019-03-14 14:10:52 +01:00
PavelSindler 9e0e4198c5 Mesh by 3d-gussner, fixed difference between mbl points coordinates and coordinates used in planner for corrections, mbl settings menu update 2019-03-14 01:52:44 +01:00
MRprusa3d 1f131f66e0 print parameters checking
nozzle diameter
2019-03-14 00:36:56 +01:00
PavelSindler 72f51989fa compare measured Z-value during mesh bed leveling with Z-calibration value even for 7x7 mesh 2019-03-13 19:41:09 +01:00
PavelSindler 32138ea09a menu item alignment 2019-03-13 15:08:09 +01:00
PavelSindler 6c70d59810 mbl settings initialization fix 2019-03-13 15:05:10 +01:00
PavelSindler c3a95ab79b variants update 2019-03-12 11:57:35 +01:00
PavelSindler b20d9171b6 Merge remote-tracking branch 'upstream/MK3' into 7x7 2019-03-12 11:47:17 +01:00
PavelSindler 42036270cf
Merge pull request #1619 from MRprusa3d/PFW-795d
better autoLoad II
2019-03-12 11:44:30 +01:00
PavelSindler c55f42965d
Merge pull request #1601 from MRprusa3d/PFW-749
SD card menu enhancement
2019-03-12 11:42:53 +01:00
PavelSindler c9cff11732
Merge pull request #1593 from MRprusa3d/PFW-647
mode switching, G-code unification
2019-03-12 11:40:43 +01:00
PavelSindler 4d2b155ff9
Merge pull request #1594 from mkbel/fix_change_filament
Fix change filament
2019-03-12 11:39:15 +01:00
PavelSindler 0aa21c362e compile error fix 2019-03-11 23:37:30 +01:00
PavelSindler 9a83925a97 fixed bug in counting approximate Z coordinate 2019-03-11 23:13:55 +01:00
MRprusa3d 3388444b6c better autoLoad II
autoLoad inhibit if Support::ExtruderInfo(@MKx)/SensorInfo(@MKxS)-menu is selected
2019-03-11 20:43:07 +01:00
PavelSindler 698f81abe0 fix compile error 2019-03-11 15:55:48 +01:00
PavelSindler 819a91ab1e switching stealth/normal mode for mmu in settings menu and tune menu 2019-03-11 12:33:22 +01:00
PavelSindler 141b78c048 number of Z-probes defualt value changed from 4 to 3, mmu stealth mode switch in settings menu 2019-03-10 16:03:46 +01:00
PavelSindler 091934462d menu correction 2019-03-08 20:06:30 +01:00
PavelSindler 315959c13a menu update 2019-03-08 20:03:23 +01:00
PavelSindler 952e0e1e77 change min. nProbeRetry to 1 2019-03-08 19:49:10 +01:00
PavelSindler f293d61d3d faster Z probe: move Z 150um relatively to last measurement. If PINDA is triggered at the beginning of measurement, move Z 500um higher and repeat measurement 2019-03-08 18:52:14 +01:00
PavelSindler 6a864ffbab G80 parameters configurable via settings menu 2019-03-08 15:43:37 +01:00
PavelSindler 98bb2b7acf merge debug gcodes for bed analysis 2019-03-06 20:45:23 +01:00
PavelSindler dccb6ca2c6 Merge remote-tracking branch 'upstream/MK3' into bed_analysis_gcodes2 2019-03-06 19:56:52 +01:00
PavelSindler f0cc313fed debug gcodes (fans, bed analysis) moved to Dcodes, HOST_KEEPALIVE_FEATURE simplified 2019-03-06 19:56:48 +01:00
PavelSindler 2a71dbefb8
Merge pull request #1597 from mkbel/fix_compiler__warning
Fix compiler  warning
2019-03-06 19:55:18 +01:00
MRprusa3d 6217329d50 SD card menu enhancement 2019-03-06 19:51:26 +01:00
PavelSindler 101453b674 mbl submenu 2019-03-06 13:27:31 +01:00
PavelSindler 5766a5537e limit number of probes 2019-03-05 22:43:44 +01:00
PavelSindler 7c187541e1 function for valid points determination improved; simple Z-coordinate estimation; measure all points and use inaccurate Z-coordinate in case that we don't have enought information for counting Z-coordinate estimation 2019-03-05 22:36:30 +01:00
PavelSindler d9e93e8a77 measurements points moved 10mm to the left; measure only chosen points (e.g. not points affected by magnets proximity) 2019-03-05 20:40:08 +01:00
Marek Bel 1eab058ad4 Fix uninitialized variable used. 2019-03-05 18:08:35 +01:00
Marek Bel 7fcecabd5f Fix compiler warning: variable 'previous_millis_cmd' set but not used 2019-03-05 18:04:58 +01:00
Marek Bel 484259cbb2 Fix compiler warning: 'lcd_settings_linearity_correction_menu_save' defined but not used 2019-03-05 18:00:16 +01:00
Marek Bel 28f1e309a2 Fix compiler warning: 'old_x_max_endstop' defined but not used
Fix compiler warning: 'old_y_max_endstop' defined but not used
2019-03-05 17:44:47 +01:00
Marek Bel 7bcd54f8ba Add missing function prototype. 2019-03-05 17:30:27 +01:00
Marek Bel ebfd4b2f47 Fix compiler warning: unused parameter 'calib' 2019-03-05 17:02:57 +01:00
Marek Bel 790ae9f0ce Fix compiler warning: unused parameter 'pstep'. 2019-03-05 16:41:41 +01:00
Marek Bel 5b9e7c4fe7 Fix warning: assignment makes pointer from integer without a cast. 2019-03-05 16:27:47 +01:00
PavelSindler f1031d2302 new farm statuses for pause (14) and wait for user (15) 2019-03-05 16:00:50 +01:00
Marek Bel 23859921b9 Fix compiler warnings macro redefined. 2019-03-05 15:56:20 +01:00
MRprusa3d 20a03d703d G-code unification
"FSENSOR_RECOVER" ->-> "PRUSA fsensor_recover"
2019-03-05 13:36:13 +01:00
Marek Bel f161d3ade4 Change formatting. 2019-03-04 22:17:43 +01:00
Marek Bel b2255c8be9 Preheat nozzle before loading filament in M600 (change filament) gcode.
This fixes problem of not heating the nozzle when retrying load after MMU load failed.
2019-03-04 22:00:24 +01:00
MRprusa3d 7e48d633cb mode switching
info-message viewing during mode switching
2019-03-04 21:30:36 +01:00
PavelSindler 17f095b957 shorter Z movements (makes calibration faster) 2019-03-04 20:32:56 +01:00
mkbel 27f69bb761
Merge pull request #1570 from PavelSindler/mmu_stealth_mode
mmu stealth mode
2019-03-04 17:09:11 +01:00
PavelSindler 7f92d73a40 MMU_STEALTH_MODE -> MMU_FORCE_STEALTH_MODE; activate_stealth_mode() function update 2019-03-04 17:04:22 +01:00
PavelSindler 9dde8c4732
Merge pull request #1591 from MRprusa3d/PFW-795c
better autoLoad
2019-03-04 15:31:04 +01:00
PavelSindler 1051b7c39f
Merge pull request #1583 from mkbel/fix_cut
Fix unable to cut filament, if nozzle is already preheated.
2019-03-04 15:29:54 +01:00
PavelSindler e832f0f2ee
Merge pull request #1582 from mkbel/remove_unused_code
Remove commented out code, fix formatting.
2019-03-04 15:29:36 +01:00
Marek Bel 8812d40546 Revert "Fix compiler warning: variable 'kill_message' set but not used"
This reverts commit a964f996fa.
2019-03-04 15:05:14 +01:00
MRprusa3d b02ca18c93 better autoLoad
autoLoad inhibit if Support::ExtruderInfo-menu is selected
2019-03-04 12:52:35 +01:00
Marek Bel 9e38b1e101 Add missing message "Preheating to cut". 2019-03-01 18:17:08 +01:00
Marek Bel 6437d44991 Fix unable to cut filament, if nozzle is already preheated. 2019-03-01 18:10:06 +01:00
Marek Bel 83e07b5cdf Fix compiler warnings:
sketch/ultralcd.cpp: In function 'void mFilamentPrompt()':
sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
 switch(eFilamentAction)
       ^
sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
      switch(eFilamentAction)
            ^
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuLoad' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuUnLoad' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuEject' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp: In function 'void mFilamentItem(uint16_t, uint16_t)':
sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
      switch(eFilamentAction)
            ^
sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
      switch(eFilamentAction)
            ^
sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
2019-03-01 18:07:19 +01:00
Marek Bel 824d11e4b0 Remove "Press the knob to eject filament" message, as it is never shown. 2019-03-01 17:43:28 +01:00
Marek Bel 57cf7ee171 Fix compiler warning: 'lcd_selftest_fsensor' defined but not used 2019-03-01 17:21:13 +01:00
Marek Bel 4c2d4fcf77 Fix compiler warning ultralcd.cpp:4038:10: warning: unused variable 'chars 2019-03-01 17:18:05 +01:00
Marek Bel a964f996fa Fix compiler warning: variable 'kill_message' set but not used
kill_message is unused since:

Author:      MRprusa3d <martin.remis@prusa3d.cz>
Date:        4 months ago (11/2/2018 11:03:14 PM)
Commit hash: 73794b56cf

MeshBed Leveling Fail

Z-leveling after MeshBed leveling failing
2019-03-01 17:08:36 +01:00
Marek Bel 8e51b37d91 Suppress warning: unused parameter. 2019-03-01 16:57:20 +01:00
Marek Bel 22500970ba Remove commented out code, fix formatting. 2019-03-01 16:18:16 +01:00
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
PavelSindler e14e4be94e
Merge pull request #1575 from mkbel/add_ramming_eject
Add filament ramming to eject filament.
2019-03-01 14:21:23 +01:00
PavelSindler 0db721b244
Merge pull request #1559 from mkbel/detect_bad_load
Move extruder forth and back after filament detected by sensor to det…
2019-03-01 14:21:04 +01:00
PavelSindler 3cbcbba738
Merge pull request #1510 from mkbel/fix_menu_stack_third_time
Fix menu stack overrun.
2019-03-01 14:20:22 +01:00
PavelSindler 250a448d05
Merge pull request #1549 from mionut/7MBL
7x7 mesh bed leveling with power failure save + pinda temperature filter
2019-03-01 14:19:52 +01:00
PavelSindler 488497df2c version change 2019-03-01 13:56:03 +01:00
PavelSindler ca88010018 Revert "version change"
This reverts commit f14733f2dd.
2019-03-01 13:54:25 +01:00
PavelSindler f14733f2dd version change 2019-03-01 13:53:18 +01:00
PavelSindler e27fdafcec menu switch - initial 2019-02-28 19:42:09 +01:00
PavelSindler 482f8ef01a Merge remote-tracking branch 'mionut/7MBL' into 7x7 2019-02-28 15:54:49 +01:00
Marek Bel 2a005caf42 Add cutter enable to tune menu. 2019-02-27 17:47:51 +01:00
Marek Bel 02a692c5d9 Store cutter enable state in EEPROM. 2019-02-27 17:34:03 +01:00
PavelSindler ff6eb0b1af
Merge pull request #1568 from MRprusa3d/PFW-795
preHeat @ filament management
2019-02-27 13:15:39 +01:00
Marek Bel 4a4eb9962c Cut filament when cutter is enabled and MMU load fails. 2019-02-27 10:42:26 +01:00
MRprusa3d 2f1e968563 "lcd_update_enable()" replacement 2019-02-26 23:17:52 +01:00
Marek Bel 49b1d1cb93 Move prototype to header file. 2019-02-26 18:50:15 +01:00
Marek Bel a67645fda6 Merge branch 'add_cut' into bad_load_cut 2019-02-26 18:35:55 +01:00
Marek Bel 815231bc26 Add MMU cut filament menu. 2019-02-26 17:58:00 +01:00
MRprusa3d ff35119ef3 preHeat @ filament management
another funcionality III / autoLoad
2019-02-26 17:33:37 +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
Marek Bel 6c9dd4f272 Add filament ramming to eject filament. 2019-02-26 13:41:28 +01:00
Marek Bel 7a1b47c340 Convert functions mmu_eject_fil_0 to mmu_eject_fil_4 to template function. 2019-02-26 11:11:05 +01:00
Marek Bel 34e2495487 Convert mmu_load_to_nozzle_0 to mmu_load_to_nozzle_4 to template. 2019-02-26 10:32:10 +01:00
Marek Bel d5c5ed55eb Change formatting. 2019-02-25 11:12:39 +01:00
Marek Bel 8f5fbe569c Merge branch 'MK3' into detect_bad_load 2019-02-25 10:41:26 +01:00
PavelSindler 8e3d52ee6d fix compilation error for MK2.5, make code more readable 2019-02-22 17:15:40 +01:00
PavelSindler 26cab2911f mmu stealth mode 2019-02-22 16:30:54 +01:00
Laurentiu 51827c578f MESH_MEAS_NUM_X_POINTS constant correction to MESH_MEAS_NUM_Y_POINTS 2019-02-22 15:05:06 +02:00
Laurentiu 62875f2e95 MESH_MEAS_NUM_X_POINTS constant correction to MESH_MEAS_NUM_Y_POINTS 2019-02-22 14:35:48 +02:00
MRprusa3d c0a8d87e9e Merge remote-tracking branch 'my_remote/PFW-795' into PFW-795 2019-02-22 03:16:23 +01:00
MRprusa3d be0ed46335 preHeat @ filament management
another funcionality III
2019-02-22 03:09:50 +01:00
PavelSindler 730e370e78
Merge pull request #1565 from PavelSindler/MK3_for_merging
version change
2019-02-21 19:17:03 +01:00
PavelSindler da28773480 version change 2019-02-21 19:16:24 +01:00
MRprusa3d e422cc1c26
Merge branch 'MK3' into PFW-795 2019-02-21 15:43:56 +01:00
MRprusa3d ed93f1b7f0 preHeat @ filament management
another funcionality IIb
2019-02-21 15:27:22 +01:00
PavelSindler 16bb6c80c7
Merge pull request #1562 from PavelSindler/mmu_stop_print_fix
comments
2019-02-21 14:29:04 +01:00
PavelSindler 6ad5c07e6d comments 2019-02-21 14:28:05 +01:00
MRprusa3d 323071f50a preHeat @ filament management
another funcionality II
2019-02-21 13:20:29 +01:00
MRprusa3d a54c68b874 preHeat @ filament management
another funcionality II
2019-02-21 04:45:44 +01:00
Marek Bel 8b858286ac Document. 2019-02-21 02:30:01 +01:00
Marek Bel 326c8492b5 Move extruder forth and back after filament detected by sensor to detect bad load. 2019-02-21 01:19:26 +01:00
PavelSindler 1e729048dc cmdqueue_reset fix 2019-02-21 00:14:49 +01:00
MRprusa3d da0867cfc5 preHeat @ filament management
another funcionality
2019-02-20 03:01:33 +01:00
Laurentiu afc86a1363 missing ; 2019-02-18 05:50:29 +02:00
PavelSindler 11d19879fc
Merge pull request #1533 from MRprusa3d/PFW-210
preHeat @ filament load / unload / autoLoad / MMU
2019-02-15 17:45:38 +01:00
PavelSindler 9d76b6912c merge new changes from upstream 2019-02-15 17:05:39 +01:00
PavelSindler 2b6668b853 merge MK3S branch into MK3 2019-02-15 16:42:40 +01:00
PavelSindler fec64a9d5e
Merge pull request #1525 from mkbel/improve_mmu_load_failed_2
Improve mmu load failed 2
2019-02-15 15:52:35 +01:00
PavelSindler 69ff37729e whitespace 2019-02-15 14:19:30 +01:00
PavelSindler 0f791ce47f mmu needs attention: idler error fix 2019-02-15 14:17:47 +01:00
MRprusa3d 0c1f9b5100 preHeat @ filament management
target temperature keeping
2019-02-15 02:25:44 +01:00
Laurentiu 4835b9b220 7x7 points mesh bed leveling 2019-02-14 10:57:58 +02:00
MRprusa3d 80c3420a12
Merge branch 'MK3' into PFW-210 2019-02-14 00:05:50 +01:00
MRprusa3d ef1f82627e preHeat @ filament load / unload / autoLoad / MMU
MMU options added
2019-02-13 23:53:00 +01:00
Marek Bel a5437cb15b Resend MMU T commands only.
This solves problem with unload repeated if unload takes too long, second ok reply then triggers Wait end and resumes print.
2019-02-13 22:29:29 +01:00
Marek Bel a4032e437e Add MMU wait command after MMU load failed. Resume print when MMU wait command returns OK. 2019-02-13 21:28:21 +01:00
Marek Bel daaec0ef04 Convert MmuCmd to enum class. 2019-02-13 17:12:35 +01:00
Marek Bel 8e23e7f322 Save some flash by using smaller type for filament. 2019-02-13 16:37:54 +01:00
Marek Bel 9e873ac0f7 Use enum for mmu_cmd instead of plain integer type. 2019-02-13 01:51:39 +01:00
Marek Bel bb7eeef1f4 Define debug printf and puts functions to make code more readable. 2019-02-12 23:24:23 +01:00
Marek Bel e1216934ef Save flash by defining underlying type and omitting number value. 2019-02-12 21:53:11 +01:00
Marek Bel 3379fb4866 Convert mmu_state to enum. 2019-02-12 21:43:26 +01:00
PavelSindler 4c76393231 version change 2019-02-12 13:44:50 +01:00
PavelSindler 62500f0b55 version changed 2019-02-12 10:39:09 +01:00
Marek Bel 6c8d9c6fb4 Retry filament load on MMU load failure once. 2019-02-11 23:43:42 +01:00
Marek Bel d33b24c281 Unload filament after MMU load failed so MMU unit can be controlled by its buttons. 2019-02-11 23:24:55 +01:00
PavelSindler b85661309f configuration change 2019-02-11 16:38:36 +01:00
PavelSindler ccc542d74a MK2.5 IR_SENSOR_PIN modified 2019-02-11 14:32:21 +01:00
PavelSindler cd692f6be6 version change 2019-02-07 19:43:08 +01:00
PavelSindler 065d56b2c6 version change 2019-02-06 23:58:30 +01:00
PavelSindler 38b0e5439b version change 2019-02-06 23:52:24 +01:00
MRprusa3d b17a961241 MK2.5S
pin definition for filament sensor connection
2019-02-06 23:31:48 +01:00
PavelSindler e028db7bf9 version change 2019-02-06 23:30:01 +01:00
PavelSindler ff52499bdc extr fan RPM measuring fix 2019-02-06 23:05:13 +01:00
PavelSindler e432e258dc extr fan RPM measuring fix 2019-02-06 22:56:10 +01:00
PavelSindler 22217a42f7 message change 2019-02-06 21:37:39 +01:00
PavelSindler a85d8e7f97 message change 2019-02-06 21:36:21 +01:00
PavelSindler d19c92bca8 welcome message changed 2019-02-06 19:41:17 +01:00
PavelSindler de9c87c592 welcome message changed 2019-02-06 19:38:52 +01:00
Marek Bel c704a4b7ab Fix menu stack overrun. 2019-02-06 18:25:45 +01:00
PavelSindler 726d5aa3c3 typo fixed 2019-02-06 16:29:10 +01:00
PavelSindler 63c8a36185 typo fixed 2019-02-06 16:27:44 +01:00
PavelSindler a220c97f94 Revert "variant files"
This reverts commit 850d3316b6.
2019-02-06 16:19:30 +01:00
PavelSindler 2fe8e0670a MK2 build fail fixed 2019-02-06 16:15:19 +01:00
PavelSindler 850d3316b6 variant files 2019-02-06 15:18:12 +01:00
PavelSindler ef86c78f25 menu item text changed 2019-02-06 14:24:47 +01:00
PavelSindler 1ba046395e fan measurements fix: keep fanSpeedSoftPwm = 255 during measurements, selftest changes 2019-02-06 12:37:18 +01:00
PavelSindler 27d002a46f Merge remote-tracking branch 'robert/MK3-variants' into variants 2019-02-06 09:20:21 +01:00
PavelSindler 860e6f9994 Merge remote-tracking branch 'upstream/MK3' into variants 2019-02-06 09:19:38 +01:00
PavelSindler fcb7dd90cf
Merge pull request #1505 from MRprusa3d/PFW-210
preHeat @ filament load / unload / autoLoad
2019-02-06 09:14:03 +01:00
MRprusa3d a53d150903 preHeat @ filament load / unload / autoLoad
autoLoad option added
2019-02-06 01:58:05 +01:00
Robert Pelnar 93d4128163 Fixed timer2 colission with arduino framework around "tone" function. 2019-02-05 19:08:57 +01:00
PavelSindler 62e253edd0 fanSpeed -> fanSpeedSoftPwm (fixes fan speed menu) 2019-02-05 18:21:44 +01:00
PavelSindler 903028e574 fix fan speed measuring for PWM = 255 2019-02-05 17:46:31 +01:00
PavelSindler 91b12ff64b bed level correction menu fix (menu_item_edit for negative integers) 2019-02-05 16:49:29 +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
PavelSindler 9a51a7be29 Merge branch 'bed_correction_fix' into variants 2019-02-04 12:47:06 +01:00
PavelSindler 0853ef5d06 Merge remote-tracking branch 'upstream/MK3' into variants 2019-02-04 12:45:28 +01:00
PavelSindler b4f2dc3b5e Merge remote-tracking branch 'robert/MK3-variants' into variants 2019-02-04 12:41:08 +01:00
PavelSindler 6d5a2ae816
Merge pull request #1499 from MRprusa3d/PFW-210
preHeat @ filament load / unload
2019-02-04 12:37:42 +01:00
Robert Pelnar d2a4cb4c49 Use _delay_ms instead of delay (fix - fast scrolling in sd card menu - temporary solution) 2019-02-04 12:20:07 +01:00
MRprusa3d fff8fc8a48 preHeat @ filament load / unload
filament-list correction (PET missing)
2019-02-04 12:12:35 +01:00
PavelSindler 2f9ab7b185 Merge branch 'dev' into variants 2019-02-04 01:32:24 +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 036bd4eb46 Merge branch 'dev' into variants 2019-02-04 01:20:14 +01:00
PavelSindler 6bf8611afa mintemp: delay cutting lines removed 2019-02-04 01:19:58 +01:00
PavelSindler 71e4459cc9 Merge branch 'dev' into variants 2019-02-04 01:14:11 +01:00
PavelSindler fba207e0ec crash detection: don't wait for heater if target temp = 0; new priting type 2019-02-04 01:13:46 +01:00
PavelSindler 5324181bf7 maximum bed level correction value enlarged from 50um to 100um and is now used in menus and mesh bed leveling itself 2019-02-03 20:56:14 +01:00
PavelSindler 454a087fb3 Merge branch 'dev' into variants 2019-02-01 21:24:38 +01:00
PavelSindler 4444b155f1 M600: prevention of blob; massage changed when autoload is active 2019-02-01 21:08:34 +01:00
PavelSindler 97aaf919a3 Merge remote-tracking branch 'upstream/MK3' into dev 2019-02-01 18:12:59 +01:00
Robert Pelnar 79449a8eaf Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control 2019-02-01 13:29:50 +01:00
PavelSindler 2cb3b99981 Merge branch 'dev' into variants 2019-01-31 18:04:38 +01:00
PavelSindler 4f67a9569c dont show filament sensor in extruder info menu 2019-01-31 18:03:56 +01:00
PavelSindler 6342b6032c Merge remote-tracking branch 'upstream/MK3' into variants 2019-01-31 10:18:41 +01:00
PavelSindler 491dbf5ebd
Merge pull request #1493 from MRprusa3d/PFW-210
preHeat @ filament load / unload
2019-01-31 10:15:59 +01:00
MRprusa3d 921b6993ee preHeat @ filament load / unload 2019-01-31 05:21:53 +01:00
PavelSindler 9926468c91 Merge remote-tracking branch 'upstream/MK3' into variants 2019-01-30 17:26:45 +01:00
PavelSindler b24cd58a50
Merge pull request #1491 from XPila/MK3-bed_fast_pwm
HW pwm fix
2019-01-30 12:52:44 +01:00
Robert Pelnar 9890c60fe5 HW PWM fix 2019-01-30 00:06:12 +01:00
PavelSindler bbdb2c1597 Merge branch 'dev' into variants 2019-01-29 15:34:56 +01:00
MRprusa3d 19fd05bb46
Merge pull request #1490 from PavelSindler/menu_update
menu update
2019-01-29 13:29:27 +01:00
PavelSindler 1fa9913029 include printers.h 2019-01-28 21:54:44 +01:00
PavelSindler 220437316b
Merge pull request #1485 from XPila/MK3-bed_fast_pwm
Mk3 bed fast pwm
2019-01-28 21:14:01 +01:00
PavelSindler 60acdd23c5 variants 2019-01-28 21:12:38 +01:00
PavelSindler 29e156b26d printer types updated 2019-01-28 19:48:46 +01:00
PavelSindler 25d54d43aa menu update 2019-01-28 19:41:02 +01:00
Marek Bel 6d2358125a Fix Timer_test broken by conditional translation for SYSTEM_TIMER_2. 2019-01-28 19:29:31 +01:00
PavelSindler dd4d8e1277 calibrate z endstop update 2019-01-28 19:23:19 +01:00
PavelSindler af348aa8ba compilation error fix: pin for LCD brightness 2019-01-28 17:56:44 +01:00
PavelSindler 83510ed489 check_for_ir_sensor 2019-01-28 17:27:16 +01:00
PavelSindler 8fe2d1de9a Merge remote-tracking branch 'my_dev/MK3' into dev 2019-01-28 17:15:22 +01:00
PavelSindler 8f039263d5 variant files and version 2019-01-28 17:14:24 +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
Robert Pelnar 1b4e49b5ac Fixed fancheck and include in TimerRemaining.h
this commit enables fast pwm mode for bed (SYSTEM_TIMER_2 definition uncomented)
fancheck fix verified with selftest
2019-01-28 12:57:33 +01:00
PavelSindler 0514306bed selftest fixed 2019-01-28 11:09:41 +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
PavelSindler c6e6df404c
Merge pull request #1482 from mkbel/IR_fsens_selftest
Ir fsens selftest
2019-01-28 10:39:12 +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
Marek Bel aaa2670ef8 Remove redundant enum numbering. 2019-01-25 20:14:29 +01:00
Marek Bel b167896c6d Convert lcd_selftest_screen parameter int _step to enum class testScreen screen. 2019-01-25 20:00:12 +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
Marek Bel 6d1256eaad Internationalize "Calibrating home". 2019-01-25 18:06:30 +01:00
PavelSindler fc1491670f mmu_idler_sensor_detected -> ir_sensor_detected 2019-01-25 18:03:05 +01:00
PavelSindler 6b6a3d7d5f MMU_IR_SENSOR_PIN -> IR_SENSOR_PIN 2019-01-25 18:01:17 +01:00
PavelSindler 7e3a1c7d45 merge changes from upstream 2019-01-25 17:57:24 +01:00
PavelSindler 579fb42be2
Merge pull request #1480 from MRprusa3d/PFW-556
Pfw 556
2019-01-25 15:04:26 +01:00
PavelSindler 0d1a7a1774
Merge pull request #1479 from MRprusa3d/PFW-749
SD card menu
2019-01-25 14:32:12 +01:00
PavelSindler 661c40ef75
Merge pull request #1472 from mkbel/IR_fsens_selftest
Ir fsens selftest
2019-01-25 13:14:18 +01:00
Marek Bel edc412697c Increase selftest_irsensor() filament nozzle unload temperature to ABS.
Resume nozzle temperature immediately after unload.
2019-01-24 21:24:46 +01:00
Marek Bel 68ffa95aa9 Fix axis self-test progress visualization. 2019-01-24 21:06:03 +01:00
Marek Bel 1c4f3259ea Increase heater check minimum expected temperature rises.
Bed increased from 3 to 10 K.
Nozzle increased from 10 to 30 K.

Measured rises with my MK3 printer:
Bed 26K,
Nozzle 73K.
2019-01-24 21:02:04 +01:00
Marek Bel 305598d7f6 Fix bed / nozzle test order and progress bar.
Known limitation:
Z progress shown in bed progress.
2019-01-24 20:03:37 +01:00
MRprusa3d 46e2bdaf62 Merge remote-tracking branch 'public_remote/MK3' into PFW-556 2019-01-24 19:39:34 +01:00
Marek Bel 22859800f0 Rearrange tests. Move hot end test to the end, to spare time in IR sensor test.
Known problems, hot end and bed is swapped. Bed progress indicator is painted to X axis test.
2019-01-24 19:22:36 +01:00
MRprusa3d b2b65475df SD card menu
SDcard-menu after card insertion
2019-01-24 17:32:57 +01:00
PavelSindler 6b1cf99066 conditional compilation updated 2019-01-24 16:14:02 +01:00
PavelSindler da2c963893 conditional compilation improved: fsensor_autoload_check_stop() and fsensor_autoload_check_start(); M600 "filament not responding" error on printers with ir sensor fixed 2019-01-24 16:00:52 +01:00
PavelSindler ad65024147 selftest: filament sensor check change 2019-01-24 13:57:52 +01:00
PavelSindler f4e5c729ac
Merge pull request #1451 from mkbel/Tx_fix
Tx fix
2019-01-24 13:41:43 +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
PavelSindler e0c1e4a02d version which should on all printer versions: autoload, selftest, filament detection, filament sensors initialization, filament menus 2019-01-24 01:12:30 +01:00
PavelSindler eec869b73a
Merge pull request #1477 from MRprusa3d/PFW-723
PID / manage_heater
2019-01-24 00:31:23 +01:00
MRprusa3d 15b45df9fb PID / manage_heater
better build-warnings elimination
2019-01-23 20:14:40 +01:00
MRprusa3d 867182c266 minTemp
more user-proof solution
2019-01-23 18:50:13 +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
PavelSindler 54f8f4eb4d
Merge pull request #1460 from MRprusa3d/PFW-723
Pfw 723
2019-01-23 14:12:19 +01:00
Marek Bel 1d71c1a5d1 Update IR sensor selftest progress bar more frequently. 2019-01-22 19:02:42 +01:00
Marek Bel 97a4623800 Fix lcd_selftest_screen for small _progress_scale. 2019-01-22 19:01:55 +01:00
Marek Bel 9cda0b69b8 Update IR sensor selftest progress bar. 2019-01-22 18:23:00 +01:00
Marek Bel 3ff8a7c740 Unload filament by MMU unit in selftest_irsensor().
Known limitation:
If filament was not loaded to nozzle it is sticked completely out of MMU. To be fixed in MMU, as this problem can be reproduced also from printer menu - unload filament.
2019-01-22 14:54:06 +01:00
Marek Bel c371a5ea65 Document. 2019-01-22 14:05:08 +01:00
Marek Bel a92d9c782b Add IR sensor test. 2019-01-22 11:29:55 +01:00
Marek Bel f292a6ca7a Refactor filament sensor selftest call. 2019-01-21 21:39:38 +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 d7ac459da7 PID / manage_heater
build-warnings elimination
2019-01-20 01:23:15 +01:00
MRprusa3d d9f8e4eb9e PID / manage_heater
PSD regulator improvement
2019-01-17 02:57:08 +01:00
PavelSindler ca8cb3784c
Merge pull request #1456 from mkbel/Fix_load_fail_current
Do not disable motor currents when print is paused due to mmu load er…
2019-01-16 12:49:38 +01:00
Marek Bel 3af1f81269 Do not disable motor currents when print is paused due to mmu load error. 2019-01-15 21:40:02 +01:00
Marek Bel 052ae323f8 Merge branch 'MK3' into prusa3d-DEV_MK3 2019-01-15 16:58:36 +01:00
Marek Bel d09ff5c3e7 Remove commented out code. 2019-01-15 01:30:54 +01:00
Marek Bel 39b391314f Document meaning of manage_response() move default parameter value. 2019-01-15 01:29:59 +01:00
Marek Bel 3b175459b1 Fix filament loaded to far and MMU idler never disengaged after Tx command on printer with idler sensor. 2019-01-15 01:28:51 +01:00
Marek Bel 2db42c8577 Merge branch 'MK3' into auto_deplete_2 2019-01-07 21:39:46 +01:00
Marek Bel c080b899c3 Change filament number in T command to alternative if depleted and lcd_autoDepleteEnabled(). 2019-01-04 22:32:48 +01:00
PavelSindler 7946cd7250 eeprom write nr. limitation 2019-01-04 22:23:11 +01:00
PavelSindler 02262ff7ca mmu load fail: possibility to unload/eject filament from menu 2019-01-04 21:37:19 +01:00
Marek Bel d89c03a0f1 Documentation. 2019-01-04 21:26:13 +01:00
Marek Bel 1a219b2372 Mark filament as depleted when detected by MMUv2 FINDA. Do not try to load filament if it is marked depleted, load next filament instead. Force user action when all filaments are marked as depleted. 2019-01-04 21:11:42 +01:00
PavelSindler b7b7e9387f do resend attempts before pausing print (mmu needs attention state) so the print would not be paused if T-code is not received correctly by mmu; prevent infinite loading 2019-01-04 21:07:52 +01:00
Marek Bel a7128ffa04 Comment. 2019-01-04 19:56:15 +01:00
Marek Bel 92ff284f82 Remove redundant code. 2019-01-04 19:35:33 +01:00
Marek Bel 360a977520 Fix allDepleted(). Add tests. 2019-01-04 19:34:42 +01:00
Marek Bel a309ec1b0b Add filament auto deplete engine for multi-material prints with MMUv2. 2019-01-03 22:58:25 +01:00
MRprusa3d 4e300fd552 minTemp
safety heaters management during/after minTemp
2019-01-02 18:25:41 +01:00
Craig Link 52d81bb4d8 set array size correctly to 4 2018-12-31 17:51:16 -08:00
PavelSindler 3ab1daf722 MMU_DEBUG temporarily enabled 2018-12-21 23:17:32 +01:00
PavelSindler 88441f7f2f scan power failures fix 2018-12-21 23:07:39 +01:00
PavelSindler 6ba86acebc send A (abort) command to mmu only when loading phase of T-code 2018-12-21 22:33:01 +01:00
PavelSindler e36e58f385 show sensor on/off temporarily changed to unlocalized strings 2018-12-21 21:28:57 +01:00
PavelSindler 688d4a8a82 missing defines in variant files 2018-12-21 21:05:54 +01:00
PavelSindler ba57986b72 merge changes from upstream 2018-12-21 20:58:38 +01:00
PavelSindler 5462d451e1 show power failures in fail stats menu, shorter load to nozzle if idler sensor detected 2018-12-21 20:56:45 +01:00
PavelSindler d1ca73597b
Merge pull request #1412 from XPila/V3_5
Repeat last MMU command after timeout
2018-12-21 20:53:24 +01:00
PavelSindler d292e877df load to nozzle shortened, sensor menu moved to support 2018-12-21 18:51:13 +01:00
PavelSindler 3c64bad1cb initial version which works on old and new hw, initial version of idler sensor detection 2018-12-21 17:12:16 +01:00
PavelSindler 75523b1497
Merge pull request #1417 from PavelSindler/z_cal_endstops
version changed
2018-12-19 20:08:22 +01:00
PavelSindler acbfe89f04 version changed 2018-12-19 20:07:18 +01:00
PavelSindler b0fce9122e
Merge pull request #1416 from PavelSindler/z_cal_endstops
Z cal endstops and stop paused print fix
2018-12-19 19:46:27 +01:00
Robert Pelnar f79137898a Fix - move down after calibrate Z (PFW718) 2018-12-19 19:22:03 +01:00
PavelSindler 40fe52202d stop paused print fix: saved_printing set to false when doing stop print 2018-12-19 19:20:09 +01:00
Robert Pelnar b8c5b6259e Fix - move down after calibrate Z (PFW718) 2018-12-19 14:40:10 +01:00
Robert Pelnar c69d4aa914 Move 1mm down with disabled endstop after calibrate_z_auto (PFW718) 2018-12-19 13:43:49 +01:00
Robert Pelnar 16e5fb50dd Remove M601 from queue before saving state (prevent infinite loop - PFW713) 2018-12-18 20:39:38 +01:00
Robert Pelnar 34f116b4d9 Move 1mm down with disabled endstop after calibrate_z_auto (PFW718) 2018-12-18 19:57:29 +01:00
PavelSindler b5430c2968 M600: consume click 2018-12-18 19:10:02 +01:00
Robert Pelnar 75d31fd2cb Repeat last MMU command after timeout 2018-12-18 18:47:54 +01:00
PavelSindler 880163dbcb missing prototypes 2018-12-18 17:38:24 +01:00
PavelSindler fc5d7e35ef fail stats mmu function definitions 2018-12-18 17:35:41 +01:00
PavelSindler 11ab5dfd36 fail stats menu for mmu defined for MK2.5 version 2018-12-18 17:33:27 +01:00
PavelSindler 4543949cac build without MMU_IDLER_SENSOR_PIN defined 2018-12-18 17:29:44 +01:00
PavelSindler fc33affbda temporary change 2018-12-18 17:24:29 +01:00
PavelSindler 2100376eb1 Merge remote-tracking branch 'upstream/MK3' into idler_sensor 2018-12-18 16:16:48 +01:00
PavelSindler c782373f2d comment 2018-12-18 16:09:10 +01:00
PavelSindler 7703125b2e retry unload movements (T-codes, M702 C) if filament detected by idler sensor, then turn off stepper and wait, MMU_LOAD_TIME prolonged 2018-12-18 16:08:29 +01:00
PavelSindler 27c8612360 use just short movement for unloading filament 2018-12-17 21:25:07 +01:00
PavelSindler cb1f6d2a0e show sensor states in calibration menu 2018-12-14 19:43:26 +01:00
Robert Pelnar 927898151a fix - tmc2130 conditional translation 2018-12-14 15:46:50 +01:00
Robert Pelnar cfe83daf4a Meshbed leveling fail - move 1mm outside of colission with disabled endstop 2018-12-14 15:32:47 +01:00
PavelSindler e0bed71801 comments update 2018-12-13 17:01:45 +01:00
PavelSindler bbba27c15f idler state menu 2018-12-13 16:53:59 +01:00
PavelSindler 24ef6deeed typo fixed 2018-12-13 16:43:40 +01:00
PavelSindler 9c4f086add fixed statistics for MMU_FAIL 2018-12-13 01:09:21 +01:00
PavelSindler df71398066 statistics fix 2018-12-13 00:43:27 +01:00
PavelSindler a9829b6a1a add statistics and idler sensor state 2018-12-13 00:12:00 +01:00
PavelSindler 665f1d7ffe pause print after N continue loading attempts and wait for user, then start print and repeat last T-code 2018-12-12 23:36:50 +01:00
PavelSindler 29ecd4ec7a duplicit T-codes execution improved, E-stepper movements when waiting for ok from mmu, continue loading function improved, eeprom: fail stats for mmu 2018-12-12 22:32:47 +01:00
Marek Bel 3d4cb8a994 Document gcode T. 2018-12-12 20:30:28 +01:00
PavelSindler c256af0a1c unknown filament added; the same T-code will be not executed twice in a row; continue loading 2018-12-12 14:50:55 +01:00
PavelSindler e52e53d1eb send continue loading commands periodically if initial load fails 2018-12-12 13:54:17 +01:00
PavelSindler 041ed172a0 Merge remote-tracking branch 'robert/MK3' into idler_sensor 2018-12-11 19:16:04 +01:00
PavelSindler 8af127870d consume click 2018-12-11 15:59:44 +01:00
Joshua Hoblitt 3f96dea4f9 make all shell scripts executable 2018-12-10 07:09:03 -07:00
PavelSindler 6d6de67c3f consume click 2018-12-07 18:31:30 +01:00
Robert Pelnar 35378769fd MMU - idler sensor 2018-12-06 19:19:50 +01:00
Robert Pelnar 6157c3ab32 New filament sensor 2018-12-06 15:41:53 +01:00
Robert Pelnar 41b78187ca LCD backlight - full brightnes at start 2018-12-06 15:27:05 +01:00
Robert Pelnar cb334238cc Slow PWM fan @ 62.5Hz 2018-12-06 15:18:07 +01:00
XPila 1948cb6310
Merge pull request #1369 from PavelSindler/M220_MK3
M220: possibility to backup/restore speed
2018-11-30 19:02:45 +01:00
PavelSindler d1d4a8c58c whitespace 2018-11-29 17:33:36 +01:00
PavelSindler 8e239ce76f changed M220 2018-11-29 17:02:38 +01:00
PavelSindler 929e1de253 special variable for saving/restoring feedmultiply using M220 2018-11-29 17:02:10 +01:00
PavelSindler 839de141a3 resolving conflicts 2018-11-29 16:26:49 +01:00
PavelSindler abf20ef6a2 merged changes from public upstream (Prusa-Firmware repository) 2018-11-29 13:46:58 +01:00
MRprusa3d 83a9f75abe minTemp
correct minTemp detection @ MK2.5 & MK3
2018-11-28 23:43:16 +01:00
Marek Bel 38dacaf07a Automate secondary language support build. 2018-11-26 20:24:24 +01:00
PavelSindler 90876453a7
Merge pull request #1357 from PavelSindler/MK3_for_merging
version change
2018-11-22 23:32:37 +01:00
PavelSindler 47d3535012 version change 2018-11-22 23:30:01 +01:00
PavelSindler c1773c1aa4
Merge pull request #1356 from PavelSindler/MK3_for_merging
process serial line during pause
2018-11-22 23:07:07 +01:00
PavelSindler 85b23d1db6 process serial line during pause 2018-11-22 21:41:22 +01:00
PavelSindler b3ab9d0ee0
Merge pull request #1354 from XPila/V3_5
Lang - final corrections
2018-11-22 19:03:30 +01:00
Robert Pelnar e229f3343e Lang - text "volume.init failed" removed from dictionary 2018-11-22 18:48:22 +01:00
Robert Pelnar 42f2a61416 Lang - text "TRIGGERED" removed from dictionary 2018-11-22 18:46:02 +01:00
Robert Pelnar e9131542ca Lang - text "Sleep..." removed from dictionary 2018-11-22 18:43:21 +01:00
Robert Pelnar ddf898cb41 Lang - text "SD init fail" removed from dictionary 2018-11-22 18:41:00 +01:00
Robert Pelnar 3384dd8487 Lang - text "SD card ok" removed from dictionary 2018-11-22 18:39:35 +01:00
Robert Pelnar 72c7810641 Lang - text "Resend" removed from dictionary 2018-11-22 18:38:20 +01:00
Robert Pelnar 7426efac9b Lang - text "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" removed from dictionary 2018-11-22 18:36:38 +01:00
Robert Pelnar 123bef636a Lang - text "Printer halted. kill() called!" removed from dictionary 2018-11-22 18:33:15 +01:00
Robert Pelnar 123725edd1 Lang - duplicate text "Some problem encountered, Z-levelling enforced ..." removed 2018-11-22 18:30:53 +01:00
Robert Pelnar 0fceade481 Lang - text "PowerUp" removed from dictionary 2018-11-22 18:24:21 +01:00
Robert Pelnar f0e3021d33 Lang - text "openRoot failed" removed from dictionary 2018-11-22 18:20:24 +01:00
Robert Pelnar 1cbb261707 Lang - text "open" removed from dictionary 2018-11-22 18:18:25 +01:00
Robert Pelnar f4bbce4142 Lang - text "open failed, File: " removed from dictionary 2018-11-22 18:15:22 +01:00
Robert Pelnar 72d47eaeba Lang - text "ok" removed from dictionary 2018-11-22 18:12:19 +01:00
Robert Pelnar 1568b94e87 Lang - text "No Checksum with line number, Last Line: " removed from dictionary 2018-11-22 18:09:07 +01:00
Robert Pelnar fd3cd9b551 Lang - texts "Mxxx Invalid extruder " removed from dictionary 2018-11-22 18:06:10 +01:00
Robert Pelnar fdf9734161 Lang - text "checksum mismatch, Last Line: " removed from dictionary 2018-11-22 17:59:43 +01:00
Robert Pelnar 9c964277ac Lang - text "error writing to file" removed from dictionary 2018-11-22 17:57:52 +01:00
Robert Pelnar 9f86a334c6 Lang - text "endstops hit: " removed from dictionary 2018-11-22 17:53:51 +01:00
Robert Pelnar 0baa6412fc Lang - text "Cannot enter subdir: " removed from dictionary 2018-11-22 17:49:28 +01:00
Robert Pelnar 60e567b660 Lang - text " Last Updated: " removed from dictionary 2018-11-22 17:48:12 +01:00
Robert Pelnar a1f03e9531 Lang - text " Free Memory: " removed from dictionary 2018-11-22 17:46:44 +01:00
Robert Pelnar 283e33dd69 Lang - text " cold extrusion prevented" removed from dictionary 2018-11-22 17:44:53 +01:00
Robert Pelnar 104353c0c5 Lang - text " PlannerBufferBytes: " removed from dictionary 2018-11-22 17:43:11 +01:00
Robert Pelnar 46fba48173 Lang - text "enqueing \"" removed from dictionary 2018-11-22 17:38:52 +01:00
Robert Pelnar 0ceeba38cb Lang - text "Copy selected language from XFLASH?" shorted to "Copy selected language?" 2018-11-22 17:32:53 +01:00
Robert Pelnar 099fe216b6 Lang - text "KILLED. " removed from dictionaries 2018-11-22 17:26:01 +01:00
Robert Pelnar 37273d9fca Lang - 'Auto Deplete' changed to 'SpoolJoin' 2018-11-22 17:19:38 +01:00
PavelSindler 49367c0b09
Merge pull request #1353 from XPila/V3_5
Lang - french translation
2018-11-22 17:18:42 +01:00
Robert Pelnar f0624a9e97 Lang - some not localized texts marked as localized, formating fixed 2018-11-22 14:37:29 +01:00
XPila 3d76081c79
Merge pull request #1351 from PavelSindler/MK3_for_merging
mmu: FINDA disabled by damaged/disconnected PAT9125 hotfix
2018-11-21 20:03:07 +01:00
PavelSindler 0e65790218 removed redundant code 2018-11-21 19:49:19 +01:00
PavelSindler 74a7341005 mmu: FINDA disabled by damaged/disconnected PAT9125 hotfix 2018-11-21 19:27:55 +01:00
PavelSindler 9fa587b206
Merge pull request #1350 from XPila/V3_5
V 3.5 - new translation
2018-11-21 15:23:41 +01:00
Robert Pelnar 2dc5439069 Lang - reserved space increased to 0x2f00 (12032 bytes) 2018-11-21 14:57:20 +01:00
Robert Pelnar 1bff138b50 Lang - sec.lang. reserved space increased to 0x2e00 (11776 bytes) 2018-11-21 14:52:14 +01:00
PavelSindler 18eb9ad69e
Merge pull request #1344 from PavelSindler/progress_bar_fix
progress bar fix
2018-11-20 14:50:04 +01:00
Marek Bel ab5b57df11 Style. 2018-11-19 20:41:14 +01:00
PavelSindler cb7c701791 whitespace 2018-11-19 20:09:03 +01:00
PavelSindler 7d538cde6c Retrieve settings (M501): initialize each item in feedrate and acceleration arrays separately 2018-11-19 20:05:58 +01:00
PavelSindler e5dd4d757a progress bar fix 2018-11-16 15:45:55 +01:00
MRprusa3d ffe906c733 MeshBed Levelling Fail V 2018-11-14 16:45:49 +01:00
PavelSindler 0398c3c26b
Merge pull request #1335 from PavelSindler/T_codes
version change
2018-11-13 17:49:26 +01:00
PavelSindler 51c80352e8 version change 2018-11-13 17:48:42 +01:00
PavelSindler 51b4858a87
Merge pull request #1334 from XPila/V3_5
PFW658 - disable extruder motor while changing filament with mmu2 (pr…
2018-11-13 16:10:24 +01:00
XPila c41b045ea7
Merge pull request #1333 from PavelSindler/T_codes
T-code fix
2018-11-13 16:09:52 +01:00
Robert Pelnar bfc343c7c5 PFW658 - disable extruder motor while changing filament with mmu2 (prevents extruder motor overheating) 2018-11-13 16:04:46 +01:00
PavelSindler 15d0b083ed whitespace 2018-11-13 15:58:21 +01:00
PavelSindler 17a1049f23 T-codes fix 2018-11-13 15:56:19 +01:00
PavelSindler f297e72864
Merge pull request #1332 from XPila/V3_5
Fix PFW657 - filament runout detection is not working after autoload …
2018-11-13 14:10:11 +01:00
Robert Pelnar d886ba1100 Fix PFW657 - filament runout detection is not working after autoload disabled from menu. 2018-11-13 14:05:15 +01:00
XPila 3d97d81734
Merge pull request #1329 from PavelSindler/M600_load_fil_message
M600 filament load progress bar changes
2018-11-12 20:52:06 +01:00
PavelSindler 27db32cbd0
Merge pull request #1331 from XPila/V3_5
M907 fix - value in mA (PFW655)
2018-11-12 20:49:09 +01:00
Robert Pelnar 41b885c537 M907 fix - value in mA (PFW) 2018-11-12 20:39:25 +01:00
MRprusa3d 5e8e96b5d7 MMU module adjustment
MMU module conditional compilation adjustment for MMU v1
2018-11-12 20:09:54 +01:00
PavelSindler 32da5bc039 progress bar time counted from feedrate and E - distance 2018-11-12 19:55:53 +01:00
PavelSindler f4c1e7924f M600: show progress bar during first filament load 2018-11-12 18:35:06 +01:00
PavelSindler 10a81ea768 version change 2018-11-09 19:16:53 +01:00
PavelSindler 5931d15566 whitespace 2018-11-09 18:31:28 +01:00
PavelSindler c991c8b314 resume print fix: wait for heater() never disable steppers 2018-11-09 18:29:35 +01:00
XPila 10b79e918b
Merge pull request #1321 from PavelSindler/M600_load_fix
M600 load messages synchronization fixed
2018-11-09 15:40:00 +01:00
PavelSindler 22cf2c6b6b M600 load messages synchronization fixed 2018-11-09 15:31:44 +01:00
PavelSindler 7022373885
Merge pull request #1320 from XPila/V3_5
localization - lang-export.sh + po files + tmc2130_print_currents fixed (M913)
2018-11-09 15:27:43 +01:00
Robert Pelnar 3afebcc9cc tmc2130_print_currents fixed (for obsolete M913) 2018-11-09 15:20:25 +01:00
PavelSindler 5f166374ab
Merge pull request #1319 from XPila/V3_5
Fix PFW651 - cannot upload MK3 languages with slic3r (firmware compil…
2018-11-09 13:10:51 +01:00
Robert Pelnar 6c13225f49 Fix PFW651 - cannot upload MK3 languages with slic3r (firmware compiled on linux arduino 1.8.5 + lto) 2018-11-09 10:45:16 +01:00
PavelSindler 0e7fb26dc5
Merge pull request #1316 from MRprusa3d/PFW-635
MeshBed Levelling Fail IV
2018-11-08 10:18:08 +01:00
PavelSindler 6d59f88a8e
Merge pull request #1315 from MRprusa3d/PFW-639
Bed PowerMonitor III
2018-11-08 10:08:31 +01:00
MRprusa3d ccb58ae7c9 Revert "MeshBed Levelling Fail IV"
This reverts commit bd554df02e.
2018-11-08 04:02:32 +01:00
MRprusa3d bd554df02e MeshBed Levelling Fail IV 2018-11-08 03:54:05 +01:00
MRprusa3d fd45dd64dc Bed PowerMonitor III 2018-11-08 03:32:00 +01:00
PavelSindler 3cccb125f7
Merge pull request #1313 from MRprusa3d/PFW-639
Bed PowerMonitor II
2018-11-07 13:50:50 +01:00
MRprusa3d 4ae857136d Bed PowerMonitor II 2018-11-07 13:38:39 +01:00
PavelSindler b80a0edac0
Merge pull request #1312 from mkbel/fix_long_press_modal
Fix long press modal
2018-11-07 10:28:24 +01:00
PavelSindler a5bbc75035
Merge pull request #1309 from mkbel/fix_1st_lay_cal
PFW-634 Move T<nr> code just before extrude code to properly load fil…
2018-11-07 10:28:13 +01:00
Marek Bel b4d4bfa667 Do not declare extern class in .cpp file, include appropriate header. 2018-11-06 20:54:53 +01:00
Marek Bel 95b0506284 Make lcd_long_press_active private. 2018-11-06 20:48:28 +01:00
Marek Bel 676434111e Disable long press handler in modal dialogs (LCD update disabled). 2018-11-06 20:43:19 +01:00
Marek Bel 02e31433f4 PFW-634 Move T<nr> code just before extrude code to properly load filament in first layer calibration with MMUv2. 2018-11-06 15:46:37 +01:00
Robert Pelnar 9a68501039 MK2 variants compilable 2018-11-06 14:17:43 +01:00
PavelSindler c3bdd21fa5
Merge pull request #1308 from MRprusa3d/PFW-635
MeshBed Leveling Fail II
2018-11-06 10:47:03 +01:00
MRprusa3d 46b2c93d60 MeshBed Leveling Fail III 2018-11-06 01:44:53 +01:00
MRprusa3d 9953518681 MeshBed Leveling Fail II 2018-11-06 01:28:47 +01:00
PavelSindler 908fffc19a
Merge pull request #1306 from PavelSindler/fsensor_q
filament quality measurements disabled
2018-11-05 19:14:34 +01:00
PavelSindler 0a6ca7ffd0
Merge pull request #1305 from XPila/V3_5
PFW643 - removed M910-M918, implemented M907
2018-11-05 19:14:19 +01:00
PavelSindler 89ad02ac8c filament quality measurements disabled 2018-11-05 18:37:36 +01:00
Marek Bel 50f9bf06be Save 74B of flash memory. 2018-11-05 18:02:46 +01:00
Marek Bel e95c2ad592 Display auto deplete as not available if filament sensor is disabled. 2018-11-05 17:43:07 +01:00
Robert Pelnar d6b5f5a1c7 PFW643 - removed M910-M918, implemented M907 2018-11-05 16:15:27 +01:00
Marek Bel ef5be690fb Add autodeplete setting into tune menu. 2018-11-05 13:54:22 +01:00
PavelSindler 7e43b15b54
Merge pull request #1303 from PavelSindler/m600_idler
M600: move extruder to the left to make space for idler opening
2018-11-05 10:38:51 +01:00
PavelSindler 78775e2f87
Merge pull request #1302 from PavelSindler/wizard_improvements
Wizard improvements
2018-11-05 10:38:41 +01:00
PavelSindler 688c10247e
Merge pull request #1291 from XPila/MK3-new_bs
lang update
2018-11-05 10:38:29 +01:00
PavelSindler 0a2ad97bc6
Merge pull request #1290 from PavelSindler/mmu_improvements
mmu improvements: load to nozzle, gcodes for single material mode, M600 fix
2018-11-05 10:38:05 +01:00
PavelSindler 2619c6f7a1
Merge pull request #1283 from PavelSindler/crashdet_cancel
canceling print after crash detection sets saved_priting flag to false
2018-11-05 10:37:51 +01:00
PavelSindler aeeb2af0a4 whitespace 2018-11-05 00:15:36 +01:00
PavelSindler b058ec7120 whitespace 2018-11-05 00:14:16 +01:00
PavelSindler 934b76ade3 wait message added 2018-11-05 00:12:46 +01:00
PavelSindler 3d24f5437c leave Z move menu (hotfix) 2018-11-04 23:44:29 +01:00
PavelSindler daef0eeb67
Merge pull request #1297 from MRprusa3d/PFW-635
MeshBed Leveling Fail
2018-11-04 23:33:29 +01:00
mkbel e177c2b669
Merge pull request #1295 from PavelSindler/feedrate_change
choosing filament from T? menu changes feedrate fixed
2018-11-04 23:13:03 +01:00
PavelSindler 515f2723d7
Merge pull request #1301 from XPila/V3_5
PFW644 + PFW638
2018-11-04 23:10:10 +01:00
PavelSindler 8afb83406e Wizard for assembled printers (contains more steps now) 2018-11-04 23:08:23 +01:00
Robert Pelnar 33a29cd416 Fix PFW638 - remaining/elapsed time >100h displayed in hours 2018-11-04 20:27:09 +01:00
PavelSindler e2d2fb58aa Z calibraion: always ask user to clean nozzle 2018-11-04 18:47:08 +01:00
XPila 35fae8be1c
Merge pull request #1294 from PavelSindler/manage_response_heating
mmu manage response: possibility to resume saved nozzle temperature
2018-11-04 18:31:47 +01:00
Robert Pelnar 1e05e1189d Fix PFW644 - MK25 reports stopped, arduino 1.8.5. 2018-11-03 22:44:42 +01:00
MRprusa3d 73794b56cf MeshBed Leveling Fail
Z-leveling after MeshBed leveling failing
2018-11-02 23:03:14 +01:00
PavelSindler e304319e15 choosing filament from T? menu changes feedrate fixed 2018-11-02 20:25:24 +01:00
PavelSindler d18013e5a2 manage response now contains showing nozzle temperature and possibility to resume saved nozzle temperature 2018-11-02 19:31:10 +01:00
MRprusa3d 18a8ae5b8f Bed PowerMonitor
bed power monitoring correction
2018-11-01 20:55:42 +01:00
PavelSindler aaf65051f9 M600: "is color clear?" menu synchronization 2018-11-01 18:28:52 +01:00
PavelSindler 1342c312a0 use feedrate 200mm/min for final feed (faster and better filament sensor function), show default welcome message when load is finished 2018-11-01 16:51:18 +01:00
PavelSindler 96ce324b7c load to nozzle improved, unified feedrate and E-distance for final feed used in load filament function, M600 etc. 2018-11-01 16:29:09 +01:00
Robert Pelnar a0e4acead3 lang - removed unused code and some service messages changed to "not translated" 2018-11-01 14:07:16 +01:00
PavelSindler e80af46503 load to nozzle and Tx and Tc codes: intial version 2018-10-31 21:48:05 +01:00
PavelSindler f445b6018e canceling print after crash detection sets saved_priting flag to false 2018-10-28 11:06:10 +01:00
PavelSindler 4ecc00e4e3 M600: move extruder 100mm to the left to make space for opening idler 2018-10-26 18:19:00 +02:00
PavelSindler 6a82af487e
Merge pull request #1278 from XPila/MK3-new_bs
New lang - fixed french langcode and comparsion in lang-clean script
2018-10-26 13:18:48 +02:00
mkbel 16c2f6fe8e
Merge pull request #1279 from PavelSindler/turn_on_FINDA
mmu2: filament senor (FINDA) menu fix
2018-10-25 21:53:11 +02:00
PavelSindler a9317b4d36 upstream/MK3 merge 2018-10-25 21:46:32 +02:00
mkbel cdb06c65f3
Merge pull request #1275 from PavelSindler/3_4_2_branch_merging
3_4_2 branch merging into MK3
2018-10-25 21:45:51 +02:00
PavelSindler 0e0dbad871 #ifdef __cplusplus added to allow including to .c file 2018-10-25 21:06:37 +02:00
PavelSindler 01529f18d2 upstream/MK3 merge 2018-10-25 20:57:27 +02:00
PavelSindler a6a81c6ea6 mmu2: filament senor (FINDA) can be switched ON/OFF from menu without dependency on pat9125 state 2018-10-25 18:26:26 +02:00
Robert Pelnar d301aa0e8c New lang - fixed french langcode and comparsion in lang-clean script 2018-10-25 18:16:36 +02:00
Robert Pelnar 7e9eaf0f4b New lang, arduino 1.8.5 - disable multilanguage support by default 2018-10-23 17:32:52 +02:00
PavelSindler bd8ca8d652 removed redefinition of functions in fsensor.cpp 2018-10-22 20:51:44 +02:00
PavelSindler d1de9fff60 mmu_loop: missing return added 2018-10-22 20:38:32 +02:00
PavelSindler d005005e22 Merge remote-tracking branch 'upstream/3_4_2' into 3_4_2_branch_merging 2018-10-22 20:33:38 +02:00
PavelSindler 940f436a5f merge MK3_dev into MK3 2018-10-22 20:25:29 +02:00
PavelSindler bc247ca02c MK2.5 sw reset at setup function 2018-10-19 17:54:48 +02:00
Robert Pelnar ac18eb67c0 New lang, arduino 1.8.5 - boot_app debug output
+ variable _uartout linkage fix
+ DEBUG_DCODE5
2018-10-18 16:20:14 +02:00
Robert Pelnar 563052d015 New lang, arduino 1.8.5 - language.c - DEBUG_SEC_LANG fix 2018-10-18 15:39:08 +02:00
Robert Pelnar 868c79e835 New lang, arduino 1.8.5 - language.h - section names, messages.h - extern "C" added 2018-10-18 14:41:32 +02:00
PavelSindler b8f92fdfa9 MK2.5 printers set mmu to stealth mode (using Mx code), required mmu2 buildnr can be different for MK2.5 and MK3 printers 2018-10-18 02:44:16 +02:00
metacollin 5cac3c9254 Make NEW_XYZCAL respect INVERT_*_DIR #defines. 2018-10-17 06:00:23 -06:00
mkbel 0d9b502937
Merge pull request #1246 from PavelSindler/variants_max
MK3: default max feedrate for x and y changed to 100mm/s
2018-10-10 16:46:34 +02:00
PavelSindler bbd4f70f41
Merge pull request #1221 from XPila/MK3
Update fsensor in Manage_inactivity instead of main loop.
2018-10-10 13:12:12 +02:00
PavelSindler 866d6758c3
Merge pull request #1243 from mkbel/simplify_EEPROM_M500
Simplify eeprom m500
2018-10-10 13:11:17 +02:00
Marek Bel 9dff6431e6 Format fsensor documentation. 2018-10-09 22:33:54 +02:00
PavelSindler 809ae5a5f0 default max feedrate for x and y changed to 100mm/s 2018-10-09 20:03:28 +02:00
Marek Bel 9cae0c378a Rename _EEPROM_writeData to EEPROM_writeData. Rename _EEPROM_readData to EEPROM_readData. Add return value to EEPROM_writeData to detect failure to write. Do not mark data as valid, if write has failed. Remove EEPROM_WRITE_VAR and EEPROM_READ_VAR macros. Make pos input only parameter. Convert EEPROM_OFFSET macro to typed constatant EEPROM_M500_base, it was defined in two places, leave it in one place. Use Config_StoreSettings() instead of erase_eeprom_section(). Compare float with 0xff byte by byte to avoid compiler warning "Dereferencing type punned pointer will break strict aliasing rules." 2018-10-08 20:24:56 +02:00
PavelSindler c91c878408
Merge pull request #1202 from MRprusa3d/PFW-573
preHeatError
2018-10-08 16:12:33 +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
Marek Bel c77672bf0f PFW-608 Decrease wear of mass erase EEPROM and do it faster. 2018-10-05 18:11:26 +02:00
PavelSindler 436f5b5728 changed version 2018-10-04 17:40:38 +02:00
PavelSindler d2aa13d333
Merge pull request #1199 from mkbel/document_gcodes1
Documentation: Put scattered and unscattered Gcode documentation toge…
2018-10-04 16:29:39 +02:00
Robert Pelnar 9960c80bf7 Additional check always with enabled oq_meassure
+ variant files
2018-10-04 16:12:41 +02:00
Robert Pelnar f9d8c46802 Enable/disable optical quality meassurement in settings menu 2018-10-04 15:48:28 +02:00
Robert Pelnar ced74b7ec2 Merge remote-tracking branch 'upstream/MK3' into MK3 2018-10-04 13:53:00 +02:00
Robert Pelnar 7882b3c975 Update fsensor in Manage_inactivity instead of main loop. 2018-10-03 17:29:24 +02:00
PavelSindler 3a58489c6a
Merge pull request #1169 from mkbel/remove_duplicate_debouncing_4
Remove duplicate debouncing 4
2018-10-02 11:21:17 +02:00
PavelSindler bba1ffdb65 version change 2018-09-27 21:13:06 +02:00
PavelSindler aefb4e5c09
Merge pull request #1200 from XPila/MK3
Filament sensor - fix invalid calculation of fsensor_counter in LA st…
2018-09-27 21:05:33 +02:00
Robert Pelnar e50025cc7d static_assert - portable solution compatible with C++98 2018-09-27 19:59:29 +02:00
PavelSindler 7e9220ada2
Merge pull request #1198 from PavelSindler/communication_timeouts
communication timeouts fix
2018-09-27 11:23:58 +02:00
MRprusa3d 0184f06dcf preHeatError
correction of preHeatError detection
2018-09-27 04:23:00 +02:00
Robert Pelnar c2f535b619 Filament sensor - fix invalid calculation of fsensor_counter in LA stepper.
+decreased additional check sensitivity/sctrictness
2018-09-26 18:59:07 +02:00
Marek Bel 0e33db0064 Documentation: Put scattered and unscattered Gcode documentation together in process_commands documentation. Mention at least existence of all implemented commands. Document T<n> and T? commands. 2018-09-26 18:55:31 +02:00
PavelSindler e6a00b8f53 send busy messages when checking for filament presence 2018-09-25 19:14:57 +02:00
Marek Bel 4151e19781 Remove attribute packed. It is not needed on 8-bit platform. Change of platform would be detected by static_assert (sizeof(M500_conf) == 188). 2018-09-25 16:27:20 +02:00
Marek Bel d80fcab66c Disable filament sensor response quality check. 2018-09-25 15:50:50 +02:00
Marek Bel 19c1ba6274 Remove duplicate condition. This condition was already in if(mmu_enabled) {} else branch. 2018-09-25 14:25:03 +02:00
Marek Bel ccfcc6f989 Document. 2018-09-24 18:32:01 +02:00
Marek Bel 3662f60f8f if max_feedrate_silent and max_acceleration_units_per_sq_second_silent were never stored to eeprom, use default values; 2018-09-24 18:13:20 +02:00
Marek Bel c38fef281d Use cs.max_feedrate_silent, cs.max_acceleration_units_per_sq_second_silent from ConfigurationStore. 2018-09-24 17:33:58 +02:00
Marek Bel ca179a2d18 Use cs.filament_size from ConfigurationStore. 2018-09-24 17:29:02 +02:00
Marek Bel e225e9cab0 Use cs.volumetric_enabled from ConfigurationStore. 2018-09-24 17:12:16 +02:00
Marek Bel a201128b20 Use cs.retract_length, cs.retract_feedrate, cs.retract_zlift, cs.retract_recover_length and cs.retract_recover_feedrate from ConfigurationStore. 2018-09-24 17:10:25 +02:00
Marek Bel 7e593e6922 Use cs.autoretract_enabled from ConfigurationStore. 2018-09-24 17:03:10 +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 f2ae3fb1f7 Use cs.zprobe_zoffset from ConfigurationStore. 2018-09-24 16:47:57 +02:00
Marek Bel 959d0069fa Use cs.add_homing from ConfigurationStore. 2018-09-24 16:42:28 +02:00
Marek Bel ac7c062161 Use cs.max_jerk from ConfigurationStore. 2018-09-24 16:35:33 +02:00
Marek Bel bb66bfe6a7 Use cs.minsegmenttime from ConfigurationStore. 2018-09-24 16:22:50 +02:00
mkbel 0e7afc67ca
Merge pull request #1175 from PavelSindler/eeprom_version
M500 EEPROM version update and M500 EEPROM block size check
2018-09-24 16:19:55 +02:00
Marek Bel 10428b30d9 Use cs.mintravelfeedrate from ConfigurationStore. 2018-09-24 16:01:58 +02:00
PavelSindler cd438c5c00 whitespace 2018-09-24 16:01:31 +02:00
PavelSindler 740e922b87 EEPROM M500 block size check for reading stored data added 2018-09-24 16:00:23 +02:00
Marek Bel 26e2fd1c76 Use cs.minimumfeedrate from ConfigurationStore. 2018-09-24 15:57:24 +02:00
Marek Bel b8fefceb4d Use cs.retract_acceleration from ConfigurationStore. 2018-09-24 15:53:35 +02:00
Marek Bel 7dbe0afdc4 Use cs.acceleration from ConfigurationStore. 2018-09-24 15:47:36 +02:00
Marek Bel cee51cf9c3 Use cs.max_acceleration_units_per_sq_second_normal from ConfigurationStore. 2018-09-24 15:40:35 +02:00
Marek Bel 02becb5e6a Use cs.max_feedrate_normal from ConfigurationStore. 2018-09-24 15:09:19 +02:00
PavelSindler 053b94b711 remove "start" duplicity in setup 2018-09-24 14:57:46 +02:00
Marek Bel 3f28632443 Use cs.axis_steps_per_unit from ConfigurationStore. 2018-09-24 14:54:41 +02:00
Marek Bel d611cad087 Temporary hide M500_conf cs to allow automated renaming. 2018-09-24 14:42:01 +02:00
Marek Bel e94dc1341a Use M500_conf cs in Config_ StoreSettings, RetrieveSettings and ResetDefault. 2018-09-24 14:34:43 +02:00
Marek Bel 991db0e71d Finish default_conf. 2018-09-23 23:36:01 +02:00
Marek Bel d9e2dcc736 Incomplete. 2018-09-23 22:21:28 +02:00
Marek Bel 58af1ae4c4 Add configuration store struct. 2018-09-21 20:52:44 +02:00
PavelSindler d8dc2eef7a if max_feedrate_silent and max_acceleration_units_per_sq_second_silent were never stored to eeprom, use default values; eeprom_version changed back to V2 2018-09-21 15:42:28 +02:00
PavelSindler 1c33b673c0 comment update 2018-09-19 18:43:27 +02:00
PavelSindler 3d57d504ba
Merge pull request #1174 from mkbel/fix_runout_resume
Fix runout resume
2018-09-19 18:29:32 +02:00
Marek Bel 2607a0c4ed Update documentation. 2018-09-19 17:22:06 +02:00
Marek Bel b92b307ee8 Make variables constant. 2018-09-19 17:21:45 +02:00
Marek Bel cce8131070 Add missing s for seconds of print time. 2018-09-19 17:20:41 +02:00
Marek Bel b5bb40474d Fix print time overflow. 2018-09-19 17:17:32 +02:00
PavelSindler 0a5394a20e defines moved to eeprom.h 2018-09-19 15:10:10 +02:00
PavelSindler 752aec37fb M500 EEPROM version changed; if EEPROM_M500_SIZE is not updated, data are not stored 2018-09-19 14:36:26 +02:00
Marek Bel 9868dd766e Fix print not recovered when filament sensor is disabled during filament change initiated by filament run out. 2018-09-19 14:22:08 +02:00
Marek Bel a5a7b1f1d6 Move functions definitions behind variable definitions. (No change in functionality.) 2018-09-19 14:08:31 +02:00
Marek Bel 05d3b7032d Update documentation. 2018-09-18 17:48:11 +02:00
Marek Bel a7fdfdd258 Put repetitive code into separate function. No change in functionality. 2018-09-18 17:15:13 +02:00
Marek Bel 6ee97468ee Remove lcd_buttons_update() call from all other places than interrupt. There is no known reason, why lcd_buttons_update() should be called from multiple places and multiple contexts. Remove mutex, which is not needed anymore, and wasn't implemented properly anyway (Operation was not atomic.). 2018-09-18 16:05:49 +02:00
Marek Bel f532da4b17 Remove duplicate button debouncing code. Save 254B flash. 2018-09-18 14:39:01 +02:00
Marek Bel 90a10a692a Enable button debouncing also in modal mode (!lcd_update_enabled). In lcd_clicked() consume click event immediately. 2018-09-18 14:38:50 +02:00
Marek Bel ab2d350ed1 Don't enable lcd update in lcd_show_fullscreen_message_and_wait_P(). Don't show menu in wizard when ejecting filament. 2018-09-17 21:23:13 +02:00
Marek Bel a687b8e64a Don't enable lcd update inside mmu_eject_filament(). 2018-09-17 17:12:36 +02:00
Marek Bel f496076508 Remove redundant code. No change in functionality. 2018-09-14 18:33:03 +02:00
Marek Bel 635a1b4cd8 Add possibility to to select preheat temperature when unloading filament in first layer calibration wizard.
Known limitations:
During filament eject, menu is shown for some moment.
2018-09-14 18:29:14 +02:00
Marek Bel fe30e58fb5 Add possibility to unload filament from wizard before first layer calibration, if it is not PLA.
Known limitations:
Preheat temperature other than PLA can not be selected.
During filament eject, menu is shown for some moment.
2018-09-14 16:06:25 +02:00
Marek Bel d14822b22f Give wizard states human readable names. Use uint8_t as underlying type - saves 20B of FLASH memory. 2018-09-13 16:37:41 +02:00
Marek Bel 8235f0f869 Merge branch 'MK3_dev' into add_cancel 2018-09-12 19:38:26 +02:00
Marek Bel 7bc46323e2 Update pause print documentation. 2018-09-12 18:35:26 +02:00
Marek Bel de2100ac7b Merge branch 'MK3' into MK3_dev 2018-09-12 15:22:12 +02:00
PavelSindler 0d4f4fe933
Merge pull request #1143 from PavelSindler/lang2
lang fix
2018-09-12 09:38:18 +02:00
PavelSindler 45066ebddc lang fix 2018-09-12 09:37:16 +02:00
PavelSindler 30d54be9de
Merge pull request #1142 from PavelSindler/lang2
changed version
2018-09-12 09:20:32 +02:00
PavelSindler 298950e601 changed version 2018-09-12 09:19:23 +02:00
Robert Pelnar 3e84bf6341 Lang update (translation + increased reserved space) 2018-09-12 02:45:13 +02:00
Marek Bel 13b67f0e0a Add Cancel item into PLA filament selection menu initiated by first layer calibration with MMU. 2018-09-11 22:33:13 +02:00
Marek Bel ada7cffd32 Open menu to select filament before first layer calibration if MMU unit is present. 2018-09-11 19:53:29 +02:00
PavelSindler 96aada9061 load filament messages, czech language missing translation readded 2018-09-11 18:25:38 +02:00
Marek Bel 5649d6c3c0 Precede active filament on status screen with letter F. 2018-09-11 17:27:10 +02:00
Marek Bel 98264808dc Change gcode "T?" question from "Choose extruder:" to "Choose filament" and answers from "Extruder 1" .. "Extruder 5" to "Filament 1" .. "Filament 5". 2018-09-11 17:16:13 +02:00
Marek Bel 46df46f482 Add possibility to use other filaments in LCD_COMMAND_V2_CAL. 2018-09-11 17:03:20 +02:00
Marek Bel 19a1ccdc76 Rename choose_extruder_menu() to choose_menu_P(), add parameters to make it reusable. 2018-09-11 16:51:00 +02:00
Marek Bel 6c6354b2cb Do not preheat nozzle before loading filament to MMU in first layer calibration wizard.
Show insert PLA filament to the first tube of MMU instead of "to the extruder".

First layer calibration wizard with MMU is now functional. But there is no option to unload filament from wizard.
2018-09-11 16:03:46 +02:00
Marek Bel 0fcd2cf2a1 Merge branch 'MK3_dev' into fix_mmu_1st_lay_cal 2018-09-11 15:26:35 +02:00
PavelSindler d9a2fe70ec missing declaration fix 2018-09-11 11:06:37 +02:00
PavelSindler c023fb12d5 add choose filament messages 2018-09-11 09:50:50 +02:00
PavelSindler 90e3ae5464
Merge pull request #1127 from XPila/MK3
Lang update, french translation
2018-09-11 09:44:02 +02:00
Robert Pelnar 4ca300bc39 Lang update, french translation
+resized reserved space
2018-09-11 03:43:05 +02:00
Marek Bel b3bc71b45b Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev 2018-09-10 23:52:51 +02:00
PavelSindler 25a46557d1 merge with upstream 2018-09-10 22:11:32 +02:00
PavelSindler 8a9f066c1b choose_extruder_menu: extruder -> filament 2018-09-10 22:09:37 +02:00
Marek Bel cc08d660f7 Always use filament 1 for first layer calibration when MMU is present.
Lift Z when moving from intro line to meander.
For MMU, print longer intro line to allow load to nozzle.
2018-09-10 20:55:50 +02:00
PavelSindler 1bb9e9ed92 MMU_DEBUG 2018-09-10 20:39:28 +02:00
PavelSindler 6fa798aa83 init 2018-09-10 20:08:13 +02:00
PavelSindler 1253fb338a wizard hotfix 2018-09-10 18:02:54 +02:00
Marek Bel 764e5c9769 Merge branch 'MK3' into MK3_dev 2018-09-09 22:52:01 +02:00
Marek Bel 5a6ef00cfc Do not unload filament from nozzle when touching bed in the end of first layer calibration. Unload it after reaching home position. 2018-09-07 10:50:23 +02:00
Marek Bel ebfbf4ac3f Merge branch 'MK3' into MK3_dev 2018-09-07 09:24:45 +02:00
mkbel cbc506c379
Merge pull request #1110 from PavelSindler/lcd_clicked_error_fix
lcd_clicked() fix (PFW-534 and PFW-546)
2018-09-07 09:07:03 +02:00
Marek Bel 001680bbdc Merge branch 'MK3' into time_remaining_fix
# Conflicts:
#	Firmware/Marlin_main.cpp
2018-09-07 08:21:36 +02:00
mkbel 801f8e93e8
Merge pull request #1112 from PavelSindler/MK25_time_remaining
MK25: always show "normal mode" remaining time (PFW-553)
2018-09-07 08:05:16 +02:00
PavelSindler 2f02828273 time remaining fix 2018-09-07 02:02:35 +02:00
PavelSindler 66305b3e04 MK25: always show "normal mode" remaining time 2018-09-06 23:05:36 +02:00
PavelSindler 48bf5d3a75
Merge pull request #1104 from mkbel/MK3_dev
Merge MK3 into Mk3_dev
2018-09-06 21:01:29 +02:00
PavelSindler dbc0654b1c
Merge pull request #1108 from mkbel/pause_print
Pause print
2018-09-06 21:01:16 +02:00
PavelSindler 48f5da9cb8 lcd_clicked fix 2018-09-06 20:54:51 +02:00
Marek Bel 0e50c388af Save 1K flash memory. 2018-09-06 15:06:46 +02:00
Marek Bel 0d99dc0a3f PFW-543 Add filament ramming when unloading filament with MMU. 2018-09-06 15:06:33 +02:00
Marek Bel 5d1e59cec3 Fix problem that nozzle temperature stays 0 if resume print is invoked from menu earlier than pause movements are finished. 2018-09-06 13:20:24 +02:00
Marek Bel 0fe48de4af Remove feedmultiplyBckp global variable. Remove redundant isPrintPaused = true assignment, as it is already done in lcd_pause_print(). Remove unused saved_feedmultiply and fanSpeedBckp prototypes. Move isPrintPaused = true assignment to safer location, as LCD_COMMAND_LONG_PAUSE is not reached if lcd_commands_type is not LCD_COMMAND_IDLE. 2018-09-06 12:23:21 +02:00
Marek Bel 05a0b9c939 Remove fanSpeedBckp global variable. 2018-09-06 11:41:44 +02:00
Marek Bel 40990c4deb Remove saved_feedmultiply global variable. 2018-09-06 11:30:06 +02:00
Marek Bel b43c8dad74 Remove HotendTempBckp global variable. 2018-09-06 10:05:59 +02:00
Marek Bel d71311f13f Remove redundant HotendTempBckp from crash detection recover. 2018-09-06 09:41:37 +02:00
Marek Bel 920d828833 Rename lcd_sdcard_pause() to lcd_pause_print() to reflect, that also USB printing could be possible to pause. Unite it with pause_print() and use new (immediate) pause mechanism in all places where old mechanism was used. Rename resume_print() to lcd_resume_print() and make it global, unite it with lcd_sdcard_resume() and use it also in place, where lcd_commands_type = LCD_COMMAND_LONG_PAUSE_RESUME was used. Remove LCD_COMMAND_LONG_PAUSE_RESUME lcd_command_type. Remove unused pause_lastpos[]. 2018-09-06 08:43:54 +02:00
Marek Bel 67b2456ad9 Merge branch 'MK3' into MK3_dev 2018-09-05 21:48:29 +02:00
Marek Bel 74be7677cf Fix problem, that current_position is rewritten after long_pause() call. 2018-09-05 21:10:05 +02:00
Marek Bel 4b47a74d1d Remove unused declarations from tmc2130.cpp. Move used declaration to Marlin.h. 2018-09-05 18:14:32 +02:00
PavelSindler ed43913c5c
Merge pull request #1099 from mkbel/fix_compiler_warnings
Fix compiler warnings
2018-09-05 16:53:51 +02:00
PavelSindler 40679dcb3a
Merge branch 'MK3' into MK3 2018-09-05 00:06:48 +02:00
Marek Bel a5db084b70 Move resuming nozzle temperature to restore_print_from_ram_and_continue().
Known limitations: Unused code not removed. Unload filament moves extruder to print position.
2018-09-04 14:56:20 +02:00
MRprusa3d 35cf3f3a61 Time info
suffix for doubt time estimation (i.e. if feed rate changed)
2018-09-04 14:39:46 +02:00
Marek Bel 2abd2a6cab Resume print fan.
Known limitations: Unused code not removed. Unload filament moves extruder to print position.
2018-09-04 11:13:51 +02:00
Marek Bel acef0578a5 Don't move before reaching nozzle temperature when resuming the print.
Known limitations: Doesn't resume print fan. Unused code not removed. Unload filament moves extruder to print position.
2018-09-04 10:07:52 +02:00
Marek Bel d54e629950 Retract, lift Z, move away in XY, disable fan and nozzle heating. Resume nozzle heating.
Known limitations: Doesn't wait for nozzle temperature reaching set temperature before moving to print area. Doesn't resume print fan. Unused code not removed.
2018-09-04 08:53:27 +02:00
Marek Bel af08e16426 Use stop_and_save_print_to_ram() and restore_print_from_ram_and_continue() pair to pause print from menu. Move declaration of those functions to marlin.h. Move declaration of FSensorStateMenu to ultralcd.h.
Known limitations: Filament is not retracted, extruder is not lifted in Z and moved to rear left corner in XY. Nozzle heating is not turned off nor restored. Unused code is not removed.
2018-09-04 08:13:56 +02:00
Marek Bel 63a215b0c3 Remove unused variable chars. 2018-09-03 20:48:03 +02:00
Marek Bel cbf633cfd4 Remove unused variable chars. 2018-09-03 20:47:12 +02:00
Marek Bel c95b463e0b Remove unused variable yes. Remove redundant tmp_extruder assignment. 2018-09-03 20:44:40 +02:00
Marek Bel 517fbb66bf Save 1K flash memory. 2018-09-03 20:00:46 +02:00
Marek Bel d796df3f14 PFW-543 Add filament ramming when unloading filament with MMU. 2018-09-03 17:32:42 +02:00
Marek Bel e5c0e26601 Merge branch 'MK3' into MK3_dev 2018-08-30 19:05:24 +02:00
Marek Bel 12b1769531 Fix printer reset when changing filament during print over USB. 2018-08-30 16:02:13 +02:00
PavelSindler ed49e5187b version changed 2018-08-30 11:35:06 +02:00
PavelSindler d96b0d5f32 linearity correction define added (menu readded) 2018-08-30 11:28:12 +02:00
MRprusa3d 25a22120fb 1-st Layer Calibration correction
filament loading improvement
2018-08-30 03:32:33 +02:00
PavelSindler b2c94f36cc removed unused "out of range" function 2018-08-29 14:41:39 +02:00
PavelSindler 8a453e65f8 eject filament allowed only when nozzle is hot (there can be filament loaded in printer nozzle) 2018-08-29 13:16:17 +02:00
PavelSindler b284c70d9b auto deplete: dont eject filament 2018-08-29 13:08:09 +02:00
PavelSindler 515e78cfd1 Eject filament feature in menu, M600: if it was envoked by FINDA, eject filament 2018-08-29 01:58:28 +02:00
PavelSindler b9808354c4 Merge remote-tracking branch 'upstream/MK3' into M600_change_extruder 2018-08-28 23:53:35 +02:00
PavelSindler d290543d7d
Merge pull request #1085 from mkbel/fix_active_filament
Fix active filament PFW-528
2018-08-28 23:50:57 +02:00
PavelSindler 705f098b1c eject filament: initial version 2018-08-28 23:50:31 +02:00
Marek Bel 2cd8691376 Do not use global variable tmp_extruder when setting temperature. 2018-08-28 20:26:33 +02:00
MRprusa3d 0695f3f345 Z-move correction
Z-move inhibition after FactoryReset
2018-08-28 19:58:03 +02:00
Marek Bel 8aeb7e04f1 Fix bound check for T0 .. T4 command. Document mmu_load_to_nozzle(). 2018-08-28 18:52:16 +02:00
Marek Bel 55eaa1de83 Fix code indentation. 2018-08-28 18:26:10 +02:00
Marek Bel 9fb68fb724 Remove usage of global variable tmp_extruder in M200. 2018-08-28 18:08:21 +02:00
mkbel 5ad2fdaaaa
Merge pull request #1080 from PavelSindler/M600_change_extruder
removed redundant code
2018-08-28 17:36:50 +02:00
Marek Bel adde0d3944 Merge branch 'prusa3d_MK3' into MK3_dev 2018-08-28 17:31:12 +02:00
MRprusa3d d3869bd857 Z-endstop @ MK3
add show P.I.N.D.A. state menu item @ CalibrationMenu
2018-08-28 16:12:59 +02:00
Marek Bel 9a14daab06 Revert "Split settings menu into separate functions."
Original commit wont work, as intended as MENU_ITEM_* macros contain return statement.
2018-08-28 16:03:07 +02:00
PavelSindler 27bd31e255 removed redundant code 2018-08-28 11:26:35 +02:00
PavelSindler 3e2cb72695
Merge branch 'MK3' into auto_deplete_2 2018-08-28 11:01:30 +02:00
PavelSindler 755baddb54
Merge branch 'MK3' into fix_unable_to_compile 2018-08-28 10:57:19 +02:00
Marek Bel 72cd0d26f9 Increase scope of code disabled by macro TMC2130 to whole lcd_settings_linearity_correction_menu. 2018-08-27 21:08:40 +02:00
Marek Bel dd39976176 Merge remote-tracking branch 'pavel/fix_unable_to_compile' into fix_unable_to_compile 2018-08-27 21:06:35 +02:00
Marek Bel 7aadb2f660 Fix compile time error: default argument given for parameter 2 of int8_t lcd_show_fullscreen_message_yes_no_and_wait_P 2018-08-27 20:57:57 +02:00
Marek Bel 9611401b69 Fix mmu_M600_load_filament increments tmp_extruder, which is not set in case of automatic == true. 2018-08-27 20:23:43 +02:00
Marek Bel 2a00e5d348 Fix loading filament screen hangs if changed automatically. 2018-08-27 20:09:22 +02:00
Marek Bel b08ae95568 Rename autoDeplete to lcd_autoDeplete and make it global. When filament runs out, call M600 AUTO if lcd_autoDeplete is enabled. Shorten finda polling period to 300 ms. 2018-08-27 19:36:54 +02:00
Marek Bel 1cdb7a48cb Show auto deplete only when mmu unit present. 2018-08-27 16:24:21 +02:00
Marek Bel 8279aba4d7 Add auto deplete setting. 2018-08-27 16:15:46 +02:00
PavelSindler 191e5dfddd mmu M600: dont use change extruder posibility; unload starts always imidiately 2018-08-27 16:12:10 +02:00
Marek Bel f02b0d80e3 Split settings menu into separate macros. 2018-08-27 15:48:09 +02:00
PavelSindler 2b32b41969 MK2.5 build error hotfix 2018-08-27 05:53:39 +02:00
PavelSindler 168bc74102
Merge pull request #1075 from PavelSindler/mmu_filament_sensor
Mmu filament sensor
2018-08-27 05:26:12 +02:00
PavelSindler b01e2a1a22
Merge pull request #1073 from PavelSindler/M600_mmu_fix
M600 mmu fix
2018-08-27 05:26:00 +02:00
PavelSindler 5d3eff6aea
Merge pull request #1072 from PavelSindler/manage_response
mmu timeout update: no need to press knob on printer
2018-08-27 05:25:50 +02:00
PavelSindler c1ce07c463
Merge pull request #1071 from PavelSindler/feedrate_limit
max feedrate for stealth mode reduced to 100mm/s (because of loudness)
2018-08-27 05:25:41 +02:00
PavelSindler 03fffae4c3 finda runout sensor can be turned on/off from menu 2018-08-27 05:20:42 +02:00
PavelSindler ceb49d1262 finda filament runout: initial version 2018-08-27 04:21:43 +02:00
PavelSindler ac3b92bade commentary fix 2018-08-26 23:55:29 +02:00
PavelSindler d3ed270a5a single material printer (no mmu unit) M600 hotfix: M600_check_state loop working 2018-08-26 23:52:45 +02:00
PavelSindler b13ff8e424 Wait for ok after U0 (unload current filament) command. 2018-08-26 22:08:52 +02:00
PavelSindler 4b1f1bc6a6 mmu timeout update: no need to press knob on printer to recover paused print 2018-08-26 21:39:37 +02:00
PavelSindler 5769b758ee max feedrate for stealth mode reduced to 100mm/s (because of loudness) 2018-08-26 16:50:28 +02:00
PavelSindler 2610547a48 Fixed displayed filament after load 2018-08-26 16:39:21 +02:00
PavelSindler c57fdb11b7 show active extruder: numbers corrected 2018-08-26 14:22:52 +02:00
PavelSindler 85358342bc
Merge pull request #1065 from PavelSindler/mmu_v2_continue_loading
Mmu v2: continue loading command
2018-08-25 20:03:12 +02:00
PavelSindler cf83852d22
Merge pull request #1068 from PavelSindler/M600_fix
M600 fix: remove unretract
2018-08-25 20:02:30 +02:00
PavelSindler ddcdfce356
Merge pull request #1069 from PavelSindler/mmu_timeout
5 minutes mmu timeout
2018-08-25 20:02:12 +02:00
PavelSindler 0929a35a4f 5 minutes mmu timeout 2018-08-25 17:21:17 +02:00
PavelSindler 815167c4b6
Merge pull request #1066 from mkbel/fix_linearity_correction_2
Fix linearity correction 2
2018-08-25 16:56:40 +02:00
PavelSindler 255cd2f34e
Merge pull request #1056 from mkbel/prdel
Reserve space for MENU_ITEM_EDIT_int3_P in shared memory
2018-08-25 16:55:56 +02:00
PavelSindler f3edd37d11 removing unretract 2018-08-25 16:52:19 +02:00
PavelSindler 1f5bece0db check for required mmu2 firmware buildnr 2018-08-25 16:15:35 +02:00
Marek Bel 6b7e47d730 Merge branch 'MK3' into MK3_dev 2018-08-24 22:21:08 +02:00
Marek Bel 5fe6a3ed1c Place similar functions together. 2018-08-24 22:04:48 +02:00
Marek Bel ea88dea432 Fix memory overwrite. 2018-08-24 21:24:14 +02:00
Marek Bel 085c77effb Fix when value edited, other values appeard as +1.000 instead of [off]. 2018-08-24 20:38:07 +02:00
Marek Bel df61172984 Fix linearity correction not saved and applied when menu was left by timeout. 2018-08-24 20:31:49 +02:00
PavelSindler 32723d8d6f whitespace 2018-08-24 20:30:44 +02:00
Marek Bel 46a3baac57 Add menu_item_edit_P<uint8_t*> specialization to be used for linearity correction. Works well, but costs about 600..700B of FLASH, needs to be optimized. 2018-08-24 20:06:09 +02:00
PavelSindler 0c80eca648 merge with upstream 2018-08-24 18:30:03 +02:00
PavelSindler 68f2e22dad continue loading command 2018-08-24 18:28:05 +02:00
Marek Bel 5a7c9e3ffd Make local functions static. Saves 30B of flash with Arduino 1.6.9. No difference with Arduino 1.8.5. 2018-08-24 18:00:05 +02:00
Marek Bel 5daae818e1 Convert menu_item_edit to template function. 2018-08-24 17:40:40 +02:00
PavelSindler e6ac75f6a1
Merge pull request #1061 from mkbel/MK3_dev
Merge branch 'MK3' into MK3_dev
2018-08-24 16:27:07 +02:00
Marek Bel ac5cb0989e Uncomment linearity correction menu. Fix return from linearity correction menu. 2018-08-24 16:00:51 +02:00
Marek Bel 050a7c41d0 Fix "Check MMU. Fix the issue and then press button on MMU unit." shown instead of "Loading filament 1". 2018-08-24 03:49:51 +02:00
Marek Bel 0de7668bac Remove usage of global variable tmp_extruder in M200. 2018-08-23 23:34:50 +02:00
Marek Bel 3c9047c9cd Remove usage of global variable tmp_extruder in mmu_M600_load_filament. For automatic load filament, use mmu_extruder value as filament previously selected. 2018-08-23 23:34:45 +02:00
Marek Bel 54138407dd Encapsulate MMU internal state. 2018-08-23 23:34:38 +02:00
Marek Bel f1c51502fd Merge branch 'MK3' into MK3_dev 2018-08-23 23:28:20 +02:00
Marek Bel 142bf28dc2 Clear communication buffer when sending load filament command to MMU.
This fixes PFW-517 in the moment, when the problem with not displaying "Loading filament 1" to "Loading filament 5" has appeared for the first time.
2018-08-23 22:05:56 +02:00
MRprusa3d 5dc2af961b ShippingPrepare & M600
message after ShippingPrepare
M600 :: better filament (un)retraction
2018-08-23 00:08:14 +02:00
Marek Bel 3780516f74 PFW-512 Reserve space for MENU_ITEM_EDIT_int3_P in shared memory in lcd_tune_menu(). 2018-08-22 19:47:29 +02:00
Marek Bel 07d07831f1 Add portability note. 2018-08-22 19:40:12 +02:00
Marek Bel bb5ac93921 Add missing compile time check for ShortTimer fitting into menu_data. Convert preprocessor checks to shorter and more accurate static_assert. Remove redundant macro MENU_DATA_EDIT_SIZE. Decrease scope of menu_stack and asociated macro. No functional change. 2018-08-22 18:55:42 +02:00
PavelSindler 3477f84143
Merge pull request #1055 from XPila/MK3
MMU - communication fix + active extruder status
2018-08-22 16:48:09 +02:00
Robert Pelnar dfb4bfac5b MMU - display status while switching active extruder [PFW-465] 2018-08-22 16:38:34 +02:00
MRprusa3d a1190e9a22
Merge pull request #1052 from PavelSindler/mmu_v2
fixes and improvements for multimaterial
2018-08-22 14:28:33 +00:00
Robert Pelnar 7836742621 MMU communication fix - WD reset inside manage_response 2018-08-22 16:19:57 +02:00
PavelSindler 9210ab12a9
Merge pull request #1053 from mkbel/MK3
Hot fix PFW-505 Speed change after tuning (on USB).
2018-08-22 16:19:08 +02:00
Marek Bel fe43791673 Merge branch 'MK3' into MK3_dev 2018-08-22 16:17:10 +02:00
PavelSindler a81b8dbd61 remove manage_heater 2018-08-22 16:09:38 +02:00
Marek Bel ef6188cd59 Hot fix PFW-505 Speed change after tuning (on USB).
When encoder is rotated left and pushed immediately on status screen, after returning to status screen print speed jumps to 345%.
This is caused by downcasting signed lcd_encoder to unsigned position and back to signed lcd_encoder.
2018-08-22 16:09:19 +02:00
PavelSindler d2aeb40bee manage response function update 2018-08-22 15:46:36 +02:00
PavelSindler f99196a7a0 fix reseting during filament change 2018-08-22 11:09:12 +02:00
Marek Bel 3b3d6ab472 Merge branch 'MK3' into MK3_dev 2018-08-21 17:56:34 +02:00
Robert Pelnar 315bfc43dd MMU communication fix 2018-08-21 16:41:01 +02:00
Robert Pelnar 94423e6f7e MMU communication - mmu_ready 2018-08-20 20:53:53 +02:00
Robert Pelnar 1cd0c6cfea Status screen - print active MMU exrtuder (1/2 PFW465) 2018-08-20 00:59:36 +02:00
Robert Pelnar c4281b0b36 Status screen redesign - fix of flickering and text wraping on status screen
printf formating, saved flash, reduced code size
2018-08-20 00:27:45 +02:00
Robert Pelnar fd9516f520 Status screen - status message logic simplification
added definitions of custom_message_type values
removed flag custom_message (previous solution maybe caused displaying of empty status line)
fixed in Marlin_main.cpp code "custom_message = _T(MSG_TEMP_CALIBRATION)"
2018-08-19 18:34:57 +02:00
Robert Pelnar f1ad1d22ba Menu lcd_adjust_bed fixed (Bed level correction, PFW-499) 2018-08-19 13:59:33 +02:00
Marek Bel cc0249126a Document fsensor_update, remove disabled code. 2018-08-15 21:36:23 +02:00
MRprusa3d 01e71286f7
Merge pull request #1028 from mkbel/refactor_settings
Split settings menu into separate functions.
2018-08-15 15:42:02 +00:00
Marek Bel 6c387384c7 Fix compiler warnings: sketch/Marlin.h:366:35: warning: large integer implicitly truncated to unsigned type [-Woverflow]
#define PRINT_TIME_REMAINING_INIT 0xffffffff
sketch/Marlin_main.cpp:8814:21: note: in expansion of macro 'PRINT_TIME_REMAINING_INIT'
  uint16_t print_t = PRINT_TIME_REMAINING_INIT;
sketch/Marlin_main.cpp:8817:15: warning: comparison is always true due to limited range of data type [-Wtype-limits]
  if ((print_t != PRINT_TIME_REMAINING_INIT) && (feedmultiply != 0)) print_t = 100 * print_t / feedmultiply;
2018-08-13 19:43:37 +02:00
Marek Bel ac62117d6b Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev 2018-08-13 19:38:55 +02:00
Robert Pelnar a11ae18f7e XYZ calibration fix (progmem constants declaration) + version changed 2018-08-13 14:55:31 +02:00
Robert Pelnar b7f17292ca Version changed 2018-08-10 20:08:10 +02:00
Robert Pelnar 8409a26594 Live adjust Z - display zero in case of invalid calibration status (same logic in babystep_load and _lcd_babystep) 2018-08-10 19:55:50 +02:00
Robert Pelnar b16fec956c Enabled pullup for RX2 pin (it prevents uart2 from rx buffer overflow in case of disconnected MMU) 2018-08-10 16:20:53 +02:00
Marek Bel 95e7536955 Split settings menu into separate functions. 2018-08-10 15:19:35 +02:00
Robert Pelnar 923a06c164 menu data shared memory re-design
+code cleaning
2018-08-10 02:59:49 +02:00
Marek Bel d94a1c5952 Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev 2018-08-09 21:26:33 +02:00
Robert Pelnar 9ee7a2124b removed unused code 2018-08-09 18:43:07 +02:00
Robert Pelnar 796079bb08 MMU2 communication - connection after reset, fw versions, state machine
+removed debug log from tmc2130
2018-08-09 17:43:43 +02:00
Robert Pelnar 10cc077ee4 mmu_enabled = true removed 2018-08-08 21:05:25 +02:00
Robert Pelnar 4e32fb7181 removed '!' signalization when accel/feedrate limits reached 2018-08-08 20:23:13 +02:00
Robert Pelnar 310751397c line endings + fixed declaration 2018-08-08 20:11:57 +02:00
Robert Pelnar 990a5c9119 PFW489 (github issue 1008) - time remaining variables declared as uint32 2018-08-08 19:51:50 +02:00
Robert Pelnar 2f17997622 reset safety timer everytime lcd clicked 2018-08-08 19:33:44 +02:00
Robert Pelnar ca25ec90bd Disabled timeouts in support and failstats menus 2018-08-08 19:28:34 +02:00
Robert Pelnar 23e5cea5d0 MMU - code cleaning (modularity)
M403 set filament type
hardware reset
2018-08-08 18:58:03 +02:00
XPila 290328445a
Merge pull request #1019 from mkbel/MK3_fix6
Mk3 fix6
2018-08-08 18:38:20 +02:00
XPila c2f098e263
Merge pull request #1015 from mkbel/fix_compiler_warnings
Fix compiler warnings
2018-08-08 18:37:57 +02:00
Robert Pelnar 9e09efc9f4 Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
conflicts + fix
2018-08-07 20:55:08 +02:00
Robert Pelnar 71f1a1f6db MMU - communication, check after start, code cleaning 2018-08-07 20:37:59 +02:00
Marek Bel 5493ac57f9 Fix declaration and definition type mismatch of lcd_change_fil_state. Move declaration to Marlin.h. 2018-08-07 20:15:04 +02:00
Marek Bel 10ba3e7ffd Move global variable count_position declaration to stepper.h header file. 2018-08-07 20:12:37 +02:00
mkbel cda93906bc
Merge pull request #1018 from prusa3d/MK3
Merge MK3 into MK3_dev
2018-08-07 20:09:09 +02:00
mkbel 4cc127feac
Merge pull request #817 from 3d-gussner/MK3_fix6
Fix MK3 compilation issue with Arduino 1.8.x
2018-08-07 20:02:52 +02:00
Marek Bel 7e19b4adc1 Supress compiler warning sketch/Marlin_main.cpp:3079:6: warning: unused parameter 'e_shift_late' [-Wunused-parameter]. Make function static. Fix indentation. 2018-08-07 19:17:29 +02:00
Marek Bel 814d31d70d Remove factory_reset() unused quiet parameter and make it static. It was tested, that both calls of factory reset (from menu and via PRUSA FR command) works somehow. Fix compiler warning: sketch/Marlin_main.cpp:808:6: warning: unused parameter 'quiet' [-Wunused-parameter] 2018-08-07 18:50:11 +02:00
Marek Bel 791b568339 Fix compiler warnings: sketch/uart2.c:19:33: warning: unused parameter 'stream' [-Wunused-parameter]
sketch/uart2.c:28:25: warning: unused parameter 'stream' [-Wunused-parameter]
sketch/Marlin_main.cpp:925:5: warning: unused parameter 'stream' [-Wunused-parameter]
sketch/lcd.cpp:224:5: warning: unused parameter 'stream' [-Wunused-parameter]
2018-08-07 17:51:30 +02:00
Marek Bel 4395ec207e Fix compiler warnings: sketch/xyzcal.cpp:111:10: warning: unused parameter 'nd' [-Wunused-parameter]
sketch/xyzcal.cpp:111:10: warning: unused parameter 'dd' [-Wunused-parameter]
2018-08-07 17:32:27 +02:00
Marek Bel 78f1a7914f Fix compiler warning: sketch/xyzcal.cpp:90:6: warning: unused parameter 'de' [-Wunused-parameter]. 2018-08-07 16:45:19 +02:00
Marek Bel 9271d12bf7 Save 32B of FLASH, fix compiler warning: sketch/tmc2130.cpp:238:6: warning: unused parameter 'last_step_mask' [-Wunused-parameter]. 2018-08-07 16:32:32 +02:00
Marek Bel 5af4897360 Fix compiler warning sketch/stepper.cpp:1553:6: warning: unused parameter 'driver' [-Wunused-parameter] 2018-08-07 16:05:06 +02:00
Marek Bel 880ed67785 Fix compiler warning: sketch/stepper.cpp:1499:6: warning: unused parameter 'address' [-Wunused-parameter]. 2018-08-07 16:00:35 +02:00
Marek Bel e06e19edf5 Fix showing calibration results.
Messages:
_i("XYZ calibration failed. Bed calibration point was not found.")
_T(MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED);
_i("XYZ calibration failed. Front calibration points not reachable.")
_i("XYZ calibration failed. Right front calibration point not reachable.")
_i("XYZ calibration failed. Left front calibration point not reachable.");
were never shown.
Fix compiler warnings:
sketch/ultralcd.cpp:3476:19: warning: comparison is always false due to limited range of data type [-Wtype-limits]
sketch/ultralcd.cpp:3478:26: warning: comparison is always false due to limited range of data type [-Wtype-limits]
2018-08-07 15:46:23 +02:00
Marek Bel c0f37efbad Save 278B of flash. Remove unused function parameters. Make functions static. Fix compiler warnings:
sketch/ultralcd.cpp:292:6: warning: unused parameter 'pstr' [-Wunused-parameter]
sketch/ultralcd.cpp:292:6: warning: unused parameter 'filename' [-Wunused-parameter]
sketch/ultralcd.cpp:344:6: warning: unused parameter 'pstr' [-Wunused-parameter]
sketch/ultralcd.cpp:364:6: warning: unused parameter 'pstr' [-Wunused-parameter]
sketch/ultralcd.cpp:385:6: warning: unused parameter 'pstr' [-Wunused-parameter]
sketch/ultralcd.cpp:6920:6: warning: unused parameter 'longFilename' [-Wunused-parameter]
sketch/ultralcd.cpp:6965:6: warning: unused parameter 'longFilename' [-Wunused-parameter]
2018-08-07 15:29:58 +02:00
Marek Bel cf069f3fc2 Fix compiler warning sketch/ultralcd.cpp:53:31: warning: missing initializer for member 'MenuData::BabyStep::babystepMem' [-Wmissing-field-initializers] 2018-08-07 15:07:51 +02:00
Marek Bel 453b199057 Save 8B flash, fix compiler warning sketch/sound.cpp:62:6: warning: unused parameter 'eSoundClass' [-Wunused-parameter] 2018-08-07 15:05:18 +02:00
Marek Bel 548f4cb1fa Fix compiler warning sketch/mmu.cpp:32:6: warning: unused parameter 'extr' [-Wunused-parameter] 2018-08-07 15:01:49 +02:00
Marek Bel 4c146a5b2c Fix compiler warning: sketch/mesh_bed_leveling.cpp:24:6: warning: unused parameter 'use_default' [-Wunused-parameter]. 2018-08-07 14:44:53 +02:00
Marek Bel aa0f1fd80b Fix compiler warnings sketch/mesh_bed_calibration.cpp:150:21: warning: unused parameter 'npts' [-Wunused-parameter]
sketch/mesh_bed_calibration.cpp:172:21: warning: unused parameter 'npts' [-Wunused-parameter]
2018-08-07 14:20:51 +02:00
Marek Bel e9d8ed8599 Fix compiler warning: sketch/mesh_bed_calibration.cpp:1057:13: warning: unused parameter 'verbosity_level' [-Wunused-parameter] 2018-08-07 13:58:06 +02:00
Marek Bel 0d35451544 Fix compiler warning: sketch/mesh_bed_calibration.cpp:966:13: warning: unused parameter 'verbosity_level' [-Wunused-parameter] 2018-08-07 13:00:22 +02:00
Marek Bel 523c9cd737 Fix compiler warning: sketch/mesh_bed_calibration.cpp:205:34: warning: unused parameter 'verbosity_level' [-Wunused-parameter] 2018-08-07 12:58:15 +02:00
Marek Bel 95d13cbb59 Fix compiler warning: sketch/mesh_bed_calibration.cpp:135:20: warning: unused parameter 'i' [-Wunused-parameter] 2018-08-07 12:52:51 +02:00
Marek Bel 7364b6cf80 Do not compare signed value with unsigned, add parentheses. 2018-08-07 12:52:51 +02:00
Marek Bel 2e719c7885 Fix stack corruption for folder name longer than 12 characters. Save 260B of flash memory. Move duplicate code to separate method. Fix compiler warnings: sketch/cardreader.cpp:448:25: warning: ordered comparison of pointer with integer zero [-Wextra]
sketch/cardreader.cpp:453:22: warning: ordered comparison of pointer with integer zero [-Wextra]
2018-08-07 12:52:51 +02:00
Marek Bel 7a6cbf75b9 Fix compiler warnings: sketch/cardreader.cpp: In member function 'void CardReader::openFile(const char*, bool, bool)':
sketch/cardreader.cpp:350:25: warning: ordered comparison of pointer with integer zero [-Wextra]
sketch/cardreader.cpp:355:22: warning: ordered comparison of pointer with integer zero [-Wextra]
2018-08-07 12:52:51 +02:00
Marek Bel 5f4380cafb Remove unused function, fix compiler warning: sketch/Marlin_main.cpp:8994:6: warning: unused parameter 'extruder' [-Wunused-parameter] 2018-08-07 12:52:51 +02:00
Marek Bel 30438833c6 Fix compiler warning sketch/Marlin_main.cpp:6584:19: warning: comparison is always true due to limited range of data type [-Wtype-limits] 2018-08-07 12:52:51 +02:00
Marek Bel 72cfa1b124 Fix 4 compiler warnings of type: sketch/planner.cpp:872:59: warning: suggest braces around empty body in an 'if' statement [-Wempty-body] 2018-08-07 12:52:51 +02:00
Marek Bel 55a47d57da Fix compiler warning: sketch/Marlin.h:151:25: warning: suggest braces around empty body in an 'if' statement [-Wempty-body] 2018-08-07 12:52:51 +02:00
Marek Bel ceac1e07bd Merge branch 'MK3' into MK3_dev 2018-08-06 16:26:38 +02:00
PavelSindler 702a2e1883
Merge pull request #1004 from mkbel/fix_XYhoming_direction
Obey defined X and Y homing direction.
2018-08-05 20:18:30 +02:00
PavelSindler d21e527c73 PRUSA Fir reports also buildnumber 2018-08-05 20:17:04 +02:00
PavelSindler 0c2d0bebce merge with upstream fix 2018-08-03 19:14:17 +02:00
PavelSindler cf06c5171c merge with upstream 2018-08-03 18:43:09 +02:00
PavelSindler a1f69e0924 manage response update 2018-08-03 18:37:52 +02:00
Marek Bel 5846707c5a Remove local variable verbosity_level, which was masking function parameter of the same name. Remove duplicate code to derive verbosity level.
Problem manifested itself as compiler warning: sketch/Marlin_main.cpp:2881:6: warning: unused parameter 'verbosity_level' [-Wunused-parameter]
 bool gcode_M45(bool onlyZ, int8_t verbosity_level)
2018-08-03 15:49:20 +02:00
PavelSindler 5824da8310 add more extrusion to M600 load filament 2018-08-03 15:42:06 +02:00
Marek Bel f6094a58f7 Fix compiler warning sketch/lcd.cpp:160:6: warning: unused parameter 'cols' [-Wunused-parameter]. 2018-08-03 15:37:40 +02:00
bubnikv dd4c4b39b4 Added support for the upstream Marlin interpretation of the M204 code:
M204 S.. T..:
T is interpreted the old way (as acceleration when retracting)
only if an S code is found at the same line.
This allows PrusaResearch to interpret the legacy G-codes generated
by our older Slic3r with older Slic3r profiles.

M204 P.. R.. T..:
T is ignored, P is interpreted as acceleration when extruding,
R is interpreted as acceleration when retracting.
This will be the format the Slic3r 1.41.0 will produce from
the Machine Limits page.
In the future both MK3 firmware and Slic3r will likely be extended
to support the separate travel acceleration.

This change will help us to solve the following Slic3r issue:
https://github.com/prusa3d/Slic3r/issues/1089
2018-08-03 15:33:41 +02:00
Marek Bel a85d5948c3 Make function static, save 38B flash. 2018-08-03 15:32:28 +02:00
PavelSindler ae7561bb27 M600 fix: set hotend temperature to correct value, manage_response function fix: now works in case that user presses button on mmu unit before he is asked to do it, compiler warnings (uninitialized variables) fixed 2018-08-03 15:26:39 +02:00
Marek Bel 373b4a1ea9 Fix compiler warnings sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::unget' [-Wmissing-field-initializers]
FILE _lcdout = {0};
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::flags' [-Wmissing-field-initializers]
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::size' [-Wmissing-field-initializers]
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::len' [-Wmissing-field-initializers]
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::put' [-Wmissing-field-initializers]
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::get' [-Wmissing-field-initializers]
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::udata' [-Wmissing-field-initializers]
2018-08-03 15:25:52 +02:00
Marek Bel 0638e490c1 Fix compiler warnings: sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::unget' [-Wmissing-field-initializers]
FILE _uartout = {0};
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::flags' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::size' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::len' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::put' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::get' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::udata' [-Wmissing-field-initializers]
2018-08-03 15:23:24 +02:00
Marek Bel 0632f3b6d8 Fix compiler warnings: sketch/ConfigurationStore.cpp:17:13: warning: unused parameter 'name' [-Wunused-parameter]
static void _EEPROM_writeData(int &pos, uint8_t* value, uint8_t size, char* name)
sketch/ConfigurationStore.cpp:45:13: warning: unused parameter 'name' [-Wunused-parameter]
 static void _EEPROM_readData(int &pos, uint8_t* value, uint8_t size, char* name)
2018-08-03 14:50:51 +02:00
Marek Bel f7f4ba2512 Make functions static, save 270B of flash. 2018-08-03 14:44:56 +02:00
Marek Bel bd907aec86 Fix 4 compiler warnings of type sketch/sm4.c:88:2: warning: 'register' is not at beginning of declaration [-Wold-style-declaration]. 2018-08-03 14:35:18 +02:00
Marek Bel d3360c6868 Fix compiler warning sketch/Marlin_main.cpp:9099:7: warning: unused variable 'response' [-Wunused-variable]. 2018-08-02 21:46:50 +02:00
Marek Bel e13e3a9dc4 Merge remote-tracking branch 'prusa3d/MK3' into fix_compiler_warnings 2018-08-02 21:42:55 +02:00
Marek Bel 2e61c0e289 Obey defined X and Y homing direction.
Problem manifested itself as sketch/Marlin_main.cpp:2288:13: warning: unused variable 'axis_home_dir' [-Wunused-variable]
2018-08-02 20:47:03 +02:00
Robert Pelnar 468873ec68 MMU2 - removed conditional translation for SNMM_V2, new module mmu 2018-08-02 18:54:00 +02:00
Marek Bel 63724c5f0e Comment out variable used only for commented out debug. 2018-08-02 18:26:49 +02:00
Marek Bel fd70078606 Remove or disable by preprocessor unused functions in ultralcd.cpp. 2018-08-02 18:18:31 +02:00
Marek Bel 268c52207b Fix compiler warning: sketch/ultralcd.cpp:7457:7: warning: unused variable 'pressed' [-Wunused-variable]. 2018-08-02 17:29:14 +02:00
Marek Bel 87a650f2cb Fix compiler warning: sketch/ultralcd.cpp:6573:23: warning: array subscript has type 'char' [-Wchar-subscripts] 2018-08-02 17:25:32 +02:00
Marek Bel 02f5a60065 Fix compiler warning: sketch/ultralcd.cpp:6540:23: warning: array subscript has type 'char' [-Wchar-subscripts] 2018-08-02 17:23:11 +02:00
Marek Bel 05d455fc30 Fix compiler warning sketch/ultralcd.cpp:6301:7: warning: unused variable 'tempScrool' [-Wunused-variable]. 2018-08-02 17:11:23 +02:00
Robert Pelnar 282ff6c577 removed unused union 2018-08-02 17:09:02 +02:00
Marek Bel d85c36cc77 Fix compiler warning sketch/ultralcd.cpp:3588:9: warning: unused variable 'enc_dif' [-Wunused-variable] 2018-08-02 17:08:46 +02:00
Robert Pelnar d378575a68 SNMM_V2 - default retraction declared as variable 2018-08-02 17:07:09 +02:00
Marek Bel 1898ef9896 Fix compiler warning sketch/ultralcd.cpp:2533:7: warning: unused variable '_cm' [-Wunused-variable] 2018-08-02 17:02:12 +02:00
Marek Bel bf8808ce22 Fix compiler warning sketch/tmc2130.cpp: In function 'void tmc2130_set_wave(uint8_t, uint8_t, uint8_t)':
sketch/tmc2130.cpp:921:32: warning: 'reg' may be used uninitialized in this function [-Wmaybe-uninitialized]

This was completely innocent, as reg was zeroed inside for loop.
2018-08-02 16:50:04 +02:00
Robert Pelnar 10af023eae Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang 2018-08-02 16:32:59 +02:00
Marek Bel 3248d219f2 Restore motor power, after it is disabled in tmc2130_get_wave(). This bug manifested itself as compiler warning:
sketch/tmc2130.cpp:827:10: warning: unused variable 'pwr' [-Wunused-variable]
2018-08-02 16:23:30 +02:00
Marek Bel 9f68681a1b Fix compiler warnings: sketch/tmc2130.cpp: In function 'void tmc2130_goto_step(uint8_t, uint8_t, uint8_t, uint16_t, uint16_t)':
sketch/tmc2130.cpp:795:94: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
sketch/tmc2130.cpp:807:23: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
sketch/tmc2130.cpp: In function 'void tmc2130_get_wave(uint8_t, uint8_t*, __file*)':
sketch/tmc2130.cpp:839:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
2018-08-02 16:21:38 +02:00
Marek Bel ea3d407aa7 Fix compiler warning: remove unused function float analog2tempPINDA(int raw). 2018-08-02 15:52:28 +02:00
Marek Bel aee31bdb8d Fix compiler warnings sketch/stepper.cpp: In function 'void babystep(uint8_t, bool)':
sketch/stepper.cpp:1429:20: warning: unused variable 'x' [-Wunused-variable]
     volatile float x=1./float(axis+1)/float(axis+2); //wait a tiny bit
sketch/stepper.cpp:1455:20: warning: unused variable 'x' [-Wunused-variable]
     volatile float x=1./float(axis+1)/float(axis+2); //wait a tiny bit
sketch/stepper.cpp:1485:20: warning: unused variable 'x' [-Wunused-variable]
     volatile float x=1./float(axis+1); //absolutely useless
sketch/stepper.cpp: In function 'void microstep_init()':
sketch/stepper.cpp:1571:17: warning: unused variable 'microstep_modes' [-Wunused-variable]
   const uint8_t microstep_modes[] = MICROSTEP_MODES;
2018-08-02 15:45:33 +02:00
Marek Bel 5ac98afeec Fix compiler warning sketch/optiboot_w25x20cl.cpp: In function 'void optiboot_w25x20cl_enter()':
sketch/optiboot_w25x20cl.cpp:275:15: warning: variable 'desttype' set but not used [-Wunused-but-set-variable]
2018-08-02 14:55:38 +02:00
Marek Bel 660a4c0d75 Fix compiler warnings: sketch/Marlin_main.cpp: In function 'void process_commands()':
sketch/Marlin_main.cpp:6311:3: warning: 'filament' may be used uninitialized in this function [-Wmaybe-uninitialized]
   switch (filament) {
sketch/Marlin_main.cpp:6310:44: warning: 'extruder' may be used uninitialized in this function [-Wmaybe-uninitialized]
   printf_P(PSTR("Extruder: %d; "), extruder);
2018-08-02 14:28:39 +02:00
Marek Bel 79057f070b Fix compiler warning sketch/lcd.cpp:509:1: warning: label 'end' defined but not used [-Wunused-label]. 2018-08-02 14:13:29 +02:00
Marek Bel 1b299618c1 Fix compiler warnings: sketch/fsensor.cpp: In function 'void __vector_11()':
sketch/fsensor.cpp:370:50: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
       if (pat9125_y > 0) if (fsensor_oq_yd_min > pat9125_y) fsensor_oq_yd_min = (fsensor_oq_yd_min + pat9125_y) / 2;
                                                  ^
sketch/fsensor.cpp:371:51: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
       if (pat9125_y >= 0) if (fsensor_oq_yd_max < pat9125_y) fsensor_oq_yd_max = (fsensor_oq_yd_max + pat9125_y) / 2;
2018-08-02 14:13:29 +02:00
Marek Bel 25c00393ff Fix compiler warning sketch/fsensor.cpp:221:10: warning: unused variable 'fsensor_autoload_c_old' [-Wunused-variable] 2018-08-02 14:13:29 +02:00
Marek Bel 904fe7e886 Fix compiler warning: In file included from sketch/Marlin_main.cpp:67:0:
sketch/temperature.h: In function 'void M600_wait_for_user()':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
2018-08-02 14:13:29 +02:00
Marek Bel d66da30843 Fix compiler warning: sketch/Dcodes.cpp: In function 'void dcode_3()':
sketch/Dcodes.cpp:117:24: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
    for (int i = 0; i < count; i++)
2018-08-02 14:13:29 +02:00
Marek Bel 15c598fd6a Fix compiler warning: sketch/Dcodes.cpp: In function 'void print_eeprom(uint16_t, uint16_t, uint8_t)':
sketch/Dcodes.cpp:37:12: warning: unused variable 'data' [-Wunused-variable]
2018-08-02 14:13:29 +02:00
PavelSindler 1685f83020
Merge pull request #971 from mkbel/fix_menuData_compiler_warnings
Fix 98 compiler warnings of type: warning: dereferencing type-punned …
2018-08-02 09:42:54 +02:00
Marek Bel ef8921d45e Fix 10 compiler warnings of type: sketch/menu.cpp: In function 'void _menu_edit_int3()':
sketch/menu.cpp:272:51: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
 #define _menu_data (*((menu_data_edit_t*)menu_data))
2018-08-01 22:43:36 +02:00
Marek Bel 93d2b37b5c Fix 98 compiler warnings of type: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] 2018-08-01 22:43:27 +02:00
MRprusa3d bafd290141 Sound
& TuneMenu
2018-08-01 22:34:58 +02:00
PavelSindler ac60b3ebe7
Merge pull request #996 from PavelSindler/snmm_v2
M600 updated
2018-08-01 19:39:08 +02:00
XPila 618aea25d6
Merge pull request #995 from PavelSindler/filament_type
snmm v2: send filament type to mmu
2018-08-01 19:33:44 +02:00
PavelSindler 24e7f0d0ec mmures fix 2018-08-01 19:29:50 +02:00
PavelSindler 06063118bd M600 updated 2018-08-01 18:47:28 +02:00
Marek Bel ca97e2232f Merge remote-tracking branch 'ledvinap/MK3' into fix_compiler_warnings 2018-08-01 18:44:05 +02:00
Marek Bel b0077182e5 Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings 2018-08-01 17:53:49 +02:00
Marek Bel 1a2d7657dc Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings 2018-08-01 17:39:54 +02:00
Marek Bel 6f824730af Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings 2018-08-01 17:37:09 +02:00
Marek Bel a8f73b3915 Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings 2018-08-01 17:19:34 +02:00
Marek Bel 97ec616dd1 Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings 2018-08-01 17:14:36 +02:00
Marek Bel ab5593e673 Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings 2018-08-01 16:58:09 +02:00
PavelSindler 54adb0beea missing eol added 2018-08-01 16:54:26 +02:00
Marek Bel b7ba0c5f14 Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings 2018-08-01 16:50:44 +02:00
PavelSindler b35ef498f0 comments updated 2018-08-01 16:46:46 +02:00
Marek Bel 665a885a21 Merge commit 'baddf38dbc2c72ab095deaf9b3e251ea2faeb699' into fix_compiler_warnings 2018-08-01 16:44:17 +02:00
Marek Bel 98e921d456 Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings 2018-08-01 16:24:07 +02:00
PavelSindler 135c4db5da gcode for filemant type initial version: just re-sending information to mmu 2018-08-01 15:43:13 +02:00
Robert Pelnar 43cc789602 feedrate symbol changed back to double-arrow 2018-08-01 15:15:54 +02:00
PavelSindler 0e059f8da6 single material fix: remove semicolon, unload_filament() function definition 2018-08-01 11:33:58 +02:00
PavelSindler 1f5026eed7
Merge pull request #991 from XPila/MK3-new_lang
FSensor improvement
2018-08-01 10:43:34 +02:00
PavelSindler d363bd071d
Merge pull request #990 from PavelSindler/snmm_v2
Snmm v2: M600, communication timeouts with mmu
2018-08-01 10:43:22 +02:00
PavelSindler e153a29bdb messages corrected, 5 minutes timeout when communicating with mmu 2018-08-01 10:42:09 +02:00
PavelSindler 45ac42caff snmm v2: manage response: wait for nozzle temp only when heating 2018-08-01 09:58:07 +02:00
Robert Pelnar c2fe3b920c FSensor - chunk defined in mm, runout detection distance tunning 2018-08-01 01:24:35 +02:00
Robert Pelnar 9509a60549 FSensor improovement
autoload sensitivity decreased (false triggering on MK25)
filtering algorithm more robust
additional check - fixed sync with autoload and better condition
2018-07-31 20:23:31 +02:00
PavelSindler be1167fae3 M600 for multimaterial: don't check if filament unload was succesfull 2018-07-31 19:18:09 +02:00
PavelSindler b99b73c924 missing declaration 2018-07-31 19:03:53 +02:00
PavelSindler 40da6deef8 timeouts used when getting response from mmu, M600 improvements, no filament sensor in variants file 2018-07-31 19:00:42 +02:00
Robert Pelnar 7731898b58 FSensor - optical quality meassurement - ignore reflexivity for materials with low data deviation 2018-07-31 16:28:11 +02:00
PavelSindler 04d0178150 automatic M600 initial version 2018-07-31 12:24:22 +02:00
Robert Pelnar fa30353646 Live adjust Z format fix 2018-07-30 19:24:04 +02:00
PavelSindler 67f56d3de9 merge with upstream 2018-07-30 17:24:58 +02:00
PavelSindler 9195167541
Merge pull request #984 from MRprusa3d/MK3
Sound
2018-07-30 10:55:06 +02:00
MRprusa3d f5ed37a88f Sound
"stepper.cpp" revert (debug mode only)
2018-07-30 10:52:31 +02:00
MRprusa3d 970ba6fa2a Sound
all cases
2018-07-29 22:59:14 +02:00
Robert Pelnar dd23835480 fsensor - fix - do not report poor filament response when disabled 2018-07-27 20:53:25 +02:00
Robert Pelnar 26bc28cf89 menu_draw_float31 fixed (one digit after decimal point instead of thre) 2018-07-27 20:28:44 +02:00
Robert Pelnar e73f84279e EEPROM offset fixed - added dummy lcd_contrast 2018-07-26 21:05:16 +02:00
PavelSindler 4fb27866f4
Merge pull request #972 from PavelSindler/end_file_section
End file section for searching M84 in gcode file enlarged
2018-07-26 19:59:37 +02:00
PavelSindler 5bc40aff85
Merge pull request #975 from XPila/MK3-new_lang
EEPROM dump (code D3)
2018-07-26 19:59:09 +02:00
Robert Pelnar 2f9003dbdd fsensor - better state handling 2018-07-26 19:50:33 +02:00
Robert Pelnar f819b6b304 debug output from EEPROM_WRITE_VAR and EEPROM_READ_VAR 2018-07-26 19:43:33 +02:00
PavelSindler d51b2666ac no levels used in store settings function 2018-07-26 19:09:52 +02:00
PavelSindler 1232d2dae6 M503: print autoretract value fixed 2018-07-26 17:26:05 +02:00
PavelSindler 9235ffb497 T code for SNMM_V2 fix 2018-07-26 17:03:43 +02:00
PavelSindler 285f2ccbd9
Merge pull request #976 from PavelSindler/MK3_for_merging
config for mmu updated
2018-07-26 15:00:33 +02:00
PavelSindler 5bda19b9f7 config for mmu updated 2018-07-26 14:59:49 +02:00
Robert Pelnar 691e7a24ed EEPROM dump (code D3) 2018-07-26 13:20:35 +02:00
PavelSindler 9c1ef5e414
Merge pull request #974 from mkbel/fix_compiler_warnings
Save 88B FLASH and fix compiler warnings:
2018-07-26 09:41:31 +02:00
PavelSindler cadb2e9cfe
Merge pull request #973 from MRprusa3d/MK3
PowerPanic IV
2018-07-26 09:40:57 +02:00
Marek Bel 716e6c209c Save 88B FLASH and fix compiler warnings:
sketch/cmdqueue.cpp: In function 'bool cmdqueue_pop_front()':
sketch/cmdqueue.cpp:67:56: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
             for (++ bufindr; bufindr < sizeof(cmdbuffer) && cmdbuffer[bufindr] == 0; ++ bufindr) ;
                                                        ^
sketch/cmdqueue.cpp: In function 'bool cmdqueue_could_enqueue_back(int, bool)':
sketch/cmdqueue.cpp:170:63: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
             endw + CMDBUFFER_RESERVE_FRONT <= sizeof(cmdbuffer) ||
                                                               ^
sketch/cmdqueue.cpp:172:38: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
             (endw <= sizeof(cmdbuffer) && CMDBUFFER_RESERVE_FRONT <= bufindr))
                                      ^
sketch/cmdqueue.cpp:196:63: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
             endw + CMDBUFFER_RESERVE_FRONT <= sizeof(cmdbuffer) ||
                                                               ^
sketch/cmdqueue.cpp:198:38: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
             (endw <= sizeof(cmdbuffer) && CMDBUFFER_RESERVE_FRONT <= bufindr))
                                      ^
sketch/cmdqueue.cpp: In function 'void get_command()':
sketch/cmdqueue.cpp:380:10: warning: variable 'rx_buffer_full' set but not used [-Wunused-but-set-variable]
     bool rx_buffer_full = false; //flag that serial rx buffer is full
          ^
sketch/cmdqueue.cpp: In function 'uint16_t cmdqueue_calc_sd_length()':
sketch/cmdqueue.cpp:697:54: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
         for (++ _bufindr; _bufindr < sizeof(cmdbuffer) && cmdbuffer[_bufindr] == 0; ++ _bufindr) ;
                                                      ^
2018-07-25 21:18:29 +02:00
MRprusa3d 5be82962ee PowerPanic IV 2018-07-25 19:24:41 +02:00
PavelSindler da82062d41 End file section for searching M84 in gcode file were enlarged (compatibility with mmu Slic3r) 2018-07-25 18:26:22 +02:00
PavelSindler 9b4f786325
Merge pull request #970 from mkbel/fix_compiler_warnings
Fix compiler warnings
2018-07-25 17:08:07 +02:00
PavelSindler 59c0127b77 automatic M600 for mmu v2: work in progress 2018-07-25 16:48:39 +02:00
Marek Bel 620c015b65 Fix compiler warning: sketch/ultralcd.cpp:855:31: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
for (int dots = 0; dots < heating_status_counter; dots++)
2018-07-25 16:30:50 +02:00
Marek Bel 58155cacbc Fix compiler warning sketch/ultralcd.cpp:6711:24: warning: suggest parentheses around comparison in operand of '^' [-Wparentheses].
Add parentheses to match expressions on following lines. This changed expression, as == has precedence over ^, but truth table of expression is anyway the same regardless of parentheses.
2018-07-25 16:24:08 +02:00
Marek Bel 08b56fe1a4 Fix compiler warning sketch/cardreader.cpp:706:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare].
Remove redundant and masked int d variable.
Fix indentation of presort() to make it clear, that it is not part of for loop.
2018-07-25 15:51:00 +02:00
Marek Bel 5f8e87e649 Fix compiler warning: sketch/SdFatUtil.cpp:49:7: warning: unused variable 'i' [-Wunused-variable] 2018-07-25 15:19:10 +02:00
Marek Bel 702fa307bb Fix compiler warning sketch/Marlin_main.cpp:478:14: warning: 'delta' defined but not used [-Wunused-variable].
Variable was never used since "Initial commit".
2018-07-25 15:08:17 +02:00
Marek Bel 904db96cd1 Fix compiler warning sketch/tmc2130.h:123:3: warning: 'tmc2130_axis_config' defined but not used [-Wunused-variable] 2018-07-25 15:03:38 +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 e6dcbedf82 Fix compiler warning: sketch/Marlin_main.cpp:8833:16: warning: variable 'nplanner_blocks' set but not used [-Wunused-but-set-variable] 2018-07-25 11:58:48 +02:00
Marek Bel b357399c6b Fix compiler warning sketch/Marlin_main.cpp:1846:1: warning: control reaches end of non-void function [-Wreturn-type]. 2018-07-25 11:54:55 +02:00
PavelSindler d6021d047d
Merge pull request #969 from mkbel/fix_compiler_warnings
Fix compiler warning: sketch/ultralcd.cpp:7258:61: warning: integer o…
2018-07-25 11:36:34 +02:00
Marek Bel c7de8a91bb Fix compiler warning sketch/Marlin_main.cpp:8811:10: warning: unused variable 'extruder_abs_pos' [-Wunused-variable]
Variable started to be unused in commit
fde0efc75c
power panic for absolute E coordinates: initial version
and its author told me that the change was intentional.
2018-07-25 11:33:32 +02:00
Marek Bel 0f577cace6 Fix compiler warning: sketch/Marlin_main.cpp:8759:8: warning: unused variable 'c' [-Wunused-variable] 2018-07-24 19:40:43 +02:00
Marek Bel bd868132cc Fix compiler warnings:
sketch/Marlin_main.cpp:8756:8: warning: unused variable 'x_rec' [-Wunused-variable]
sketch/Marlin_main.cpp:8756:15: warning: unused variable 'y_rec' [-Wunused-variable]
sketch/Marlin_main.cpp:8756:22: warning: unused variable 'z_pos' [-Wunused-variable]
2018-07-24 19:31:18 +02:00
Marek Bel c19bf72ba9 Fix compiler warning sketch/Marlin_main.cpp:8220:15: warning: unused variable 'k' [-Wunused-variable]. 2018-07-24 18:33:44 +02:00
Marek Bel 3f0684ea30 Fix compiler warning - remove unused variable. 2018-07-24 18:27:05 +02:00
Marek Bel f7754faaf1 Fix compiler warning sketch/Marlin_main.cpp:7092:14: warning: variable 'make_move' set but not used [-Wunused-but-set-variable] 2018-07-24 18:06:38 +02:00
Marek Bel 68a3ae5456 Fix compiler warning sketch/Marlin_main.cpp:6331:11: warning: unused variable 'cnt' [-Wunused-variable] 2018-07-24 17:57:26 +02:00
Marek Bel b44f71fd33 Fix compiler warning sketch/Marlin_main.cpp:6267:16: warning: variable 'TooLowZ' set but not used [-Wunused-but-set-variable]
int8_t TooLowZ = 0;

This variable was unused even in "Initial commit".
2018-07-24 17:30:37 +02:00
Marek Bel d5ab657cdf Fix compiler warnings:
file included from sketch/Configuration_prusa.h:2:0,
                 from sketch/Configuration.h:43,
                 from sketch/Marlin.h:22,
                 from sketch/Marlin_main.cpp:46:
sketch/Marlin_main.cpp: In function 'void process_commands()':
sketch/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h:106:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
 #define NORMAL_MAX_ACCEL_XY     2500ul  // max acceleration in normal mode in mm/s^2
                                 ^
sketch/Marlin_main.cpp:5772:16: note: in expansion of macro 'NORMAL_MAX_ACCEL_XY'
      if (val > NORMAL_MAX_ACCEL_XY)
                ^
sketch/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h:102:34: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
 #define SILENT_MAX_ACCEL_XY      960ul  // max acceleration in silent mode in mm/s^2
                                  ^
sketch/Marlin_main.cpp:5774:23: note: in expansion of macro 'SILENT_MAX_ACCEL_XY'
      if (val_silent > SILENT_MAX_ACCEL_XY)
2018-07-24 17:22:29 +02:00
Marek Bel 3a532a46bb Fix compiler warning sketch/Marlin_main.cpp:5737:15: warning: unused variable 'area' [-Wunused-variable]
This variable was unused even in "Initial commit".
2018-07-24 17:17:44 +02:00
Marek Bel 97ec55b951 Fix compiler warning sketch/Marlin_main.cpp:4307:7: warning: unused variable 'Z_PROBE_FEEDRATE' [-Wunused-variable].
This variable was unused even in "Initial commit".
2018-07-24 17:07:21 +02:00
Marek Bel 8575645eec Fix compiler warning: sketch/Marlin_main.cpp:4193:15: warning: statement has no effect [-Wunused-value]
fan_speed[1];
2018-07-24 16:56:56 +02:00
Marek Bel 9edb07afa5 Fix compiler warning sketch/Marlin_main.cpp:4218:10: warning: variable 'verbosity_level' set but not used [-Wunused-but-set-variable] 2018-07-24 16:54:12 +02:00
Marek Bel 219b98b7e1 Fix compiler warnings: sketch/Marlin_main.cpp: In function 'void setup()':
sketch/Marlin_main.cpp:1478:57: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
  if ((farm_mode == 0xFF && farm_no == 0) || (farm_no == 0xFFFF)) farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode
                                                         ^
sketch/Marlin_main.cpp:1479:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
  if (farm_no == 0xFFFF) farm_no = 0;
                 ^
2018-07-24 16:25:10 +02:00
Marek Bel 5ceece08f8 Fix compiler warning sketch/Marlin_main.cpp:1072:46: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if ((state * LANGBOOT_BLOCKSIZE) < header.size)
2018-07-24 16:07:28 +02:00
Marek Bel 3811e30df9 Fix compiler warning: sketch/Marlin_main.cpp:1042:40: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] 2018-07-24 16:04:19 +02:00
Marek Bel 0bde84983b Fix compiler warning sketch/Marlin_main.cpp:798:6: warning: unused variable 'cursor_pos' [-Wunused-variable] 2018-07-24 15:47:39 +02:00
Marek Bel fd3e0115b6 Fix compiler warning: sketch/ultralcd.cpp:7258:61: warning: integer overflow in expression [-Woverflow]
lcd_next_update_millis = millis() + (LCD_UPDATE_INTERVAL * 10000);

Use public interface instead of manipulating lcd_next_update_millis timer.
2018-07-24 15:20:03 +02:00
Marek Bel 6cf17fa760 Delete TMP file added accidentally by commit "timeout when waiting for mmu OK ". 2018-07-24 14:20:13 +02:00
PavelSindler 77cc55ed76
Merge pull request #951 from PavelSindler/use_timer
Use timer
2018-07-24 09:31:45 +02:00
PavelSindler 90b763775c
Merge pull request #966 from PavelSindler/MK3_for_merging
config for MK2.5 change
2018-07-23 21:13:22 +02:00
PavelSindler e47656df97 config for MK2.5 change 2018-07-23 21:12:50 +02:00
PavelSindler 3fd705d763
Merge pull request #965 from PavelSindler/MK3_for_merging
config for MK25 Rambo1.0 changed
2018-07-23 21:09:46 +02:00
PavelSindler e4641d3db4 config for MK25 Rambo1.0 changed 2018-07-23 21:09:07 +02:00
PavelSindler 064b8a4f24
Merge pull request #964 from MRprusa3d/MK3
PowerPanic & Sound III
2018-07-23 20:31:32 +02:00
PavelSindler 2d078f17b0
Merge pull request #963 from PavelSindler/MK3_for_merging
SUPPORT_VERBOSITY temporary solution
2018-07-23 20:12:05 +02:00
PavelSindler f72f385c82 SUPPORT_VERBOSITY temporary solution 2018-07-23 20:11:16 +02:00
PavelSindler d35124f637
Merge pull request #962 from PavelSindler/MK3_for_merging
config file updated
2018-07-23 20:06:35 +02:00
PavelSindler c65efd0114 config file updated 2018-07-23 20:05:42 +02:00
Martin Remiš c7d7389e27 PowerPanic & Sound 2018-07-23 20:04:47 +02:00
PavelSindler 2911b92b8f
Merge pull request #961 from mkbel/fix_compiler_warnings
Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr…
2018-07-23 20:00:28 +02:00
Marek Bel e77a54034c Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to <util/delay.h>." [-Wcpp] 2018-07-23 18:12:08 +02:00
PavelSindler d347cdaf1a
Merge pull request #960 from XPila/MK3-new_lang
BOOTAPP support defined for EINSY
2018-07-23 17:32:08 +02:00
XPila 0659cf0287
Merge pull request #953 from PavelSindler/farm_mode_fix
G98 saves farm number
2018-07-23 17:31:42 +02:00
Robert Pelnar 6444573c92 BOOTAPP support defined for EINSY
W25x20CL test before entering optiboot (in some error cases it hangs in optiboot and then message not shown)
2018-07-23 17:14:18 +02:00
PavelSindler 87a9a721ee
Merge pull request #955 from mkbel/fix_compiler_warnings
Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr…
2018-07-23 15:15:24 +02:00
Robert Pelnar 4eb4924d81 Optiboot enabled 2018-07-23 14:41:10 +02:00
PavelSindler b688bc9294
Merge branch 'MK3' into reapply_fix_compiler_warnings 2018-07-23 14:38:43 +02:00
PavelSindler dcf3b792be
Merge pull request #948 from XPila/MK3-new_lang
FSensor - optical quality meassurement
2018-07-23 14:37:16 +02:00
Robert Pelnar 896734c06b Display '!' instead of 'FR' on status screen when feedrate or acceleration limit reached. 2018-07-23 14:30:41 +02:00
Marek Bel 7cfa3156c7 Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to <util/delay.h>." [-Wcpp] 2018-07-23 13:47:15 +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
Robert Pelnar f0d939140b Menu extruder info fixed 2018-07-23 12:54:48 +02:00
PavelSindler 1a9643c892 G98 saves farm no 2018-07-23 11:49:06 +02:00
PavelSindler 18419eefc4 no timeouts when communicating with mmu (temporarily ?) 2018-07-23 10:50:58 +02:00
PavelSindler efd03b426f final edits to fit changes on upstream 2018-07-23 09:14:22 +02:00
PavelSindler 565a6db3e4 use timer class 2018-07-22 16:26:12 +02:00
Robert Pelnar 60b4db15e0 FSensor - M600 fix + cond. translation + tunning filter and params 2018-07-22 16:14:13 +02:00
PavelSindler 5b6fb9e49b Use Timer class for button blanking. Save 74B FLASH and 1B RAM. 2018-07-22 15:05:24 +02:00
Robert Pelnar c6a3f073dd FSensor - M600/autoload fix + optical quality meassurement 2018-07-21 17:04:29 +02:00
Robert Pelnar 612e83b473 max_feedrate and max_acceleration limitation (ConfigurationStore) 2018-07-21 12:33:29 +02:00
Robert Pelnar f07d08697a max_feedrate and max_acceleration limitation fix (M201, M203) 2018-07-21 12:24:57 +02:00
Robert Pelnar 980c044dac FSensor - code cleaning 2018-07-21 01:57:41 +02:00
Robert Pelnar 2e260aeccc FSensor - autoload fixed 2018-07-21 01:30:16 +02:00
Robert Pelnar 1309c52bcf FSensor - code cleaning + simplification
+ removed DEBUG_DISABLE_FSENSORCHECK
+ added FILAMENT_SENSOR
2018-07-20 23:48:00 +02:00
Robert Pelnar ca2d69271c filament_autoload_enabled renamed to fsensor_watch_autoload 2018-07-20 20:37:50 +02:00
Robert Pelnar 328cae1147 Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
# Conflicts:
#	Firmware/Marlin_main.cpp
2018-07-20 20:35:00 +02:00
Robert Pelnar 0f91bf9527 FSensor - optical quality meassurement durring load filament 2018-07-20 20:30:08 +02:00
PavelSindler eac963e3a0 timeout prolonged 2018-07-20 18:03:52 +02:00
PavelSindler 80ca5f3d33 merge with upstream fixes 2018-07-20 17:51:44 +02:00
PavelSindler a7e139ad8d limist added to configuration files 2018-07-20 17:38:24 +02:00
PavelSindler 814572fed5 merge with upstream 2018-07-20 17:22:06 +02:00
PavelSindler 5fd1acaf81
Revert "PowerPanic" 2018-07-20 15:20:57 +02:00
PavelSindler 3c1f13377c mmu first layer cal. status line message order changed 2018-07-20 14:58:36 +02:00
PavelSindler cfe49a243a first layer calibration: intitial version 2018-07-20 14:37:01 +02:00
Robert Pelnar fd9b9acf4e FSensor, code cleaning + optical quality meassurement 2018-07-20 14:03:22 +02:00
PavelSindler b0ebea0c61 mmu: switching extruders simplified 2018-07-20 13:20:07 +02:00
MRprusa3d bbec1ccfd4
Add files via upload 2018-07-20 04:34:12 +00:00
MRprusa3d a09d44b869 PowerPanic
experimental
2018-07-20 04:47:33 +02:00
Robert Pelnar 5483bee885 FSensor - meassuring filament optical quality 2018-07-19 20:55:38 +02:00
PavelSindler 045cb5bb41 stop print for mmu initial version 2018-07-19 20:46:46 +02:00
PavelSindler 538f8a8858 Merge remote-tracking branch 'upstream/MK3' into snmm_v2 2018-07-19 20:27:51 +02:00
PavelSindler 231a6dcf1b M600 for single material fix 2018-07-19 20:27:39 +02:00
PavelSindler 86882ae10a M600 for snmm_v2 intial working version 2018-07-19 20:16:42 +02:00
Robert Pelnar 2a66251170 _DISABLE_M42_M226 removed 2018-07-19 19:33:28 +02:00
Robert Pelnar fd0b7c25e5 TMC2130 speed and accel limitation (M201, M203) for stealth and normal mode 2018-07-19 19:12:46 +02:00
Robert Pelnar 2ce210a8bb TMC2130 feedrate and acceleration limitation - separate profiles for normal and stealth mode 2018-07-19 18:56:01 +02:00
Robert Pelnar c3e28b490c TMC2130 old style limits removed
+menu draw_edit fix
2018-07-19 17:42:59 +02:00
Robert Pelnar b46953c790 LCD menu optimalization - lcd_draw_edit removed 2018-07-19 16:57:31 +02:00
PavelSindler 5fecb7a2dc M600 2018-07-19 16:17:46 +02:00
PavelSindler 3cb3ec9975
Merge pull request #940 from XPila/MK3-new_lang
Filament sensor tunning
2018-07-19 15:22:47 +02:00
Robert Pelnar fa9d4550f0 PFW-448 menu items displaying fix 2018-07-19 15:21:46 +02:00
Robert Pelnar 42d2f31248 PFW-446 Stop print fix (recursion in lcd_update) 2018-07-19 14:23:45 +02:00
Robert Pelnar 6db1c6dc3b Long press Move Z fixed 2018-07-19 13:54:56 +02:00
PavelSindler 7600848533 load to nozzle function, M600 work in progress 2018-07-19 13:14:29 +02:00
Robert Pelnar afb9ca4687 FSensor - removed fsensor blocking while load, added filament quality meassurement 2018-07-18 17:45:54 +02:00
PavelSindler 2006ae58f1 typo fix 2018-07-18 16:54:40 +02:00
PavelSindler 5676550452 missing get response readded 2018-07-18 16:52:10 +02:00
PavelSindler b9be718deb timeout used everywhere where we are waiting for mmu reponse 2018-07-18 16:25:31 +02:00
PavelSindler 0a43b9ce6b timeout when waiting for mmu OK 2018-07-18 16:17:45 +02:00
PavelSindler 6e760ef76d merge with upstream cleanup 2018-07-18 15:34:33 +02:00
Robert Pelnar 2c06cb68d1 FSensor tunning - filtering changed, chunk length = 0.64mm and MAX_ERR = 10 2018-07-17 20:04:12 +02:00
Petr Ledvina d3e9543fee Fix undefined behaviour
Argument evaluation order is undefined
2018-07-17 19:12:48 +02:00
Petr Ledvina 48d6ebffd8 Fix code_seen
char/string version was mixed
2018-07-17 18:57:28 +02:00
Petr Ledvina 2af973bfba Remove uninitialized variables 2018-07-17 18:57:28 +02:00
Petr Ledvina 3f17364589 Fix various warnings 2018-07-17 18:57:28 +02:00
Petr Ledvina 33bf363798 Fix st_get_position_mm
call it, do not index function pointer
2018-07-17 18:57:28 +02:00
Petr Ledvina ef93de95d8 Fix int overflow 2018-07-17 18:57:28 +02:00
Petr Ledvina ba8bcf76be Use signed value where appropriate 2018-07-17 17:57:38 +02:00
Petr Ledvina 7bbf9953f2 Fix missing return warnings 2018-07-17 17:57:38 +02:00
Petr Ledvina 6cebf09b88 Fix operator priority
== has higher precedence to &, test was always false
2018-07-17 17:57:38 +02:00
Petr Ledvina ceeb97f38c Parentheses around macro argument
Not triggering error in this case
2018-07-17 17:57:38 +02:00
Petr Ledvina baddf38dbc Make card filename `const`
Fixes warning in filename_wldsd
2018-07-17 17:55:05 +02:00
Petr Ledvina f2981bf322 Fix type coversion warnings in language.c 2018-07-17 17:55:05 +02:00
Petr Ledvina d64754468a Fix undefined function warnings 2018-07-17 17:55:05 +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
Petr Ledvina 3f92630fd1 Fix setTargetHotend array overflow
Special function may be used instead (setTargetHotends(temp))
2018-07-17 17:55:04 +02:00
PavelSindler 33f9af65c8 merge with upstream/MK3 2018-07-17 16:36:53 +02:00
Robert Pelnar 64929a78f5 Linearity correction menu disabled 2018-07-17 13:35:04 +02:00
XPila 7bec5c6d5c
Merge branch 'MK3' into MK3-new_lang 2018-07-17 11:47:01 +02:00
PavelSindler 9e2985dfba
Revert "Use timer" 2018-07-17 11:38:38 +02:00
PavelSindler 77426b563a
Revert "Save 80B of flash and 8B of RAM and fix compiler warning:" 2018-07-17 11:28:44 +02:00
PavelSindler 85c37d1225
Merge branch 'MK3' into fix_compiler_warnings 2018-07-17 10:56:25 +02:00
PavelSindler 322978c920 Merge branch 'MK3_mk_prep' into MK3 2018-07-17 10:03:31 +02:00
PavelSindler e1a71118f9
Merge pull request #917 from mkbel/use_Timer
Use timer
2018-07-17 09:57:56 +02:00
PavelSindler eb3307e8fc
Merge pull request #889 from mkbel/fix_PRUSA_RESET
Do not skip bootloader when initiating reset by farm PRUSA RESET comm…
2018-07-17 09:52:41 +02:00
Robert Pelnar 2451455974 LCD menu optimalization - initial lcd update fix 2018-07-16 23:54:46 +02:00
Robert Pelnar 19a72ef9eb LCD menu optimalization - LiquidCrystal_Prusa removed 2018-07-16 23:23:15 +02:00
PavelSindler fddc02adfa version changed 2018-07-16 21:01:40 +02:00
Robert Pelnar d1de75eb19 LCD menu optimalization - createChar
+code order
2018-07-16 19:53:34 +02:00
Robert Pelnar e22d204e8e LCD menu optimalization - print functions
+removed unused code
2018-07-16 19:29:27 +02:00
PavelSindler a575c028bf resend request sends OK 2018-07-16 19:20:39 +02:00
Robert Pelnar 68e59399af LCD menu optimalization - lcd_printPGM replaced with lcd_puts_P 2018-07-16 18:08:01 +02:00
Robert Pelnar 0eaabed50c LCD menu optimalization - renamed lcd_implementation clear
+code order
2018-07-16 17:54:16 +02:00
Robert Pelnar fd3fc31304 LCD menu optimalization - conversion functions - source separation 2018-07-16 17:23:35 +02:00
Robert Pelnar 0924ad50d5 New localization vs octoprint fix - do not translate protocol messages 2018-07-16 04:50:43 +02:00
Robert Pelnar a7df5f368b LCD menu optimalization - sdcard menu fixed 2018-07-16 04:24:27 +02:00
Robert Pelnar b6223d5623 LCD menu optimalization 2018-07-16 04:13:26 +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
PavelSindler 0e15a4025b whitespace 2018-07-15 20:24:24 +02:00
PavelSindler 6824ab65dd G28 fix 2018-07-15 20:00:29 +02:00
Robert Pelnar 39bb855333 LCD menu optimalization - menu_item_edit_int3
MenuStack removed
FILAMENT_LCD_DISPLAY and ENCODER_STEPS_PER_MENU_ITEM removed (unused)
EXPERIMENTAL_FEATURES menu removed
2018-07-15 18:37:59 +02:00
Marek Bel 42893b7a94 Fix compiler warnings:
sketch/Marlin_main.cpp:806:6: warning: unused variable 'cursor_pos' [-Wunused-variable]
sketch/Marlin_main.cpp:1922:7: warning: unused variable 'stack_integrity' [-Wunused-variable]
sketch/Marlin_main.cpp:4254:8: warning: unused variable 'clamped' [-Wunused-variable]
2018-07-13 20:47:40 +02:00
Marek Bel 83081b0fba Fix compiler warning: sketch/LiquidCrystal_Prusa.cpp:502:1: warning: label 'end' defined but not used [-Wunused-label]. 2018-07-13 20:00:20 +02:00
Marek Bel ea59d8a6e6 Fix compiler warnings:
In file included from sketch/ConfigurationStore.cpp:4:0:
sketch/ultralcd.h:40:15: warning: 'void lcd_selftest_v()' declared 'static' but never defined [-Wunused-function]
   static void lcd_selftest_v();
               ^
sketch/ultralcd.h:42:15: warning: 'bool lcd_selfcheck_endstops()' declared 'static' but never defined [-Wunused-function]
   static bool lcd_selfcheck_endstops();
               ^
sketch/ultralcd.h:45:15: warning: 'void reset_crash_det(char)' declared 'static' but never defined [-Wunused-function]
   static void reset_crash_det(char axis);
               ^
sketch/ultralcd.h:46:15: warning: 'bool lcd_selfcheck_axis_sg(char)' declared 'static' but never defined [-Wunused-function]
   static bool lcd_selfcheck_axis_sg(char axis);
               ^
sketch/ultralcd.h:47:15: warning: 'bool lcd_selfcheck_axis(int, int)' declared 'static' but never defined [-Wunused-function]
   static bool lcd_selfcheck_axis(int _axis, int _travel);
               ^
sketch/ultralcd.h:54:15: warning: 'bool lcd_selfcheck_check_heater(bool)' declared 'static' but never defined [-Wunused-function]
   static bool lcd_selfcheck_check_heater(bool _isbed);
               ^
sketch/ultralcd.h:55:15: warning: 'int lcd_selftest_screen(int, int, int, bool, int)' declared 'static' but never defined [-Wunused-function]
   static int  lcd_selftest_screen(int _step, int _progress, int _progress_scale, bool _clear, int _delay);
               ^
sketch/ultralcd.h:56:15: warning: 'void lcd_selftest_screen_step(int, int, int, const char*, const char*)' declared 'static' but never defined [-Wunused-function]
   static void lcd_selftest_screen_step(int _row, int _col, int _state, const char *_name, const char *_indicator);
               ^
sketch/ultralcd.h:57:15: warning: 'bool lcd_selftest_manual_fan_check(int, bool)' declared 'static' but never defined [-Wunused-function]
   static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite);
               ^
sketch/ultralcd.h:58:15: warning: 'bool lcd_selftest_fan_dialog(int)' declared 'static' but never defined [-Wunused-function]
   static bool lcd_selftest_fan_dialog(int _fan);
               ^
sketch/ultralcd.h:59:15: warning: 'bool lcd_selftest_fsensor()' declared 'static' but never defined [-Wunused-function]
   static bool lcd_selftest_fsensor();
               ^
sketch/ultralcd.h:60:15: warning: 'void lcd_selftest_error(int, const char*, const char*)' declared 'static' but never defined [-Wunused-function]
   static void lcd_selftest_error(int _error_no, const char *_error_1, const char *_error_2);

sketch/ultralcd.h:68:24: warning: 'blink' defined but not used [-Wunused-variable]
   static unsigned char blink = 0; // Variable for visualization of fan rotation in GLCD

sketch/ultralcd.h:222:13: warning: 'void lcd_colorprint_change()' declared 'static' but never defined [-Wunused-function]
 static void lcd_colorprint_change();
             ^
sketch/ultralcd.h:223:12: warning: 'int get_ext_nr()' declared 'static' but never defined [-Wunused-function]
 static int get_ext_nr();
            ^
sketch/ultralcd.h:225:13: warning: 'void extr_adj_0()' declared 'static' but never defined [-Wunused-function]
 static void extr_adj_0();
             ^
sketch/ultralcd.h:226:13: warning: 'void extr_adj_1()' declared 'static' but never defined [-Wunused-function]
 static void extr_adj_1();
             ^
sketch/ultralcd.h:227:13: warning: 'void extr_adj_2()' declared 'static' but never defined [-Wunused-function]
 static void extr_adj_2();
             ^
sketch/ultralcd.h:228:13: warning: 'void extr_adj_3()' declared 'static' but never defined [-Wunused-function]
 static void extr_adj_3();
             ^
sketch/ultralcd.h:229:13: warning: 'void fil_load_menu()' declared 'static' but never defined [-Wunused-function]
 static void fil_load_menu();
             ^
sketch/ultralcd.h:230:13: warning: 'void fil_unload_menu()' declared 'static' but never defined [-Wunused-function]
 static void fil_unload_menu();
             ^
sketch/ultralcd.h:231:13: warning: 'void extr_unload_0()' declared 'static' but never defined [-Wunused-function]
 static void extr_unload_0();
             ^
sketch/ultralcd.h:232:13: warning: 'void extr_unload_1()' declared 'static' but never defined [-Wunused-function]
 static void extr_unload_1();
             ^
sketch/ultralcd.h:233:13: warning: 'void extr_unload_2()' declared 'static' but never defined [-Wunused-function]
 static void extr_unload_2();
             ^
sketch/ultralcd.h:234:13: warning: 'void extr_unload_3()' declared 'static' but never defined [-Wunused-function]
 static void extr_unload_3();
             ^
sketch/ultralcd.h:235:13: warning: 'void lcd_disable_farm_mode()' declared 'static' but never defined [-Wunused-function]
 static void lcd_disable_farm_mode();
             ^
sketch/ultralcd.h:236:13: warning: 'void lcd_set_fan_check()' declared 'static' but never defined [-Wunused-function]
 static void lcd_set_fan_check();
             ^
sketch/ultralcd.h:240:13: warning: 'char snmm_stop_print_menu()' declared 'static' but never defined [-Wunused-function]
 static char snmm_stop_print_menu();
             ^
sketch/ultralcd.h:242:14: warning: 'void lcd_sort_type_set()' declared 'static' but never defined [-Wunused-function]
  static void lcd_sort_type_set();
              ^
sketch/ultralcd.h:244:14: warning: 'float count_e(float, float, float)' declared 'static' but never defined [-Wunused-function]
 static float count_e(float layer_heigth, float extrusion_width, float extrusion_length);
              ^
sketch/ultralcd.h:245:13: warning: 'void lcd_babystep_z()' declared 'static' but never defined [-Wunused-function]
 static void lcd_babystep_z();
             ^
sketch/ultralcd.h:290:13: warning: 'void lcd_send_status()' declared 'static' but never defined [-Wunused-function]
 static void lcd_send_status();
             ^
sketch/ultralcd.h:291:13: warning: 'void lcd_connect_printer()' declared 'static' but never defined [-Wunused-function]
 static void lcd_connect_printer();

sketch/ultralcd.h:227:13: warning: 'char snmm_stop_print_menu()' declared 'static' but never defined [-Wunused-function]
 static char snmm_stop_print_menu();
             ^
sketch/ultralcd.h:229:14: warning: 'void lcd_sort_type_set()' declared 'static' but never defined [-Wunused-function]
  static void lcd_sort_type_set();
              ^
sketch/ultralcd.h:231:14: warning: 'float count_e(float, float, float)' declared 'static' but never defined [-Wunused-function]
 static float count_e(float layer_heigth, float extrusion_width, float extrusion_length);
              ^
sketch/ultralcd.h:232:13: warning: 'void lcd_babystep_z()' declared 'static' but never defined [-Wunused-function]
 static void lcd_babystep_z();
2018-07-13 19:50:51 +02:00
Marek Bel 6bd8e60176 Fix compiler warning:
In file included from sketch/ConfigurationStore.cpp:4:0:
sketch/ultralcd.h:12:14: warning: 'void lcd_language_menu()' declared 'static' but never defined [-Wunused-function]
  static void lcd_language_menu();
2018-07-13 19:27:25 +02:00
Marek Bel ee366ce3b5 Fix compiler warnings:
In file included from sketch/ConfigurationStore.cpp:3:0:
sketch/temperature.h:193:14: warning: 'temp_runaway_status' defined but not used [-Wunused-variable]
 static float temp_runaway_status[4];
              ^
sketch/temperature.h:194:14: warning: 'temp_runaway_target' defined but not used [-Wunused-variable]
 static float temp_runaway_target[4];
              ^
sketch/temperature.h:195:14: warning: 'temp_runaway_timer' defined but not used [-Wunused-variable]
 static float temp_runaway_timer[4];
              ^
sketch/temperature.h:196:12: warning: 'temp_runaway_error_counter' defined but not used [-Wunused-variable]
 static int temp_runaway_error_counter[4];
2018-07-13 19:18:54 +02:00
Marek Bel ff56e491e8 Save 2B flash, fix compiler warning:
In file included from sketch/ConfigurationStore.cpp:5:0:
sketch/ConfigurationStore.h: In function 'uint8_t calibration_status_store(uint8_t)':
sketch/ConfigurationStore.h:24:124: warning: no return statement in function returning non-void [-Wreturn-type]
 inline uint8_t calibration_status_store(uint8_t status) { eeprom_update_byte((uint8_t*)EEPROM_CALIBRATION_STATUS, status); }
2018-07-13 18:49:14 +02:00
Marek Bel c251777590 Fix compiler warning:
In file included from sketch/BlinkM.cpp:5:0:
sketch/Marlin.h:422:13: warning: 'void print_time_remaining_init()' declared 'static' but never defined [-Wunused-function]
 static void print_time_remaining_init();

Make local functions static. Saves 6B of flash.
2018-07-13 18:44:54 +02:00
Marek Bel bc99db8233 Fix compiler warning: sketch/uart2.c:48:1: warning: control reaches end of non-void function [-Wreturn-type] 2018-07-13 18:35:42 +02:00
Marek Bel f620a66211 Use public interface instead of manipulating lcd_next_update_millis timer. 2018-07-13 18:26:52 +02:00
Marek Bel 49dd8d83fb Fix indentation in lcd_update() and split some of the preprocessor disabled functionality into separate functions. No change in resulting binary. 2018-07-13 18:06:33 +02:00
Marek Bel 9d72062cd7 Save 82B flash and 1B RAM, fix compiler warning:
sketch/ultralcd.cpp:7212:61: warning: integer overflow in expression [-Woverflow]
  lcd_next_update_millis = millis() + (LCD_UPDATE_INTERVAL * 10000);
2018-07-13 17:42:47 +02:00
Robert Pelnar 68a5a4b74e FEEDRATE_LIMIT fix 2018-07-12 23:51:15 +02:00
Robert Pelnar f9f718e787 Config_PrintSettings fix 2018-07-12 23:50:41 +02:00
Robert Pelnar 37f34a1ba3 Config_PrintSettings (M503) - printf optimized (~800 bytes flash saved) 2018-07-12 23:40:04 +02:00
Robert Pelnar 007717bfd2 Disabled TMC2130 feedrate and acceleration limits (should be properly limited with M201-M203) 2018-07-12 19:04:44 +02:00
Marek Bel 070e6f49e8 Fix error in sine wave compression algorithm in tmc2130. This problem could manifest itself only for negative function slope, which is not used. 2018-07-12 18:56:11 +02:00
Marek Bel 2116262845 Fix *_MAX_ACCEL integer overflow. 2018-07-12 18:46:12 +02:00
Robert Pelnar 7c78559b0e Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang 2018-07-12 18:27:06 +02:00
Marek Bel bc1f416602 Fix compiler warning symbol __AVR redefined. 2018-07-12 18:26:29 +02:00
Robert Pelnar b35a212d15 PAT9125 optimalization (rewrited to C, 8bit sampling) 2018-07-12 18:11:07 +02:00
Marek Bel 2c00f065fd Fix error in recovering after power panic. (Function pointer was passed instead of function been called.)
It manifested istself as following compiler warnings:
sketch/Marlin_main.cpp: In function 'void print_physical_coordinates()':
sketch/Marlin_main.cpp:9065:86: warning: pointer to a function used in arithmetic [-Wpointer-arith]
  printf_P(_N("physical coordinates: (%.3f, %.3f, %.3f)\n"), st_get_position_mm[X_AXIS], st_get_position_mm[Y_AXIS], st_get_position_mm[Z_AXIS]);
                                                                                      ^
sketch/Marlin_main.cpp:9065:114: warning: pointer to a function used in arithmetic [-Wpointer-arith]
  printf_P(_N("physical coordinates: (%.3f, %.3f, %.3f)\n"), st_get_position_mm[X_AXIS], st_get_position_mm[Y_AXIS], st_get_position_mm[Z_AXIS]);
                                                                                                                  ^
sketch/Marlin_main.cpp:9065:142: warning: pointer to a function used in arithmetic [-Wpointer-arith]
  printf_P(_N("physical coordinates: (%.3f, %.3f, %.3f)\n"), st_get_position_mm[X_AXIS], st_get_position_mm[Y_AXIS], st_get_position_mm[Z_AXIS]);
                                                                                                                                              ^
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
 }
 ^
_Z18st_get_position_mmh+2
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
_Z18st_get_position_mmh+2
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
_Z18st_get_position_mmh+1
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
_Z18st_get_position_mmh+1
2018-07-12 18:06:07 +02:00
Robert Pelnar 410e911364 SWI2C for PAT9125 simplified/optimized 2018-07-12 17:55:38 +02:00
Marek Bel fb6aa72de9 Fix compiler warnings in sm4.c 2018-07-12 17:38:13 +02:00
Marek Bel 2b5e63eb7f Fix compiler warnings in language.c and document _SEC_LANG_TABLE macro. 2018-07-12 17:23:50 +02:00
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 07f6ddfb69 filament loading corrected 2018-07-11 22:34:32 +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
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