dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Resync new repository with old repo r5166 

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5155 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-09-17 18:43:00 +00:00
parent 2981943392
commit 0a007da3d6
19 changed files with 44 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NxWidgets/UnitTests/CButton/cbutton_main.cxx
View File

@ -75,7 +75,7 @@ extern "C" int cbutton_main(int argc, char *argv[]);
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// user_start/nxheaders_main
// nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int cbutton_main(int argc, char *argv[])

2
NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
View File

@ -193,7 +193,7 @@ static void checkHighlighting(CButtonArray *buttonArray)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// user_start/nxheaders_main
// nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int cbuttonarray_main(int argc, char *argv[])

2
NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
View File

@ -132,7 +132,7 @@ static void initMemoryUsage(void)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Name: user_start/nxheaders_main
// Name: nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int ccheckbox_main(int argc, char *argv[])

2
NxWidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
View File

@ -131,7 +131,7 @@ static void initMemoryUsage(void)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// user_start/nxheaders_main
// nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int cglyphbutton_main(int argc, char *argv[])

2
NxWidgets/UnitTests/CImage/cimage_main.cxx
View File

@ -146,7 +146,7 @@ static void initMemoryUsage(void)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Name: user_start/nxheaders_main
// Name: nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int cimage_main(int argc, char *argv[])

2
NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx
View File

@ -189,7 +189,7 @@ static void clickButtons(CKeypadTest *test, CKeypad *keypad)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// user_start/nxheaders_main
// nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int ckeypad_main(int argc, char *argv[])

2
NxWidgets/UnitTests/CLabel/clabel_main.cxx
View File

@ -75,7 +75,7 @@ extern "C" int clabel_main(int argc, char *argv[]);
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// user_start/nxheaders_main
// nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int clabel_main(int argc, char *argv[])

2
NxWidgets/UnitTests/CLatchButton/clatchbutton_main.cxx
View File

@ -103,7 +103,7 @@ static void showButtonState(CLatchButton *button, bool &clicked, bool &latched)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// user_start/nxheaders_main
// nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int clatchbutton_main(int argc, char *argv[])

2
NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
View File

@ -171,7 +171,7 @@ static void initMemoryUsage(void)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// user_start/nxheaders_main
// nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int clatchbuttonarray_main(int argc, char *argv[])

2
NxWidgets/UnitTests/CListBox/clistbox_main.cxx
View File

@ -171,7 +171,7 @@ static void initMemoryUsage(void)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Name: user_start/nxheaders_main
// Name: nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int clistbox_main(int argc, char *argv[])

2
NxWidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
View File

@ -132,7 +132,7 @@ static void initMemoryUsage(void)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Name: user_start/nxheaders_main
// Name: nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int cprogressbar_main(int argc, char *argv[])

2
NxWidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
View File

@ -132,7 +132,7 @@ static void initMemoryUsage(void)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Name: user_start/nxheaders_main
// Name: nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int cradiobutton_main(int argc, char *argv[])

2
NxWidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
View File

@ -132,7 +132,7 @@ static void initMemoryUsage(void)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Name: user_start/nxheaders_main
// Name: nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int cscrollbarhorizontal_main(int argc, char *argv[])

2
NxWidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
View File

@ -132,7 +132,7 @@ static void initMemoryUsage(void)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Name: user_start/nxheaders_main
// Name: nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int cscrollbarvertical_main(int argc, char *argv[])

2
NxWidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
View File

@ -132,7 +132,7 @@ static void initMemoryUsage(void)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Name: user_start/nxheaders_main
// Name: nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int csliderhorizontal_main(int argc, char *argv[])

2
NxWidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
View File

@ -132,7 +132,7 @@ static void initMemoryUsage(void)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Name: user_start/nxheaders_main
// Name: nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int cslidervertical_main(int argc, char *argv[])

2
NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx
View File

@ -76,7 +76,7 @@ extern "C" int ctextbox_main(int argc, char *argv[]);
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// user_start/nxheaders_main
// nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int ctextbox_main(int argc, char *argv[])

30
NxWidgets/UnitTests/README.txt
View File

@ -74,7 +74,7 @@ Installing and Building the Unit Tests
writing *ONLY* the sim/nsh2 and stm321-e-eval configurations have C++ support
pre-enabled).
c) Enable Debug Options
d) Enable Debug Options
If you are running on a simulated target, then you might also want to
enable debug symbols:
@ -84,12 +84,12 @@ Installing and Building the Unit Tests
Then you can run the simulation using GDB or DDD which is a very powerful
debugging environment!
d) Special configuration requirements for the nxwm unit test:
e) Special configuration requirements for the nxwm unit test:
CONFIG_NXCONSOLE=y
CONFIG_NX_MULTIUSER=y
e) Other nuttx/.config changes -- NSH configurations only.
f) Other nuttx/.config changes -- NSH configurations only.
If the configuration that you are using supports NSH and NSH built-in tasks
then all is well. If it is an NSH configuration, then you will have to define
@ -101,7 +101,26 @@ Installing and Building the Unit Tests
to change anything further in the nuttx/.config file if you are using either
of these configurations.
f) Other apps/.config changes -- NON-NSH configurations only.
g) Other apps/.config changes -- NON-NSH configurations only.
Entry Point. You will need to set the entry point in the .config file.
For NSH configurations, the entry point will always be "nsh_main" and you
will see that setting like:
CONFIG_USER_ENTRYPOINT="nsh_main"
If you are not using in NSH, then each unit test has a unique entry point.
That entry point is the name of the unit test directory in all lower case
plus the suffix "_main". So, for example, the correct entry for the
UnitTests/CButton would be:
CONFIG_USER_ENTRYPOINT="cbutton_main"
And the correct entry point for UnitTests/nxwm would be:
CONFIG_USER_ENTRYPOINT="nxwm_main"
etc.
For non-NSH configurations (such as the sim/touchscreen) you will have to
remove the CONFIGURED_APPS seting that contains the user_start function so
@ -306,6 +325,9 @@ Example
Do nothing... sim/nsh2 already has C++ support enabled.
Since this is an NSH configuration, the entry point does not need to be
changed.
3. Install the CButton C++ application (for example)
Where: <nxwidgets-directory>/tool

2
NxWidgets/UnitTests/nxwm/nxwm_main.cxx
View File

@ -586,7 +586,7 @@ void showTestStepMemory(FAR const char *msg)
#endif
/////////////////////////////////////////////////////////////////////////////
// user_start/nxwm_main
// nxwm_main
/////////////////////////////////////////////////////////////////////////////
int nxwm_main(int argc, char *argv[])