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

Refactor cellular directory structure #13261

Merged
merged 9 commits into from
Jul 23, 2020
Merged

Conversation

LDong-Arm
Copy link
Contributor

@LDong-Arm LDong-Arm commented Jul 9, 2020

Preceding PR: #13253 (merged)

Summary of changes

Move cellular from features/cellular to connectivity/cellular and cellular drivers to connectivity/drivers/cellular as per our directory structure proposal:

connectivity
├── [...]
├── cellular
│   ├── mbed_lib.json
│   ├── [...]
│   ├── include/cellular
│   │   └── framework
│   │       ├── API
│   │       ├── AT
│   │       ├── common
│   │       └── device
│   ├── source
│   │   └── framework
│   │       ├── AT
│   │       ├── common
│   │       └── device
│   └── tests
│       └── UNITTESTS
└── drivers
    ├── [...]
    └── cellular
        └── [...]

Note:

  • There's no Greentea test dedicated to cellular.
  • Files in UNITTESTS/stubs are shared across tests from different libraries and thus left untouched for now.
  • For details, see individual commits.

Impact of changes

Migration actions required

Documentation

None.


Pull request type

[x] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results

[] No Tests required for this change (E.g docs only update)
[x] Covered by existing mbed-os tests (Greentea or Unittest)
[x] Tests / results supplied as part of this PR

Verification:


Reviewers

@ARMmbed/mbed-os-core @bulislaw @0xc0170 @ARMmbed/mbed-os-connectivity


@mergify mergify bot added the needs: work label Jul 9, 2020
@LDong-Arm
Copy link
Contributor Author

Travis is almost always an issue when we move something...

@LDong-Arm LDong-Arm changed the title Preceding PR: Move cellular to connectivity/cellular Preceding PR: Refactor cellular directory structure Jul 9, 2020
@ciarmcom ciarmcom requested review from 0xc0170, bulislaw, maclobdell and a team July 9, 2020 15:00
@ciarmcom
Copy link
Member

ciarmcom commented Jul 9, 2020

@LDong-Arm, thank you for your changes.
@bulislaw @0xc0170 @maclobdell @ARMmbed/mbed-os-ipcore @ARMmbed/mbed-os-wan @ARMmbed/mbed-os-maintainers please review.

@LDong-Arm
Copy link
Contributor Author

From travis-ci/events:

The command "rm -r rtos/source/TARGET_CORTEX drivers/source/usb connectivity/cellular features/netsocket features/nanostack \
  features/lwipstack features/frameworks/greentea-client \
  features/frameworks/utest features/frameworks/unity components BUILD
" exited with 0.
1.02s$ python tools/make.py -t GCC_ARM -m NUCLEO_F412ZG --source=. --build=BUILD/NUCLEO_F412ZG/GCC_ARM -j0
[Warning] @,: Compiler version mismatch: Have 6.3.1; expected version >= 9.0.0 and < 10.0.0
Building project mbed-os (NUCLEO_F412ZG, GCC_ARM)
Scan: mbed-os
Compile [  0.2%]: mbed_tz_context.c
Compile [  0.4%]: ALT1250_PPP.cpp
[Fatal Error] ALT1250_PPP.h@30,31: AT_CellularDevice.h: No such file or directory

@0xc0170 Why does it remove those directories? The missing file is in connectivity/cellular which it deletes.

@LDong-Arm
Copy link
Contributor Author

LDong-Arm commented Jul 13, 2020

@0xc0170 Why does it remove those directories? The missing file is in connectivity/cellular which it deletes.

Okay, that's no-RTOS build test that excludes RTOS-dependent components. I've added a commit to exclude cellular drivers too as they depend on the cellular stack.

@LDong-Arm LDong-Arm changed the title Preceding PR: Refactor cellular directory structure Refactor cellular directory structure Jul 17, 2020
@mergify
Copy link

mergify bot commented Jul 17, 2020

This PR cannot be merged due to conflicts. Please rebase to resolve them.

@adbridge adbridge added needs: review release-type: patch Indentifies a PR as containing just a patch and removed needs: work labels Jul 17, 2020
evedon
evedon previously approved these changes Jul 20, 2020
Copy link
Contributor

@evedon evedon left a comment

Choose a reason for hiding this comment

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

Looks good.

@mergify mergify bot added the needs: work label Jul 20, 2020
@mergify
Copy link

mergify bot commented Jul 20, 2020

This PR cannot be merged due to conflicts. Please rebase to resolve them.

@mergify mergify bot removed the needs: review label Jul 20, 2020
@mergify mergify bot dismissed evedon’s stale review July 20, 2020 09:54

Pull request has been modified.

@LDong-Arm
Copy link
Contributor Author

LDong-Arm commented Jul 20, 2020

Rebased. @evedon Could you please re-approve? Thanks

@LDong-Arm LDong-Arm requested a review from evedon July 20, 2020 09:57
@mergify
Copy link

mergify bot commented Jul 21, 2020

This PR cannot be merged due to conflicts. Please rebase to resolve them.

@0xc0170
Copy link
Contributor

0xc0170 commented Jul 22, 2020

Looks good.

Should be sufficient if this was just rebased. I am reviewing now

@LDong-Arm
Copy link
Contributor Author

Oh wait, can we drop the "framework/" from the structure (see PR description)? It looks quite redundant as we don't have headers or sources that are not in framework. @0xc0170 @evedon

@evedon
Copy link
Contributor

evedon commented Jul 22, 2020

Oh wait, can we drop the "framework/" from the structure (see PR description)? It looks quite redundant as we don't have headers or sources that are not in framework. @0xc0170 @evedon

We could do that in the future. I'd rather keep most of the existing connectivity structure for now.

@LDong-Arm
Copy link
Contributor Author

Hi @0xc0170, are you happy to run CI and merge it?

@0xc0170
Copy link
Contributor

0xc0170 commented Jul 23, 2020

CI started

@mergify mergify bot added needs: CI and removed needs: review labels Jul 23, 2020
@mbed-ci
Copy link

mbed-ci commented Jul 23, 2020

Test run: SUCCESS

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

@0xc0170
Copy link
Contributor

0xc0170 commented Jul 23, 2020

As approved already, I'll merge now

@0xc0170 0xc0170 merged commit f83d100 into ARMmbed:master Jul 23, 2020
@mergify mergify bot removed the ready for merge label Jul 23, 2020
@mbedmain mbedmain added release-version: 6.2.1 Release-pending and removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Aug 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants