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

Add images designed by Abbie Brooks. #114

Merged
merged 1 commit into from Nov 29, 2015
Merged

Add images designed by Abbie Brooks. #114

merged 1 commit into from Nov 29, 2015

Conversation

ntoll
Copy link
Contributor

@ntoll ntoll commented Nov 28, 2015

This branch introduces two changes:

  • Inclusion of the designs for additional images created by 11 year old Abbie Brooks.
  • Recognition of Abbie's efforts in the authors list in the this module.

QDEF(MP_QSTR_SWORD, (const byte*)"\x98\x05" "SWORD")
QDEF(MP_QSTR_GIRAFFE, (const byte*)"\x7d\x07" "GIRAFFE")
QDEF(MP_QSTR_SKULL, (const byte*)"\x48\x05" "SKULL")
QDEF(MP_QSTR_BROLLY, (const byte*)"\x63\x06" "BROLLY")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Maybe avoid the slang here and just use "umbrella"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I did wonder. But I did take two attempts (speed typing) to type UMBRELLA so went for "brolly". :-) Actually Abbie calls it an umbrella so I'll stick with that. Change incoming.

@ntoll
Copy link
Contributor Author

ntoll commented Nov 28, 2015

For the record, this work was donated via emails exchanged with Abbie's mum Sarah Brooks. This is, obviously, an indication of parental consent for Abbie's work to be included in the micro:bit version of MicroPython. :-)

@dpgeorge
Copy link
Member

Very good! I'm happy to merge (rebase needed?), but maybe "stickman" should be something gender neutral like "stick_figure" or "stick_person"?

@ntoll
Copy link
Contributor Author

ntoll commented Nov 29, 2015

I'll do that now. Give me 10 mins.

@ntoll
Copy link
Contributor Author

ntoll commented Nov 29, 2015

Please merge! :-)

@dpgeorge dpgeorge merged commit befbec0 into master Nov 29, 2015
@dpgeorge dpgeorge deleted the abbie-images branch February 14, 2016 21:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants