Skip to content

Commit 31579fe

Browse files
authored
Merge pull request #9328 from SeppoTakalo/ip-core-doxygen
Doxygen fixes for IP networking area
2 parents bab6e2c + 58c2760 commit 31579fe

25 files changed

+345
-217
lines changed

doxyfile_options

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,10 @@ EXCLUDE_PATTERNS = */tools/* \
859859
*/ble/pal/* \
860860
*/components/802.15.4_RF/* \
861861
*/components/wifi/* \
862-
*/UNITTESTS/*
862+
*/UNITTESTS/* \
863+
*/features/cellular/framework/AT/* \
864+
*/features/cellular/framework/device/* \
865+
*/features/cellular/framework/common/*
863866

864867
# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
865868
# (namespaces, classes, functions, etc.) that should be excluded from the

features/cellular/README.md

Lines changed: 25 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,21 @@
22

33
This is the Github repo for Mbed cellular connectivity:
44

5-
easy_cellular/
6-
EasyCellularConnection Simplified cellular usage based on `CellularBase.h`
7-
CellularConnectionUtil A utility class for cellular connection
8-
95
framework/
106
API Application Programming Interface for cellular connectivity
117
AT AT implementation based on 3GPP TS 27.007 specification
128
common Common and utility sources
9+
device Implementation of cellular device and state machine
1310
targets Vendor specific cellular module adaptations
1411

1512
TESTS Cellular Greentea test
1613

17-
UNITTESTS Cellular unit test
14+
**Note:** Application developers should use only the `API` folder.
1815

1916
## Known limitations
2017

2118
**Please note that this is a first release of Cellular framework and is subject to further development in future.**
2219

23-
Only UDP is supported when using AT commands to control sockets in an IP stack built into the cellular modem. If TCP is required, use the PPP/LWIP stack.
24-
2520
## Supported modules
2621

2722
You can find currently supported cellular modules in the `framework/targets/` folder, where we also add support for new cellular modules.
@@ -30,57 +25,41 @@ You can find currently supported cellular modules in the `framework/targets/` fo
3025

3126
You can change cellular defaults in the `mbed_lib.json` configuration file.
3227

33-
You can also override cellular defaults in the `mbed_app.json` configuration file:
34-
35-
"config": {
36-
"cellular_plmn": {
37-
"help": "PLMN selection, 0=auto",
38-
"value": 0
39-
},
40-
"apn": {
41-
"help": "Access point name, e.g. internet",
42-
"value": "\"internet\""
43-
},
44-
"cellular_sim_pin": {
45-
"help": "PIN code",
46-
"value": "\"1234\""
47-
}
48-
}
49-
5028
## Debug traces
5129

5230
You can define the debug tracing level in the `mbed_app.json` configuration file:
53-
54-
"target_overrides": {
55-
"*": {
56-
"mbed-trace.enable": true,
57-
"platform.stdio-convert-newlines": true,
58-
"platform.stdio-baud-rate": 115200,
59-
"platform.default-serial-baud-rate": 115200
60-
}
61-
},
62-
"config": {
63-
"trace-level": {
64-
"help": "Options are TRACE_LEVEL_ERROR,TRACE_LEVEL_WARN,TRACE_LEVEL_INFO,TRACE_LEVEL_DEBUG",
65-
"macro_name": "MBED_TRACE_MAX_LEVEL",
66-
"value": "TRACE_LEVEL_INFO"
67-
}
31+
```
32+
"target_overrides": {
33+
"*": {
34+
"mbed-trace.enable": true,
35+
"platform.stdio-convert-newlines": true,
36+
"platform.stdio-baud-rate": 115200,
37+
"platform.default-serial-baud-rate": 115200
38+
}
39+
},
40+
"config": {
41+
"trace-level": {
42+
"help": "Options are TRACE_LEVEL_ERROR,TRACE_LEVEL_WARN,TRACE_LEVEL_INFO,TRACE_LEVEL_DEBUG",
43+
"macro_name": "MBED_TRACE_MAX_LEVEL",
44+
"value": "TRACE_LEVEL_INFO"
6845
}
46+
}
47+
```
6948

7049
## Greentea tests
7150

72-
The `TESTS` folder contains Greentea tests for cellular specific classes. You need to give relevant configuration file with `--app-config` parameter, e.g.:
51+
The `TESTS` folder contains Greentea tests for cellular specific classes. You need to give relevant configuration file with `--app-config` parameter, such as:
7352

74-
mbed test -n features-cellular-tests-* --app-config features\cellular\TESTS\socket\udp\template_mbed_app.json.txt -v
53+
```
54+
mbed test -n features-cellular-tests-* --app-config features\cellular\TESTS\socket\udp\template_mbed_app.json.txt -v
55+
```
7556

76-
Note that Greentea tests use SIM PIN so you need to change that or your SIM card may get locked.
57+
**Note:** Greentea tests use SIM PIN, so you need to change that or your SIM card may get locked.
7758

7859
## Unit tests
7960

80-
The `UNITTESTS` folder contains unit tests for cellular specific classes. Unit tests are based on the stubbing method.
81-
82-
You can run those tests locally by running `./run_tests` script under the `UNITTESTS/` folder.
61+
Cellular unit tests are in Mbed OS root `UNITTESTS`. Unit tests are based on the stubbing method.
8362

8463
You need the following applications: `cpputest`, `gcov` and `lcov` (genhtml) for running the tests.
8564

86-
After you have run the `run_tests` script, you can find test results under `UNITTESTS/results` folder and line and function coverages under the `UNITTESTS/coverages` folder.
65+
After you run the `run_tests` script, you can find test results in `UNITTESTS/results`, and line and function coverages in `UNITTESTS/coverages`.

features/cellular/framework/API/CellularContext.h

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@
2222

2323
namespace mbed {
2424

25+
/**
26+
* @addtogroup cellular
27+
* @{
28+
*/
29+
30+
/// CellularContext is CellularBase/NetworkInterface with extensions for cellular connectivity
2531
class CellularContext : public CellularBase {
2632

2733
public:
@@ -50,7 +56,7 @@ class CellularContext : public CellularBase {
5056
Week
5157
};
5258

53-
/* PDP Context information */
59+
/// PDP Context information
5460
struct pdpcontext_params_t {
5561
char apn[MAX_ACCESSPOINT_NAME_LENGTH + 1];
5662
char local_addr[MAX_IPV6_ADDR_IN_IPV4LIKE_DOTTED_FORMAT + 1];
@@ -255,6 +261,10 @@ class CellularContext : public CellularBase {
255261
const char *_pwd;
256262
};
257263

264+
/**
265+
* @}
266+
*/
267+
258268
} // namespace mbed
259269

260270

features/cellular/framework/API/CellularDevice.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ class FileHandle;
3636
const int MAX_PIN_SIZE = 8;
3737
const int MAX_PLMN_SIZE = 16;
3838

39+
/**
40+
* @addtogroup cellular
41+
* @{
42+
*/
43+
3944
/**
4045
* Class CellularDevice
4146
*
@@ -294,6 +299,10 @@ class CellularDevice {
294299
Callback<void(nsapi_event_t, intptr_t)> _status_cb;
295300
};
296301

302+
/**
303+
* @}
304+
*/
305+
297306
} // namespace mbed
298307

