Skip to content

Commit

Permalink
Merge pull request ARMmbed#2975 from ARMmbed/release-candidate
Browse files Browse the repository at this point in the history
Release candidate for mbed-os-5.2-rc2
  • Loading branch information
sg- committed Oct 10, 2016
2 parents 670b098 + 683fc37 commit a551faa
Show file tree
Hide file tree
Showing 4,030 changed files with 9,691 additions and 3,782 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
17 changes: 5 additions & 12 deletions docs/mbed_targets.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ mbed uses JSON as a description language for its build targets. The JSON descrip
"function": "TEENSY3_1Code.binary_hook",
"toolchains": ["ARM_STD", "ARM_MICRO", "GCC_ARM"]
},
"progen": {"target": "teensy-31"},
"device_name": "MK20DX256xxx7",
"detect_code": ["0230"]
```

Expand Down Expand Up @@ -160,17 +160,10 @@ In this case, it converts the output file (`binf`) from binary format to Intel H

The hook code can look quite different between different targets. Take a look at the other classes in *targets.py* for more examples of hook code.

## progen
## device_name

This property is used to pass additional data to the project generator (used to export the mbed code to various 3rd party tools and IDEs). A definition for `progen` looks like this:
This property is used to pass necessary data for exporting the mbed code to various 3rd party tools and IDEs.

```
"progen": {
"target": "lpc11u35_401",
"uvision": {
"template": ["uvision_microlib.uvproj.tmpl"]
}
```
This is possible because the device name corresponds to a field in publicly hosted CMSIS packs. These packs hold target properties. [This](http://www.keil.com/pack/Keil.Kinetis_K20_DFP.pdsc) is the pdsc that contains TEENSY_31 device (MK20DX256xxx7). The device information begins on line 156. The dname (device name) field on line 156 directly corresponds to that in the Uvision5 IDE target selection window. Beginning on line 15 of `tools/export/uvision/uvision.tmpl`, target information from these packs is used to generate valid Uvision5 projects. If the device name is not found, we use a generic ARM CPU target in Uvision5.
`tools/export/iar/iar_definitions.json` utilizes this device name to store information necessary to set the target in an IAR project.

The `target` property of `progen` specifies the target name that must be used for the exporter (if different than the mbed target name).
For each exporter, a template for exporting can also be specified. In this example, the template used for generating a uVision project file is in a file called `uvision_microlib.uvproj.tmpl`. It is assumed that all the templates are located in `tools/export`.
4 changes: 4 additions & 0 deletions drivers/AnalogIn.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
#include "platform/PlatformMutex.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** An analog input, used for reading the voltage on a pin
*
Expand Down Expand Up @@ -126,3 +128,5 @@ class AnalogIn {
#endif

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/AnalogOut.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include "platform/PlatformMutex.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** An analog output, used for setting the voltage on a pin
*
Expand Down Expand Up @@ -144,3 +146,5 @@ class AnalogOut {
#endif

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/BusIn.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include "platform/PlatformMutex.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** A digital input bus, used for reading the state of a collection of pins
*
Expand Down Expand Up @@ -102,3 +104,5 @@ class BusIn {
} // namespace mbed

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/BusInOut.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
#include "platform/PlatformMutex.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** A digital input output bus, used for setting the state of a collection of pins
*
Expand Down Expand Up @@ -121,3 +123,5 @@ class BusInOut {
} // namespace mbed

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/BusOut.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
#include "platform/PlatformMutex.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** A digital output bus, used for setting the state of a collection of pins
*/
Expand Down Expand Up @@ -105,3 +107,5 @@ class BusOut {
} // namespace mbed

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/CAN.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
#include "platform/PlatformMutex.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** CANMessage class
*
Expand Down Expand Up @@ -256,3 +258,5 @@ class CAN {
#endif

#endif // MBED_CAN_H

/** @}*/
4 changes: 4 additions & 0 deletions drivers/DigitalIn.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include "platform/critical.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** A digital input, used for reading the state of a pin
*
Expand Down Expand Up @@ -113,3 +115,5 @@ class DigitalIn {
} // namespace mbed

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/DigitalInOut.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include "platform/critical.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** A digital input/output, used for setting or reading a bi-directional pin
*
Expand Down Expand Up @@ -138,3 +140,5 @@ class DigitalInOut {
} // namespace mbed

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/DigitalOut.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include "platform/critical.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** A digital output, used for setting the state of a pin
*
Expand Down Expand Up @@ -124,3 +126,5 @@ class DigitalOut {
} // namespace mbed

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/DirHandle.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ struct dirent {
};

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** Represents a directory stream. Objects of this type are returned
* by a FileSystemLike's opendir method. Implementations must define
Expand Down Expand Up @@ -118,3 +120,5 @@ extern "C" {
};

#endif /* MBED_DIRHANDLE_H */

/** @}*/
4 changes: 4 additions & 0 deletions drivers/Ethernet.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#if DEVICE_ETHERNET

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** An ethernet interface, to use with the ethernet pins.
*
Expand Down Expand Up @@ -170,3 +172,5 @@ class Ethernet {
#endif

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/FileBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ typedef long off_t;
#include "platform/PlatformMutex.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

typedef enum {
FilePathType,
Expand Down Expand Up @@ -80,3 +82,5 @@ class FileBase {
} // namespace mbed

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/FileHandle.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ typedef long off_t;
#endif

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** An OO equivalent of the internal FILEHANDLE variable
* and associated _sys_* functions.
Expand Down Expand Up @@ -138,3 +140,5 @@ class FileHandle {
} // namespace mbed

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/FileLike.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
#include "drivers/FileHandle.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/* Class FileLike
* A file-like object is one that can be opened with fopen by
Expand All @@ -45,3 +47,5 @@ class FileLike : public FileHandle, public FileBase {
} // namespace mbed

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/FilePath.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include "drivers/FileLike.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

class FilePath {
public:
Expand All @@ -44,3 +46,5 @@ class FilePath {
} // namespace mbed

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/FileSystemLike.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include "drivers/DirHandle.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** A filesystem-like object is one that can be used to open files
* though it by fopen("/name/filename", mode)
Expand Down Expand Up @@ -104,3 +106,5 @@ class FileSystemLike : public FileBase {
} // namespace mbed

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/I2C.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
#endif

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** An I2C Master, used for communicating with I2C slave devices
*
Expand Down Expand Up @@ -191,3 +193,5 @@ class I2C {
#endif

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/I2CSlave.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include "hal/i2c_api.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** An I2C Slave, used for communicating with an I2C Master device
*
Expand Down Expand Up @@ -154,3 +156,5 @@ class I2CSlave {
#endif

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/InterruptIn.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
#include "platform/toolchain.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** A digital interrupt input, used to call a function on a rising or falling edge
*
Expand Down Expand Up @@ -158,3 +160,5 @@ class InterruptIn {
#endif

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/InterruptManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include <string.h>

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** Use this singleton if you need to chain interrupt handlers.
*
Expand Down Expand Up @@ -169,3 +171,5 @@ class InterruptManager {

#endif


/** @}*/
4 changes: 4 additions & 0 deletions drivers/LocalFileSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include "platform/PlatformMutex.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

FILEHANDLE local_file_open(const char* name, int flags);

Expand Down Expand Up @@ -108,3 +110,5 @@ class LocalFileSystem : public FileSystemLike {
#endif

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/LowPowerTicker.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include "hal/lp_ticker_api.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** Low Power Ticker
*
Expand All @@ -44,3 +46,5 @@ class LowPowerTicker : public Ticker {
#endif

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/LowPowerTimeout.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include "drivers/LowPowerTicker.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** Low Power Timout
*
Expand All @@ -42,3 +44,5 @@ class LowPowerTimeout : public LowPowerTicker {
#endif

#endif

/** @}*/
4 changes: 4 additions & 0 deletions drivers/LowPowerTimer.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#include "hal/lp_ticker_api.h"

namespace mbed {
/** \addtogroup drivers */
/** @{*/

/** Low power timer
*
Expand All @@ -42,3 +44,5 @@ class LowPowerTimer : public Timer {
#endif

#endif

/** @}*/
Loading

0 comments on commit a551faa

Please sign in to comment.