Skip to content

Additional board definitions for #89 #124

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Additional board definitions for #89 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63f3280
Update default.yml
Doom4535 May 29, 2019
61696bd
Update default.yml
Doom4535 May 29, 2019
9342810
This is in reference to #89
Doom4535 May 29, 2019
13265f3
89 adding boards (#1)
Doom4535 May 29, 2019
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
6 changes: 5 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,13 @@ matrix:
- os: osx
env: BADGE=linux

#before_install: gem install bundler -v 1.15.4
before_install:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not necessarily opposed to whatever is happening here but if you could give some context on how this relates to the problem being solved, that would be helpful (up to and including opening an issue).

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am indifferent to it ultimately, that is there because my CI is defaulting to bundler 2.01, which complains about not being compatible with the older version. I set the version so that I don't cause any issues with anyone else.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I'm understanding you correctly, there is a more recent version of bundler that we could be using? I wouldn't mind taking some time to update that if it's causing problems -- please open an issue with the details of what you're seeing and I'll take a look at it.

- gem install bundler -v 1.15.4
- bundle _1.15.4_ install
script:
- g++ -v
#- gem install bundle -v 1.15.4
#- bundle _1.15_ install
- bundle install
- bundle exec rubocop --version
- bundle exec rubocop -D .
Expand Down
46 changes: 44 additions & 2 deletions misc/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,26 @@ packages:
url: https://dl.espressif.com/dl/package_esp32_index.json

platforms:


nano_v2:
board: arduino:avr:nano
package: arduino:avr
gcc:
features:
defines:
- __AVR_ATmega168__
warnings:
flags:
nano_v3: &nano_p
board: arduino:avr:nano
package: arduino:avr
gcc:
features:
defines:
- __AVR_ATmega328__
warnings:
flags:
nano: *nano_p
uno:
board: arduino:avr:uno
package: arduino:avr
Expand All @@ -30,7 +49,13 @@ platforms:
gcc:
features:
defines:
- __AVR_ATmega328__
# The due should use the ATSAM3X8E; however, that component does not seem
# to be defined for the Godmode tests/components
# The next closest part would be the AVR_ATmega2560 as both boards
# use the mega form factor
Comment on lines +52 to +55
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Doom4535 can you explain this comment a bit? I'm not sure why the fix belongs here and not in Godmode.h

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's been a while since I looked at this, I believe I made that change because the Arduino Duo is most like an Arduino Mega based on pinout. Updating godmode.h to include the equivalent for the SAM board would be the technically correct result, and allow for including support for any extra features the SAM board supports that can't be done with the AVR board.

I'm not sure what the replacement should be, on windows it would likely be something inside of %LocalAppData%\Arduino15\packages\arduino\hardware\sam, maybe %LocalAppData%\Arduino15\packages\arduino\hardware\sam\1.6.12\variants\arduino_due_x\variant.h?

#- __ATSAM3X8E__
- __AVR_ATmega2560__
#- __AVR_ATmega328__
warnings:
flags:
zero:
Expand Down Expand Up @@ -92,6 +117,23 @@ platforms:
defines:
warnings:
flags:
grand_central_m4:
board: adafruit:samd:adafruit_grand_central_m4
package: adafruit:samd
gcc:
features:
defines:
warnings:
flags:
mega1280:
board: arduino:avr:mega:cpu=atmega1280
package: arduino:avr
gcc:
features:
defines:
- __AVR_ATmega1280__
warnings:
flags:
mega2560:
board: arduino:avr:mega:cpu=atmega2560
package: arduino:avr
Expand Down