Skip to content

fix CPB SPI pin definitions#3583

Closed
jerryneedell wants to merge 62 commits into
adafruit:6.0.xfrom
jerryneedell:jerryn_cpb
Closed

fix CPB SPI pin definitions#3583
jerryneedell wants to merge 62 commits into
adafruit:6.0.xfrom
jerryneedell:jerryn_cpb

Conversation

@jerryneedell

@jerryneedell jerryneedell commented Oct 21, 2020

Copy link
Copy Markdown
Collaborator

fixes #3582

tested on CPB with mini-tft featherwing.

astrobokonon and others added 30 commits September 19, 2020 13:38
@astrobokonon
Add gateway, subnet, and rssi info for current connected AP
04ffd0d 
ap_rssi is a bound method, which I'm not keen on, but it works
@astrobokonon
Simplify now that I have it working
bc8863a 
still need to figure out the bound method business
@astrobokonon
Additional error handling
2fa269c
@astrobokonon
Try to reuse/share existing objects
a77966a
@astrobokonon
Merge branch 'main' of https://github.com/adafruit/circuitpython into…
b9968ea 
… esp32s2-morenet
@astrobokonon
Fix ap_rssi bound_method
deefeec 
Forgot to make it a property!
@astrobokonon
Enable DNS info
66d5573
@astrobokonon
Merge branch 'main' of https://github.com/adafruit/circuitpython into…
7b7ef8e 
… esp32s2-morenet
@astrobokonon
Add ap_ssid and ap_bssid
2a4a244
@cwalther
Fix inconsistent supervisor heap.
d6d02c6 
When allocations were freed in a different order from the reverse of how they were allocated (leaving holes), the heap would get into an inconsistent state, eventually resulting in crashes.

free_memory() relies on having allocations in order, but allocate_memory() did not guarantee that: It reused the first allocation with a NULL ptr without ensuring that it was between low_address and high_address. When it belongs to a hole in the allocated memory, such an allocation is not really free for reuse, because free_memory() still needs its length.

Instead, explicitly mark allocations available for reuse with a special (invalid) value in the length field. Only allocations that lie between low_address and high_address are marked that way.
@cwalther
Allow allocate_memory() to reuse holes when matching exactly.
5bdb8c4 
This requires recovering the pointer of the allocation, which could be done by adding up neighbor lengths, but the simpler way is to stop NULLing it out in the first place and instead mark an allocation as freed by the client by setting the lowest bit of the length (which is always zero in a valid length).
@cwalther
When there is not enough free space, but a matching hole on the other…
be8092f 
… side, use it.
@astrobokonon
Merge branch 'main' of https://github.com/adafruit/circuitpython into…
99f27be 
… esp32s2-morenet
@jensechu
displayio: Pass transparent_color to ColorConverter
57b4492 
Signed-off-by: Jensen <jensechu@gmail.com>
@jensechu
displayio: Add make_transparent and make_opaque to ColorConvertor
b359e29
@jensechu
displayio: Add make_transparent to ColorConverter
3370196
@jensechu
Merge branch 'main' into color-converter-transparency
de9ea47
@jensechu
displayio: ColorConverter handle if opaque color is black
2517e4b
@jensechu
Merge branch 'color-converter-transparency' of github.com:jensechu/ci…
3c5a086 
…rcuitpython into color-converter-transparency
@jensechu
displayio: new translation strings
cb0a4ab
@jensechu
displayio: Remove verbose error
b02a5bc
@gamblor21
Added max size check to recv_into
fa75231
@astrobokonon
Disable the long way and return an ap_info object
b336039 
still needs work and cleanup
@astrobokonon
Cleaned up and now testing
9d840aa
@gamblor21
Updated translation
645382d
@microdev1
Update port status in readme
de328c3
@gamblor21
Merge branch 'main' into recv_into_size_check
8e6d3e5
@jensechu
displayio: Add in opaque pixel option for future
74c07a4
@jensechu
Merge branch 'main' into color-converter-transparency
575b2e6
@jensechu
displayio: Remove trailing whitespace
fc3f2a3
microdev1 and others added 8 commits October 20, 2020 09:23
@microdev1
Update readme
1338712
@jepler
zh_Latn_pinyin: Use ASCII alternatives to fullwidth chars
543073b
@cwalther
Fix missing nproc on macOS.
1eab069 
396979a breaks building on macOS: `nproc` is a Linux thing, use a cross-platform alternative.
@tannewt
Use one lto partition
8beb36c 
This leads to smaller code size at the expense of slower linking.

