Merging updates #1804
Merged
Merging updates #1804
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changed VID & PID to new ones. Changed the layout accordingly to the prototype version.
|
@ITACAInnovation I've merged the latest changes from adafruit/master for you. Please start your changes from the latest commit to reduce merge conflicts. We have a git and GitHub guide here: https://learn.adafruit.com/contribute-to-circuitpython-with-git-and-github |
Thanks |
|
Please leave it open. I'll merge it into circuitpython once travis is happy with it. |
tannewt
approved these changes
Apr 16, 2019
jepler
pushed a commit
to jepler/circuitpython
that referenced
this pull request
Jan 10, 2022
This changes makemanifest.py & mpy-tool.py to merge string and mpy names into the same list (now mp_frozen_names). The various paths for loading a frozen module (mp_find_frozen_module) and checking existence of a frozen module (mp_frozen_stat) use a common function that searches this list. In addition, the frozen lookup will now only take place if the path starts with ".frozen", which needs to be added to sys.path. This fixes issues adafruit#1804, adafruit#2322, adafruit#3509, adafruit#6419. Signed-off-by: Jim Mussared <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request is for merging updates to the main branch.
Main updates PID and pinout.