299308
#endif // CELLULAR_DEVICE_H_

features/cellular/framework/API/CellularInformation.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323

2424
namespace mbed {
2525

26+
/**
27+
* @addtogroup cellular
28+
* @{
29+
*/
30+
2631
/**
2732
* Class CellularInformation
2833
*
@@ -83,6 +88,10 @@ class CellularInformation {
8388
virtual nsapi_error_t get_serial_number(char *buf, size_t buf_size, SerialNumberType type = SN) = 0;
8489
};
8590

91+
/**
92+
* @}
93+
*/
94+
8695
} // namespace mbed
8796

8897
#endif // CELLULAR_INFORMATION_H_

features/cellular/framework/API/CellularNetwork.h

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
/*
2-
* Copyright (c) 2017, Arm Limited and affiliates.
1+
/* Copyright (c) 2017,2018 Arm Limited and affiliates.
32
* SPDX-License-Identifier: Apache-2.0
43
*
54
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,18 +31,16 @@ const int MAX_OPERATOR_NAME_LONG = 16;
3231
const int MAX_OPERATOR_NAME_SHORT = 8;
3332

3433
/**
35-
* Class CellularNetwork
36-
*
37-
* An abstract interface for connecting to a network and getting information from it.
34+
* @addtogroup cellular
35+
* @{
3836
*/
37+
38+
/// An abstract interface for connecting to a network and getting information from it.
3939
class CellularNetwork {
4040
protected:
4141
// friend of CellularDevice so that it's the only way to close/delete this class.
4242
friend class CellularDevice;
4343

44-
/**
45-
* virtual Destructor
46-
*/
4744
virtual ~CellularNetwork() {}
4845

4946
public:
@@ -112,7 +109,7 @@ class CellularNetwork {
112109
RAT_MAX = 11 // to reserve string array
113110
};
114111

115-
// 3GPP TS 27.007 - 7.3 PLMN selection +COPS
112+
/// 3GPP TS 27.007 - 7.3 PLMN selection +COPS
116113
struct operator_t {
117114
enum Status {
118115
Unknown,
@@ -141,6 +138,7 @@ class CellularNetwork {
141138

142139
typedef CellularList<operator_t> operList_t;
143140

141+
/// Cellular operator names in numeric and alpha format
144142
struct operator_names_t {
145143
char numeric[MAX_OPERATOR_NAME_SHORT + 1];
146144
char alpha[MAX_OPERATOR_NAME_LONG + 1];
@@ -154,7 +152,7 @@ class CellularNetwork {
154152
};
155153
typedef CellularList<operator_names_t> operator_names_list;
156154

157-
/* Network registering mode */
155+
/// Network registering mode
158156
enum NWRegisteringMode {
159157
NWModeAutomatic = 0, // automatic registering
160158
NWModeManual, // manual registering with plmn
@@ -163,7 +161,7 @@ class CellularNetwork {
163161
NWModeManualAutomatic // if manual fails, fallback to automatic
164162
};
165163

166-
/* Network registration information */
164+
/// Network registration information
167165
struct registration_params_t {
168166
RegistrationType _type;
169167
RegistrationStatus _status;
@@ -365,6 +363,10 @@ class CellularNetwork {
365363
virtual nsapi_error_t get_registration_params(RegistrationType type, registration_params_t &reg_params) = 0;
366364
};
367365

366+
/**
367+
* @}
368+
*/
369+
368370
} // namespace mbed
369371

370372
#endif // CELLULAR_NETWORK_H_

features/cellular/framework/API/CellularSMS.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ const uint16_t SMS_SIM_WAIT_TIME_MILLISECONDS = 200;
3535

3636
const int SMS_ERROR_MULTIPART_ALL_PARTS_NOT_READ = -5001;
3737

38+
/**
39+
* @addtogroup cellular
40+
* @{
41+
*/
42+
3843
/**
3944
* Class CellularSMS
4045
*
@@ -162,6 +167,10 @@ class CellularSMS {
162167
virtual void set_extra_sim_wait_time(int sim_wait_time) = 0;
163168
};
164169

170+
/**
171+
* @}
172+
*/
173+
165174
} // namespace mbed
166175

167176
#endif // CELLULAR_SMS_H_

features/cellular/framework/AT/ATHandler.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,13 @@ enum DeviceErrorType {
5353
DeviceErrorTypeErrorCME // AT ERROR CME
5454
};
5555

56-
/* struct used when getting at response error. Defines error code and type */
56+
/** AT response error with error code and type */
5757
struct device_err_t {
5858
DeviceErrorType errType;
5959
int errCode;
6060
};
6161

62-
/** Class ATHandler
63-
*
64-
* Class for sending AT commands and parsing AT responses.
65-
*/
62+
/// Class for sending AT commands and parsing AT responses.
6663
class ATHandler {
6764

6865
public:

features/netsocket/CellularBase.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,18 @@
1313
* limitations under the License.
1414
*/
1515

16+
/* @file CellularBase.h CellularBase */
17+
18+
/** @addtogroup netinterface
19+
* @{
20+
*/
21+
1622
#ifndef CELLULAR_BASE_H
1723
#define CELLULAR_BASE_H
1824

1925
#include "netsocket/NetworkInterface.h"
2026

2127
/** Common interface that is shared between cellular interfaces.
22-
* @addtogroup netsocket
2328
*/
2429
class CellularBase: public NetworkInterface {
2530

features/netsocket/DNS.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,14 @@
1414
* limitations under the License.
1515
*/
1616

17+
/** @file DNS.h Domain Name Service */
18+
/** @addtogroup netsocket
19+
* @{ */
20+
1721
#ifndef DNS_H
1822
#define DNS_H
1923

24+
/** Base class for DNS provider */
2025
class DNS {
2126
public:
2227

@@ -95,3 +100,5 @@ class DNS {
95100
};
96101

97102
#endif
103+
104+
/** @} */

0 commit comments

Comments
 (0)