shared/tinyusb: Allow ports to use 1200bps-touch without other CDC code. #15189
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #15189 +/- ##
=======================================
Coverage 98.39% 98.39%
=======================================
Files 161 161
Lines 21204 21204
=======================================
Hits 20864 20864
Misses 340 340 ☔ View full report in Codecov by Sentry. |
|
Code size report: |
This fixes the build for some esp32 and nrf boards (for example `ARDUINO_NANO_33_BLE_SENSE` and `ARDUINO_NANO_ESP32`) due to commit c98789a. Changes are: - Allow the CDC TX/RX functions in `mp_usbd_cdc.c` to be enabled separately to those needed for `MICROPY_HW_USB_CDC_1200BPS_TOUCH`. - Add `MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDC` option as a temporary workaround for the nrf port to use. - Declare `mp_usbd_line_state_cb()` in a header as a public function. - Fix warning with type cast of `.callback_line_state_changed`. Signed-off-by: Damien George <damien@micropython.org>
fec816c to
84a8f7e
Compare
|
@dpgeorge Would this have been caught pre-merge if we added one or two more boards in CI? |
Yes. But there are 160 boards that we support (not including variants) and not all can be built for the CI... Probably though it would be worth adding one of the ones that failed here. Preferably one that's quick to build and doesn't slow down the CI more. |
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 fixes the build for some esp32 and nrf boards (for example
ARDUINO_NANO_33_BLE_SENSEandARDUINO_NANO_ESP32) due to commit c98789a. Changes are:Allow the CDC TX/RX functions in
mp_usbd_cdc.cto be enabled separately to those needed forMICROPY_HW_USB_CDC_1200BPS_TOUCH.Add
MICROPY_EXCLUDE_SHARED_TINYUSB_USBD_CDCoption as a temporary workaround for the nrf port to use.Declare
mp_usbd_line_state_cb()in a header as a public function.Fix warning with type cast of
.callback_line_state_changed.