Skip to content
Snippets Groups Projects

fix(preload): Fix bad merge in ECG app

Merged xiretza requested to merge xiretza/firmware:patch-1 into master

OFFSET was renamed to OFFSET_Y in ea5a30d9 ("add pause-mode"), while the call to draw_leds() in bc7e3b92 ("Add led activity to ECG app") still uses the old name. This causes an exception and the ECG app fails to proceed past the start screen.

Merge request reports

Merge request pipeline #3571 passed

Merge request pipeline passed for ed6b6ea9

Approval is optional

Merged by rahixrahix 5 years ago (Aug 27, 2019 4:25pm UTC)

Merge details

  • Changes merged into master with e597083f.
  • Did not delete the source branch.

Pipeline #3580 passed

Pipeline passed for e597083f on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
Please register or sign in to reply
Loading