Skip to content

[bugfix-1.1.x] Platformio - automate build & environment selection #10561

Merged
thinkyhead merged 1 commit intoMarlinFirmware:bugfix-1.1.xfrom
Bob-the-Kuhn:auto-build-bugfix-1.1.x
Apr 28, 2018
Merged

[bugfix-1.1.x] Platformio - automate build & environment selection #10561
thinkyhead merged 1 commit intoMarlinFirmware:bugfix-1.1.xfrom
Bob-the-Kuhn:auto-build-bugfix-1.1.x

Conversation

@Bob-the-Kuhn
Copy link
Contributor

This is the bugfix-1.1.x version of PR #10503. See that PR for details.

The changes to implement this feature are:

  • copy auto_build.py from 2.0.x into bugfix-1.1.x
  • copy process-palette.json from 2.0.x into bugfix-1.1.x
  • copy the comments in pins.h from 2.0.x into bugfix-1.1.x
  • change platformio.ini to treat the teensy20 boards as is done in 2.0.x. This consists of replacing the Brainwave Pro, Printrboard and Printrboard rev F environments with one called teensy20. The only real change is that the board identifying flags were dropped. These flags were not used.

This has been tested on a 2560 board and a 1284 board.

@thinkyhead thinkyhead force-pushed the auto-build-bugfix-1.1.x branch from 991bb5d to c22180b Compare April 28, 2018 16:29
@thinkyhead
Copy link
Member

Easiest way to fix it up is to use git rebase -i and just "drop" the two extra commits. No need to move to a whole new fork.

@thinkyhead thinkyhead merged commit 382aa96 into MarlinFirmware:bugfix-1.1.x Apr 28, 2018
@thinkyhead
Copy link
Member

This will soon pass Travis CI, no doubt: 382aa96

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants