Added Unique ID Functions/Updated Support Matrix #527
Merged
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
|
Hold of on merging. Just compiled on my new Feather M0 Express, and I'm getting some weird results: |
|
Why is that result weird? |
|
yeah, nevermind. I was actually getting errors on the |
tannewt
requested changes
Jan 15, 2018
| #endif | ||
|
|
||
| for (int i=0; i<4; i++) { | ||
| raw_id[i] = *id_addresses[i]; |
There was a problem hiding this comment.
You'll need a loop within this one to save the four bytes of each uint32_t into four slots in raw_id.
| uint32_t* id_addresses[2] = {(uint32_t *) 0x060, (uint32_t *) 0x064}; | ||
|
|
||
| for (int i=0; i<2; i++) { | ||
| raw_id[i] = *id_addresses[i]; |
| @@ -32,7 +32,7 @@ | |||
|
|
|||
| #include "py/objproperty.h" | |||
|
|
|||
| #include "py/objproperty.h" | |||
| #include "py/objproperty.h" // <-- is this doubled for a reason? @sommersoft | |||
There was a problem hiding this comment.
Just an oversight, please remove.
| //| Returns a bytearray object. Use the CPython ``struct`` | ||
| //| library to unpack the bytearray. Unpacked result is | ||
| //| a singleton (single item tuple). | ||
| //| _Note: ``struct`` is currently not available on the nRF port._ |
There was a problem hiding this comment.
I wouldn't mention struct here. People can do what they want with it afterwards.
| @@ -93,9 +93,34 @@ const mp_obj_property_t mcu_processor_temperature_obj = { | |||
| }, | |||
| }; | |||
|
|
|||
| //| .. attribute:: unique id | |||
There was a problem hiding this comment.
..attribute:: uid It should match the entry in mcu_processor_locals_dict_table below.
|
Changes made. SAMD tested on Feather M0 Express; nRF tested on Feather nRF52. |
tannewt
previously approved these changes
Jan 16, 2018
|
Please rebase these onto latest master. Ping me on discord if you need help. |
shared_bindings/index.rst: updated Support Matrix format as discussed in PR adafruit#503 & Issue adafruit#448.
shared-bindings/microcontroller/Processor.c & .h: added UID lookup functionality for use with all ports. See Issue adafruit#462.
ports/atmel-samd/common-hal/microcontroller/Processor.c & .h: added UID lookup function for SAMD ports. See Issue adafruit#462.
shared-bindings/index.rst: corrected term agreement/grammar for previous Support Matrix update. See PR adafruit#503 & Issue adafruit#448.
/esp8266/common-hal/microcontroller.h: added UID length definition
/esp8266/common-hal/microcontroller/Processor.c: added UID function
modified: ports/atmel-samd/common-hal/microcontroller/Processor.h modified: shared-bindings/microcontroller/Processor.c modified: shared-bindings/microcontroller/Processor.h
modified: ports/atmel-samd/common-hal/microcontroller/Processor.h modified: shared-bindings/microcontroller/Processor.c modified: shared-bindings/microcontroller/Processor.h
/ports/nrf/common-hal/microcontroller/Processor.h: add UID length definition.
/ports/nrf/common-hal/microcontroller/Processor.c: add UID function. See Issue adafruit#462.
/shared-bindings/microcontroller/Processor.c: added a note to `microcontroller.cpu.uid` (Issue adafruit#462) that ``struct`` is not currently available on the nRF port.
/ports/atmel-samd/common-hal/microcontroller.c: corrected `raw_id[]` assignment per requested changes in PR adafruit#527
/ports/nrf/common-hal/microcontroller.c: corrected `raw_id[]` assignment per requested changes in PR adafruit#527
/shared-bindings/microcontroller/Processor.c: corrected Sphinx documentation per requested changes in PR adafruit#527
tannewt
approved these changes
Jan 16, 2018
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.
/shared-bindings/index.rst: updated Support Matrix format as discussed in PR #503 & Issue #448.
Issue #462 :
/shared-bindings/microcontroller/Processor.x:
structfor bytearray unpacking./ports/XXXX/common-hal/microcontroller/Processor.x:
machine.unique_id(which is still available).P.S. I apologize for the merges/etc...trying to minimize the squashes necessary. Not sure I made that mark...