Skip to content

Deduplicate USBHAL_STM_TARGET.h #4639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 27, 2017

Conversation

theotherjimmy
Copy link
Contributor

@theotherjimmy theotherjimmy commented Jun 26, 2017

I WILL MERGE THIS WHEN TRAVIS CI PASSES.

THIS FIXES TRAVIS CI ON MASTER.

So, there was a duplicate file, USBHAL_STM_TARGET.h that was merged to master. As with most duped files, it's hard to tell that they're duplicated if you get lucky on the search path ordering. We merged #4572 to master, only to find out, after it was merged, that it contained this duplicate file.

@theotherjimmy
Copy link
Contributor Author

@bcostm FYI

@theotherjimmy
Copy link
Contributor Author

@sg- @0xc0170 @adbridge Travis has passed. Please merge ASAP.

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 27, 2017

Waiting for uvisor to be able to merge

@jeromecoutant
Copy link
Collaborator

Hi
PR has to be completed by TARGET_DISCO_L475VG_IOT01A USB files ?

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 27, 2017

PR has to be completed by TARGET_DISCO_L475VG_IOT01A USB files ?

Can you elaborate? Is anything missing here? This is fixing Travis failure..

@jeromecoutant
Copy link
Collaborator

In this PR, USB .h files from TARGET_DISCO_L072CZ_LRWAN1 have been moved to avoid USBHAL_STM_TARGET.h file duplication.
I think there is the same issue with features/unsupported/USBDevice/USBDevice/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/USBHAL_STM_TARGET.h ?

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 27, 2017

I think there is the same issue with features/unsupported/USBDevice/USBDevice/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/USBHAL_STM_TARGET.h

Thanks, goign to pull this locally, check, and can push an update if needed, will report back

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 27, 2017

I can confirm there is duplication there as mentioned above. I'll send a separate patch to resolve that one.

@0xc0170 0xc0170 merged commit f530714 into ARMmbed:master Jun 27, 2017
@screamerbg
Copy link
Contributor

@theotherjimmy This conflicts with much bigger PR for USB support #4277. Given that this PR was introduced 18 hours ago and accepted, I hope that you are happy to do the extra mile and rebase my PR to fix the merge issues.

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.

4 participants