Skip to content
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

Reverting to original doxy configuration #9709

Merged
merged 1 commit into from Feb 15, 2019

Conversation

Projects
None yet
7 participants
@hasnainvirk
Copy link
Contributor

hasnainvirk commented Feb 13, 2019

Attempts to restore original style maintained and intended by the nfc developers.

Description

In a previous PR, doxy file specifier was wrongly used over license text. It needs its own block.

Pull request type

[X] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

Reviewers

@pan- @0xc0170

@hasnainvirk hasnainvirk referenced this pull request Feb 13, 2019

Merged

Doxygen correction #9326

@0xc0170 0xc0170 requested a review from pan- Feb 13, 2019

@cmonr cmonr requested a review from ARMmbed/mbed-os-pan Feb 13, 2019

@pan-

pan- approved these changes Feb 13, 2019

Show resolved Hide resolved features/nfc/nfc/NFCController.h Outdated
Show resolved Hide resolved features/nfc/nfc/NFCEEPROM.h Outdated
Show resolved Hide resolved features/nfc/nfc/ndef/MessageBuilder.h Outdated
Show resolved Hide resolved features/nfc/nfc/ndef/MessageParser.h Outdated
Show resolved Hide resolved features/nfc/nfc/ndef/common/SimpleMessageParser.h Outdated

@ciarmcom ciarmcom requested review from 0xc0170 , pan- and ARMmbed/mbed-os-maintainers Feb 13, 2019

@ciarmcom

This comment has been minimized.

Copy link
Member

ciarmcom commented Feb 13, 2019

@hasnainvirk, thank you for your changes.
@0xc0170 @pan- @ARMmbed/mbed-os-pan @ARMmbed/mbed-os-maintainers please review.

@cmonr cmonr added needs: work and removed needs: review labels Feb 13, 2019

@hasnainvirk hasnainvirk force-pushed the hasnainvirk:nfc_doxy branch Feb 13, 2019

@cmonr

This comment has been minimized.

Copy link
Contributor

cmonr commented Feb 14, 2019

@pan- Can you recheck the latest commit?

Show resolved Hide resolved features/nfc/nfc/NFCController.h Outdated
Reverting to original doxy configuration
This commit essentially brings back old code. We did an attempt to
resolve doxy issues with nfc durint docathlon, but it introduced more
issues and yak shaving rather than being a useful exercise.
Unfortunately the previous attempt got merged. This commit attempts to
restore the style maintained by original developers. From here they can
take over.

@hasnainvirk hasnainvirk force-pushed the hasnainvirk:nfc_doxy branch to f36e896 Feb 14, 2019

@hasnainvirk hasnainvirk changed the title Moving file description from license text Reverting to original doxy configuration Feb 14, 2019

@0xc0170 0xc0170 added needs: CI and removed needs: review labels Feb 15, 2019

@0xc0170

This comment has been minimized.

Copy link
Member

0xc0170 commented Feb 15, 2019

Ci started

@mbed-ci

This comment has been minimized.

Copy link

mbed-ci commented Feb 15, 2019

Test run: SUCCESS

Summary: 12 of 12 test jobs passed
Build number : 1
Build artifacts

@cmonr cmonr added ready for merge and removed needs: CI labels Feb 15, 2019

@cmonr cmonr merged commit 6d619eb into ARMmbed:master Feb 15, 2019

27 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
jenkins-ci/ARMmbed/mbed-os/mbed-os-ci/PR-9709/build-ARM Success
Details
jenkins-ci/ARMmbed/mbed-os/mbed-os-ci/PR-9709/build-ARMC6 Success
Details
jenkins-ci/ARMmbed/mbed-os/mbed-os-ci/PR-9709/build-GCC_ARM Success
Details
jenkins-ci/ARMmbed/mbed-os/mbed-os-ci/PR-9709/build-IAR Success
Details
jenkins-ci/ARMmbed/mbed-os/mbed-os-ci/PR-9709/cloud-client-test Success
Details
jenkins-ci/ARMmbed/mbed-os/mbed-os-ci/PR-9709/dynamic-memory-usage RTOS ROM(+0 bytes) RAM(+0 bytes)
Details
jenkins-ci/ARMmbed/mbed-os/mbed-os-ci/PR-9709/exporter Success
Details
jenkins-ci/ARMmbed/mbed-os/mbed-os-ci/PR-9709/greentea-test Success
Details
jenkins-ci/ARMmbed/mbed-os/mbed-os-ci/PR-9709/mbed2-build-ARM Success
Details
jenkins-ci/ARMmbed/mbed-os/mbed-os-ci/PR-9709/mbed2-build-GCC_ARM Success
Details
jenkins-ci/ARMmbed/mbed-os/mbed-os-ci/PR-9709/mbed2-build-IAR Success
Details
jenkins-ci/ARMmbed/mbed-os/mbed-os-ci/PR-9709/unittests Success
Details
travis-ci/astyle Local astyle testing has passed
Details
travis-ci/docs Local docs testing has passed
Details
travis-ci/doxy-spellcheck Local doxy-spellcheck testing has passed
Details
travis-ci/events Passed, runtime is 10557 cycles
Details
travis-ci/gitattributestest Local gitattributestest testing has passed
Details
travis-ci/include_check Local include_check testing has passed
Details
travis-ci/licence_check Local licence_check testing has passed
Details
travis-ci/littlefs Passed, code size is 8408B
Details
travis-ci/psa-autogen Local psa-autogen testing has passed
Details
travis-ci/tools-py2.7 Local tools-py2.7 testing has passed
Details
travis-ci/tools-py3.5 Local tools-py3.5 testing has passed
Details
travis-ci/tools-py3.6 Local tools-py3.6 testing has passed
Details
travis-ci/tools-py3.7 Local tools-py3.7 testing has passed
Details

@cmonr cmonr removed the ready for merge label Feb 15, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.