Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Register
  • Sign in
  • F firmware
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Graph
    • Compare
  • Issues 74
    • Issues 74
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 29
    • Merge requests 29
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Releases
  • External wiki
    • External wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • card10card10
  • firmware
  • Merge requests
  • !269

fix(preload): Fix bad merge in ECG app

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged xiretza requested to merge xiretza/firmware:patch-1 into master Aug 27, 2019
  • Overview 2
  • Commits 1
  • Pipelines 1
  • Changes 1

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.

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: patch-1