Skip to content

Conversation

tyeth
Copy link
Member

@tyeth tyeth commented Jul 8, 2025

This refactors the INA2xx components to avoid naming clashes in enums. Moving the driver includes and enum usage inside the cpp files keeps it scoped which avoids the conflicts between INA260 library and INA238/7/xx library.
We could probably do the same to resolve the naming conflict/redefined warnings from the vl ToF series (but that still builds).

@tyeth tyeth marked this pull request as ready for review July 11, 2025 12:20
@tyeth tyeth requested a review from brentru July 11, 2025 12:23
@tyeth
Copy link
Member Author

tyeth commented Jul 11, 2025

@brentru This PR is ready for review, see notes above about the refactor

Copy link
Member

@brentru brentru left a comment

Choose a reason for hiding this comment

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

@tyeth The refactor and splitting these drivers from .h to .cpp/.h makes sense to me. There are some syntactical things I'd like addressed before merging.

@tyeth tyeth requested a review from brentru July 11, 2025 14:57
@tyeth
Copy link
Member Author

tyeth commented Jul 11, 2025

Ah damn, I've now overflowed some of the 4mb boards with the INA23x PR, so they'll need swapping to the no-ota partition sooner rather than later 😞

@tyeth
Copy link
Member Author

tyeth commented Jul 11, 2025

I've been forced to do the no-ota swap today, as the INA238 PR was failing on the 4mb boards.
I've added the esptool definitions here (currently unmerged): adafruit/Wippersnapper_Boards#190
And this commit in INA23x PR adjusts them to build zips for esptool.
Will need to test this, by adding zip assets to latest release then prodding staging and try installer on these targets:
"magtag",
"metroesp32s2",
"feather_esp32s2",
"feather_esp32s2_tft",
"feather_esp32s2_reverse_tft",
"qtpy_esp32s2",
"feather_esp32s3_reverse_tft",
"qtpy_esp32s3_n4r2",
"feather_esp32s3_4mbflash_2mbpsram",
"feather_esp32s3_tft",

I'm going to temporarily migrate this to the no-OTA board repo, so we get the zip assets for <4MB boards

@tyeth
Copy link
Member Author

tyeth commented Jul 25, 2025

@brentru I'm going to merge this one in later today/Monday, having done the review feedback, then release Monday with the DF Robot C3. Unless you'd like to discuss the PR generally, further, or the include stuff.

@brentru
Copy link
Member

brentru commented Jul 25, 2025

@tyeth Okay, please tag me for re-review before merging

@tyeth
Copy link
Member Author

tyeth commented Jul 25, 2025

Already did, won't let me again unless I dismiss you first.
I think it's due to me not clicking resolved on the one remaining feedback

Copy link
Member

@brentru brentru left a comment

Choose a reason for hiding this comment

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

Nice, a lot of memory safety implemented too!

@tyeth tyeth merged commit 895bd13 into main Aug 8, 2025
127 of 129 checks passed
@tyeth tyeth deleted the ina238 branch August 8, 2025 15:01
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.

2 participants