Skip to content

fix STM USB config after L4 ,F4, F7 file tree changes #3738

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Mar 22, 2017
Merged

fix STM USB config after L4 ,F4, F7 file tree changes #3738

merged 3 commits into from
Mar 22, 2017

Conversation

jamike
Copy link
Contributor

@jamike jamike commented Feb 10, 2017

Description

fix STM USB config after L4 ,F4, F7 file tree changes

Status

READY

@jamike jamike mentioned this pull request Feb 10, 2017
Merged
@sg-
Copy link
Contributor

sg- commented Feb 10, 2017

/morph test-nightly

@mbed-bot
Copy link

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test-nightly

Output

mbed Build Number: 1554

Test failed!

@sg-
Copy link
Contributor

sg- commented Feb 10, 2017

/morph test-nightly

@mbed-bot
Copy link

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test-nightly

@sg-
Copy link
Contributor

sg- commented Feb 10, 2017

/morph test-nightly

@mbed-bot
Copy link

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test-nightly

Output

mbed Build Number: 1557

Build failed!

@jamike jamike force-pushed the fix-3684-TARGET_STM_USB_CONFIG branch from 1e530d4 to e78b780 Compare February 13, 2017 09:13
@0xc0170
Copy link
Contributor

0xc0170 commented Feb 13, 2017

@jamike ready for CI ?

@jamike
Copy link
Contributor Author

jamike commented Feb 13, 2017

yes, it is . (it was ready last week if the revert had not been merged)

@0xc0170
Copy link
Contributor

0xc0170 commented Feb 13, 2017

/morph test-nightly

@sg- sg- added the needs: CI label Feb 13, 2017
@mbed-bot
Copy link

Result: SUCCESS

Your command has finished executing! Here's what you wrote!

/morph test-nightly

Output

mbed Build Number: 1570

All builds and test passed!

@Ingramz Ingramz mentioned this pull request Feb 13, 2017
Closed
0xc0170
0xc0170 reviewed Feb 15, 2017
View reviewed changes
...ts/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/TARGET_NUCLEO_L486RG/USBHALHost_STM_TARGET.h
@@ -0,0 +1,19 @@
/* Copyright (c) 2016 mbed.org, MIT License
Copy link
Contributor

Choose a reason for hiding this comment

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

Out of curiosity, why are these new files MIT license compare to apache 2.0 that is being used or BSD as its in the current folder?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I used the same licence as for USBDEVICE files config.

0xc0170
0xc0170 requested changes Feb 15, 2017
View reviewed changes
targets/TARGET_STM/TARGET_STM32F1/TARGET_NUCLEO_F103RB/USBHAL_STM32F103RB.h Outdated

USBHAL * USBHAL::instance;

USBHAL::USBHAL(void) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Some lines are unaligned, plus these starting { should be on the new line

@jamike jamike force-pushed the fix-3684-TARGET_STM_USB_CONFIG branch 2 times, most recently from 48d2dca to 9b414a9 Compare February 15, 2017 15:08
@jamike
Copy link
Contributor Author

jamike commented Feb 15, 2017

Comment taken into account, and patch rebased at top of master.
I tested locally build_travis.py for STM target.

@jamike
Copy link
Contributor Author

jamike commented Feb 21, 2017

Are other changes expected ?

@0xc0170
Copy link
Contributor

0xc0170 commented Feb 21, 2017

Are other changes expected ?

I am reviewing this now, will update you soon.

@0xc0170
Copy link
Contributor

0xc0170 commented Feb 21, 2017

/morph test-nightly

@jamike
Copy link
Contributor Author

jamike commented Mar 7, 2017

it is a leftover.

@0xc0170
Copy link
Contributor

0xc0170 commented Mar 7, 2017

it is a leftover.

Can you please remove it?

@jamike jamike force-pushed the fix-3684-TARGET_STM_USB_CONFIG branch from bf57fea to 44f5f8b Compare March 7, 2017 14:31
@screamerbg
Copy link
Contributor

@0xc0170 are all your comments addressed?

@0xc0170
Copy link
Contributor

0xc0170 commented Mar 14, 2017

Please resolve the conflict, good to go then

@jamike jamike force-pushed the fix-3684-TARGET_STM_USB_CONFIG branch from 44f5f8b to 1a20b4f Compare March 14, 2017 14:59
@jamike
Copy link
Contributor Author

jamike commented Mar 14, 2017 •
edited
Loading

conflict solved.

@0xc0170
Copy link
Contributor

0xc0170 commented Mar 15, 2017

/morph test

@mbed-bot
Copy link

Result: ABORTED

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 1687

Test failed!

@bridadan
Copy link
Contributor

/morph test

@mbed-bot
Copy link

Result: SUCCESS

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 1688

All builds and test passed!

@bridadan
Copy link
Contributor

Results are ok, thanks for your patience. Ready when you are @0xc0170

@screamerbg
Copy link
Contributor

Great.

@sg- sg- merged commit 586c31a into ARMmbed:master Mar 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0xc0170 0xc0170 0xc0170 approved these changes

Assignees
No one assigned
Labels
release-version: 5.5.0-rc1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@jamike @sg- @mbed-bot @0xc0170 @bridadan @screamerbg @adbridge