Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug in powerloss after a pause and resume #19676

Closed
wants to merge 83 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
ac7ee4b
Release version 2.0.0
thinkyhead Dec 1, 2019
0673f33
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x
thinkyhead Dec 24, 2019
ee17051
Version 2.0.1
thinkyhead Dec 24, 2019
be64261
Merge commit '8bd6b60a0141fa892984f2d5b61f06eadbbf9a5f' into look_at_201
thinkyhead Jan 31, 2020
016e4c0
Version 2.0.2
thinkyhead Jan 27, 2020
1525c25
Merge commit 'dabf3939209fd8ea7f6a6327d764c16743aa22aa' into look_at_201
thinkyhead Jan 31, 2020
e6a7be9
Version 2.0.3
thinkyhead Jan 31, 2020
64ab254
Use a different Configurations branch for CI
thinkyhead Feb 4, 2020
4c76314
Scheduled action to bump the date on bugfix-2.0.x
thinkyhead Feb 4, 2020
d83382e
Add "PR Bad Target" workflow action
thinkyhead Feb 4, 2020
62b9d7d
Direct link to version configs
thinkyhead Feb 5, 2020
dd6a7ca
Fix out-of-order M0 after SD printing
thinkyhead Feb 10, 2020
f9aec26
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x
thinkyhead Feb 21, 2020
7e8505f
Version 2.0.4 Release
thinkyhead Feb 21, 2020
c505626
[cron] Bump distribution date (2020-02-22)
thinkyhead Feb 22, 2020
3543873
Use moves_free in ok_to_send
thinkyhead Feb 21, 2020
730690e
Hotfix for Babystepping
thinkyhead Feb 22, 2020
8670df0
CoreXY Babystepping hotfix
thinkyhead Feb 22, 2020
c41f3f8
Version 2.0.4.1 Release
thinkyhead Feb 22, 2020
282f467
Merge nightly patches
thinkyhead Feb 23, 2020
5f27f7d
Version 2.0.4.2 Release
thinkyhead Feb 23, 2020
2b759b9
Suppress "packed member" warning
thinkyhead Feb 23, 2020
089cc68
Merge nightly patches
thinkyhead Feb 24, 2020
c5f1ff9
Allow Z_SAFE_HOMING_POINT outside bed (#16945)
marciot Feb 24, 2020
130d039
Restore tabs in Makefile (#16944)
marciot Feb 24, 2020
42fa9fc
Fix card_eof error
thinkyhead Feb 24, 2020
1955eea
Version 2.0.4.3 Release
thinkyhead Feb 24, 2020
b29aae6
Merge 'bugfix-2.0.x' into 2.0.x
thinkyhead Feb 27, 2020
d6e767e
Version 2.0.4.4 Release
thinkyhead Feb 26, 2020
fa48fbb
Merge bugfix-2.0.x into 2.0.x
thinkyhead Mar 14, 2020
8dbbcfd
Version 2.0.5 Release
thinkyhead Mar 14, 2020
129b1bb
Merge nightly patches
thinkyhead Mar 16, 2020
d37bfa3
Version 2.0.5.1 Release
thinkyhead Mar 16, 2020
efc1926
Merge patches from bugfix-2.0.x
thinkyhead Mar 24, 2020
7124b21
Version 2.0.5.2
thinkyhead Mar 24, 2020
0f9a14d
Merge latest patches
thinkyhead Mar 31, 2020
015c4e6
Version 2.0.5.3
thinkyhead Mar 31, 2020
0518dec
Correct link to Configurations (#17370)
thisiskeithb Apr 1, 2020
e4d8336
Fix XYZ types multiplication/division (#17826)
MathiasGartner May 2, 2020
c352aeb
Remove "dev" branch reference (for now) (#18242)
Jun 9, 2020
a73e610
Add Close / Lock actions
thinkyhead Jun 24, 2020
842dea4
Updated lock / unlock actions
thinkyhead Jun 30, 2020
ed71108
Patch Bad PR action
thinkyhead Jul 2, 2020
7bf89f2
Two lock-closed per day
thinkyhead Jul 4, 2020
481b8ff
Limit actions to main
thinkyhead Jul 5, 2020
697ef26
Add CI for pushed commits
thinkyhead Jul 5, 2020
ee4910c
Temporarily use patched lock-threads
thinkyhead Jul 6, 2020
354a9e5
Lock threads updated
thinkyhead Jul 8, 2020
5513e67
2.0.5.4 : Use ststm32 < 6.2
thinkyhead Jul 9, 2020
5e0958e
Fix pid_debug_flag
thinkyhead Jul 11, 2020
c1b2379
Specify supported library versions
thinkyhead Jul 11, 2020
7ed66d0
LiquidCrystal@1.0.0 for LPC
thinkyhead Jul 13, 2020
b73ac40
LPC fix NeoPixel fork
p3p Jul 14, 2020
8b637e4
Update links, README, contributing, etc.
thinkyhead Jul 24, 2020
5e5daf1
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into release_206
thinkyhead Jul 27, 2020
92076c6
Marlin Release 2.0.6
thinkyhead Jul 27, 2020
84b96d3
Hotfix for first round of post-release hiccups
thinkyhead Jul 28, 2020
de37196
DISABLE_DEBUG required to free Robin nano Z_DIR_PIN (#18832)
rhapsodyv Jul 29, 2020
b160e8b
Fix NEOPIXEL_LED compile w/out PRINTER_EVENT_LEDS (#18824)
MoellerDi Jul 29, 2020
3dd21a2
Add TEMP_PROBE_PIN for Einsy Rambo (#18823)
natemason Jul 29, 2020
5804761
Fix Cancel Objects index display (zero-based) (#18841)
swissnorp Jul 29, 2020
cf1c57a
Fix UNKNOWN_Z_NO_RAISE in G28
thinkyhead Jul 30, 2020
121cd42
In G28 Z is sort-of known
thinkyhead Jul 30, 2020
ad59adf
Update include_tree
thinkyhead Jul 28, 2020
37b56d6
Add monitor_flags
thinkyhead Jul 30, 2020
01359cf
Fix Duplicator i3 Plus pin diagram (#18862)
andrivet Aug 3, 2020
fa5ca86
Fix FLYF407ZG pins (#18865)
FLYmaker Aug 3, 2020
02a500d
Fix Spindle/Laser PWM DC (#18871)
ellensp Aug 3, 2020
978e0e4
No mks_robin extra_scripts in Trigorilla build (#18872)
TheNitek Aug 3, 2020
ad2d1b6
Fix Z height after tool change (#18951)
cbaugher Aug 7, 2020
242064f
Move Cancel Object menu, fix canceled item index (#18930)
swissnorp Aug 6, 2020
1d92bad
Update Italian language (#18886)
GMagician Aug 4, 2020
da144dc
Update Slovak language (#18884)
rmoravcik Aug 4, 2020
fd9c698
HW PWM sanity checks for SPINDLE_LASER_FREQUENCY (#18947)
ellensp Aug 7, 2020
96e29cd
Fix IS_PROBE_PIN macro (#19024)
jufimu12 Aug 16, 2020
b90e7c4
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x
thinkyhead Aug 28, 2020
ca194ca
Version 2.0.6.1
thinkyhead Aug 28, 2020
9913333
Auto-label Feature Requests (#19258)
thisiskeithb Sep 4, 2020
a52afd2
Update stale issue message and parameters (#19412)
sjasonsmith Sep 17, 2020
aac0326
Merge bugfix-2.0.x into 2.0.x
thinkyhead Sep 29, 2020
e817773
Marlin 2.0.7
thinkyhead Sep 29, 2020
a7f3343
Keep HAL tasks running during PID Autotune (#19671)
rhapsodyv Oct 10, 2020
3202621
bugfix powerloss
SHBnik Oct 10, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
---
name: Bug report
about: Report a bug in Marlin
title: "[BUG] (short description)"
labels: ''
assignees: ''

---

<!--

Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md

Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use one of the support links at https://github.com/MarlinFirmware/Marlin/issues/new/choose

Before filing an issue be sure to test the "bugfix" branches to see whether the issue has been resolved.

-->

### Bug Description

<!-- Description of the bug -->

### My Configurations

**Required:** Please include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.

### Steps to Reproduce

<!-- Please describe the steps needed to reproduce the issue -->

1. [First Step]
2. [Second Step]
3. [and so on...]

**Expected behavior:** [What you expect to happen]

**Actual behavior:** [What actually happens]

#### Additional Information

* Provide pictures or links to videos that clearly demonstrate the issue.
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
blank_issues_enabled: false
contact_links:
- name: Marlin Documentation
url: http://marlinfw.org/
about: Lots of documentation on installing and using Marlin.
- name: MarlinFirmware Facebook group
url: https://www.facebook.com/groups/1049718498464482
about: Please ask and answer questions here.
- name: Marlin on Discord
url: https://discord.gg/n5NJ59y
about: Join the Discord server for support and discussion.
- name: Marlin Discussion Forum
url: http://forums.reprap.org/list.php?415
about: A searchable web forum hosted by RepRap dot org.
- name: Marlin Videos on YouTube
url: https://www.youtube.com/results?search_query=marlin+firmware
about: Tutorials and more from Marlin users all around the world. Great for new users!
35 changes: 35 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
name: Feature request
about: Request a Feature
title: "[FR] (feature request title)"
labels: 'T: Feature Request'
assignees: ''

---

<!--

Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md

Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use one of the support links at https://github.com/MarlinFirmware/Marlin/issues/new/choose

Before filing an issue be sure to test the "bugfix" branches to see whether the issue has been resolved.

-->

### Description

<!-- Description of the requested feature -->

### Feature Workflow

<!-- Please describe the feature's behavior, user interaction, etc. -->

1. [First Action]
2. [Second Action]
3. [and so on...]

#### Additional Information

* Provide pictures or links that demonstrate a similar feature or concept.
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.
30 changes: 3 additions & 27 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,11 @@
<!--
# NO SUPPORT REQUESTS PLEASE

Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.0.x/.github/code_of_conduct.md
Do you want to ask a question? Are you looking for support? Please don't post here. Support Requests posted here will be automatically closed!

Do you want to ask a question? Are you looking for support? Please don't post here. Instead use one of the following options:
Instead use one of the following options:

- The Marlin Firmware forum at https://reprap.org/forum/list.php?415
- The MarlinFirmware Facebook Group at https://www.facebook.com/groups/1049718498464482/
- The MarlinFirmware Discord Server at https://discord.gg/n5NJ59y.

Before filing an issue be sure to test the latest "bugfix" branch to see whether the issue is already addressed.

-->

### Description

<!-- Description of the bug or requested feature -->

### Steps to Reproduce

<!-- If this is a Bug Report, please describe the steps needed to reproduce the issue -->

1. [First Step]
2. [Second Step]
3. [and so on...]

**Expected behavior:** [What you expect to happen]

**Actual behavior:** [What actually happens]

#### Additional Information

* Include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.
* Provide pictures or links to videos that clearly demonstrate the issue.
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.
35 changes: 35 additions & 0 deletions .github/workflows/bump-date.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#
# bump-date.yml
# Bump the distribution date once per day
#

name: Bump Distribution Date

on:
schedule:
- cron: '0 0 * * *'

jobs:
bump_date:
name: Bump Distribution Date
if: github.repository == 'MarlinFirmware/Marlin'

runs-on: ubuntu-latest

steps:

- name: Check out bugfix-2.0.x
uses: actions/checkout@v2
with:
ref: bugfix-2.0.x

- name: Bump Distribution Date
run: |
# Inline Bump Script
DIST=$( date +"%Y-%m-%d" )
eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \
git config user.name "${GITHUB_ACTOR}" && \
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && \
git add . && \
git commit -m "[cron] Bump distribution date ($DIST)" && \
git push
33 changes: 33 additions & 0 deletions .github/workflows/check-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#
# check-pr.yml
# Close PRs directed at release branches
#

name: PR Bad Target

on:
pull_request:
branches:
- 1.0.x
- 1.1.x
- 2.0.x

jobs:
bad_target:
name: PR Bad Target
if: github.repository == 'MarlinFirmware/Marlin'

runs-on: ubuntu-latest

steps:
- uses: peter-evans/close-pull@v1
with:
delete-branch: false
comment: >
Thanks for your contribution! Unfortunately we can't accept PRs directed at release branches. We make patches to the bugfix branches and only later do we push them out as releases.

Please redo this PR starting with the `bugfix-2.0.x` branch and be careful to target `bugfix-2.0.x` when resubmitting the PR.

It may help to set your fork's default branch to `bugfix-2.0.x`.

See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.
27 changes: 27 additions & 0 deletions .github/workflows/close-stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#
# close-stale.yml
# Close open issues after a period of inactivity
#

name: Close Stale Issues

on:
schedule:
- cron: "22 1 * * *"

jobs:
stale:
name: Close Stale Issues
if: github.repository == 'MarlinFirmware/Marlin'

runs-on: ubuntu-latest

steps:
- uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue has had no activity in the last 30 days. Please add a reply if you want to keep this issue active, otherwise it will be automatically closed within 7 days.'
days-before-stale: 30
days-before-close: 7
stale-issue-label: 'stale-closing-soon'
exempt-issue-labels: 'T: Feature Request'
32 changes: 32 additions & 0 deletions .github/workflows/lock-closed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#
# lock-closed.yml
# Lock closed issues after a period of inactivity
#

name: Lock Closed Issues

on:
schedule:
- cron: '0 1/13 * * *'

jobs:
lock:
name: Lock Closed Issues
if: github.repository == 'MarlinFirmware/Marlin'

runs-on: ubuntu-latest

steps:
- uses: dessant/lock-threads@v2
with:
github-token: ${{ github.token }}
process-only: 'issues'
issue-lock-inactive-days: '60'
issue-exclude-created-before: ''
issue-exclude-labels: 'no-locking'
issue-lock-labels: ''
issue-lock-comment: >
This issue has been automatically locked since there
has not been any recent activity after it was closed.
Please open a new issue for related bugs.
issue-lock-reason: ''
22 changes: 22 additions & 0 deletions .github/workflows/unlock-reopened.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#
# unlock-reopened.yml
# Unlock an issue whenever it is re-opened
#

name: "Unlock reopened issue"

on:
issues:
types: [reopened]

jobs:
unlock:
name: Unlock Reopened
if: github.repository == 'MarlinFirmware/Marlin'

runs-on: ubuntu-latest

steps:
- uses: OSDKDev/unlock-issues@v1.1
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
4 changes: 2 additions & 2 deletions Marlin/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* Marlin release version identifier
*/
//#define SHORT_BUILD_VERSION "bugfix-2.0.x"
//#define SHORT_BUILD_VERSION "2.0.7"

/**
* Verbose version identifier which should contain a reference to the location
Expand All @@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
//#define STRING_DISTRIBUTION_DATE "2019-07-10"
//#define STRING_DISTRIBUTION_DATE "2020-07-09"

/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
Expand Down
7 changes: 7 additions & 0 deletions Marlin/src/feature/pause.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@
#include "../libs/buzzer.h"
#endif

#if ENABLED(POWER_LOSS_RECOVERY)
#include "powerloss.h"
#endif

#include "../libs/nozzle.h"
#include "pause.h"

Expand Down Expand Up @@ -637,6 +641,9 @@ void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_le
// Now all extrusion positions are resumed and ready to be confirmed
// Set extruder to saved position
planner.set_e_position_mm((destination.e = current_position.e = resume_position.e));

// Force to save the resume position to update the z axis value
TERN_(POWER_LOSS_RECOVERY, if (recovery.enabled) recovery.save(true));

TERN_(HAS_LCD_MENU, lcd_pause_show_message(PAUSE_MESSAGE_STATUS));

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/inc/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* Release version. Leave the Marlin version or apply a custom scheme.
*/
#ifndef SHORT_BUILD_VERSION
#define SHORT_BUILD_VERSION "bugfix-2.0.x"
#define SHORT_BUILD_VERSION "2.0.7"
#endif

/**
Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/module/temperature.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,11 @@ volatile bool Temperature::raw_temps_ready = false;

goto EXIT_M303;
}

// Run HAL idle tasks
TERN_(HAL_IDLETASK, HAL_idletask());

// Run UI update
TERN(DWIN_CREALITY_LCD, DWIN_Update(), ui.update());
}
wait_for_heatup = false;
Expand Down
Loading