We can turn partitioning back on with GCC10 because it produces smaller code.
@tannewt
Merge pull request #3577 from cwalther/nproc
1092890 
Fix missing `nproc` on macOS
@tannewt
Merge pull request #3566 from microDev1/patch-1
098fd3e 
Update port status in readme
@tannewt
Merge pull request #3529 from jensechu/color-converter-transparency
1a67740 
displayio: Pass transparent_color to ColorConverter
@jerryneedell
fix CPB SPI pin definitions
75acc2f
@ladyada

ladyada commented Oct 21, 2020

Copy link
Copy Markdown
Member

you dont by chance have a tft gizmo or eink gizmo?

@jerryneedell

jerryneedell commented Oct 21, 2020

Copy link
Copy Markdown
Collaborator Author

you dont by chance have a tft gizmo or eink gizmo?

I have a tft-gizmo

@ladyada

ladyada commented Oct 21, 2020

Copy link
Copy Markdown
Member

could you test with that too?cause thats what we use for SPI interfacing!

@jerryneedell

jerryneedell commented Oct 21, 2020

Copy link
Copy Markdown
Collaborator Author

could you test with that too?cause thats what we use for SPI interfacing!

sure -- will do.

@jerryneedell

jerryneedell commented Oct 21, 2020

Copy link
Copy Markdown
Collaborator Author

@ladyada
yikes! this will be a problem

the tft-GiZMO uses A3 for the backlight and uses SDA for MOSI ???

        self, *, spi=None, cs=board.RX, dc=board.TX, backlight=board.A3, rotation=180
    ):
        displayio.release_displays()
        if spi is None:
            import busio  # pylint: disable=import-outside-toplevel

            spi = busio.SPI(board.SCL, MOSI=board.SDA)

@jerryneedell

jerryneedell commented Oct 21, 2020

Copy link
Copy Markdown
Collaborator Author

@ladyada
yikes! this will be a problem

the tft-GiZMO uses A3 for the backlight and uses SDA for MOSI ???

        self, *, spi=None, cs=board.RX, dc=board.TX, backlight=board.A3, rotation=180
    ):
        displayio.release_displays()
        if spi is None:
            import busio  # pylint: disable=import-outside-toplevel

            spi = busio.SPI(board.SCL, MOSI=board.SDA)

ah -- but since it does not call board.SPI() it should be OK

@ladyada

ladyada commented Oct 21, 2020

Copy link
Copy Markdown
Member

yeah we 'recycle' the I2C pins - to keep pin compatibilitiy with CPX!

@jerryneedell

jerryneedell commented Oct 21, 2020 •
edited
Loading

Copy link
Copy Markdown
Collaborator Author

Tested on CPB with TFT gizmo -- no problems.

ladyada
ladyada previously approved these changes Oct 21, 2020
View reviewed changes
@jerryneedell

jerryneedell commented Oct 21, 2020

Copy link
Copy Markdown
Collaborator Author

FYI -- this came up in a forum question about using a mini-tft with the CPB. https://forums.adafruit.com/viewtopic.php?f=58&t=170634

@jerryneedell

jerryneedell commented Oct 21, 2020

Copy link
Copy Markdown
Collaborator Author

@jepler I assume this CI failure is the same as ones that have been occurring for the past few days. Anything I need to do about it?

@tannewt tannewt changed the base branch from main to 6.0.x October 21, 2020 19:52
@tannewt tannewt dismissed ladyada’s stale review October 21, 2020 19:52

The base branch was changed.

@tannewt tannewt changed the base branch from 6.0.x to main October 21, 2020 19:53
@tannewt

tannewt commented Oct 21, 2020

Copy link
Copy Markdown
Member

@jerryneedell Would you mind rebasing this onto 6.0.x? That way it'll be fixed for 6.0.0

@jerryneedell

jerryneedell commented Oct 21, 2020

Copy link
Copy Markdown
Collaborator Author

@jerryneedell Would you mind rebasing this onto 6.0.x? That way it'll be fixed for 6.0.0

Sure -- How do I do that?

@jerryneedell jerryneedell changed the base branch from main to 6.0.x October 21, 2020 20:48
@jerryneedell

jerryneedell commented Oct 21, 2020

Copy link
Copy Markdown
Collaborator Author

@jerryneedell Would you mind rebasing this onto 6.0.x? That way it'll be fixed for 6.0.0

Sure -- How do I do that?

OK -- I think I did that correctly. If not, let me know.

@jerryneedell

jerryneedell commented Oct 21, 2020

Copy link
Copy Markdown
Collaborator Author

But why does it now have all these other changes associated with it?

@jerryneedell

jerryneedell commented Oct 21, 2020

Copy link
Copy Markdown
Collaborator Author

PR is corrupted -- closing and will resubmit

@jerryneedell jerryneedell mentioned this pull request Oct 21, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ladyada ladyada ladyada left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

CPB default SPI pins incorrect