fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-30 03:03:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix STM32 USART4/5 vs UART4/5 confusion

Browse Source 
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4671 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-04-29 14:34:56 +00:00
parent 562e215f60
commit 080d38e168
18 changed files with 452 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NxWidgets/libnxwidgets/include/cbgwindow.hxx
+9
View File
@@ -130,6 +130,15 @@ namespace NXWidgets
bool open(void);
/**
* Each implementation of INxWindow must provide a method to recover
* the contained CWidgetControl instance.
*
* @return The contained CWidgetControl instance
*/
CWidgetControl *getWidgetControl(void) const;
/**
* Request the position and size information of the window. The values
* will be returned asynchronously through the client callback method.
NxWidgets/libnxwidgets/include/cnxserver.hxx
+3 -4
View File
@@ -48,6 +48,7 @@
#include <nuttx/nx/nx.h>
#include "cnxwindow.hxx"
#include "cnxtkwindow.hxx"
#include "cbgwindow.hxx"
/****************************************************************************
@@ -176,12 +177,10 @@ namespace NXWidgets
* Get an instance of the framed NX window.
*/
#if 0 // Not ready for prime time
inline CFramedWindow *createFramedWindow(CWidgetControl *widgetControl)
inline CNxTkWindow *createFramedWindow(CWidgetControl *widgetControl)
{
return new CFramedWindow(m_hNxServer, widgetControl);
return new CNxTkWindow(m_hNxServer, widgetControl);
}
#endif
/**
* Get an instance of the background window.
NxWidgets/libnxwidgets/include/cnxtkwindow.hxx
+10 -1
View File
@@ -102,7 +102,7 @@ namespace NXWidgets
* 3) The window constructor call CWidgetControl methods to "smarten"
* the CWidgetControl instance with window-specific knowledge.
* 4) Call the open() method on the window to display the window.
* 5) After that, the fully smartend CWidgetControl instance can
* 5) After that, the fully smartened CWidgetControl instance can
* be used to generate additional widgets.
* 6) After that, the fully smartened CWidgetControl instance can
* be used to generate additional widgets by passing it to the
@@ -129,6 +129,15 @@ namespace NXWidgets
bool open(void);
/**
* Each implementation of INxWindow must provide a method to recover
* the contained CWidgetControl instance.
*
* @return The contained CWidgetControl instance
*/
CWidgetControl *getWidgetControl(void) const;
/**
* Open a toolbar on the framed window. Toolbar creation is separate
* from object instantion so that errors can be reported
NxWidgets/libnxwidgets/include/cnxtoolbar.hxx
+9
View File
@@ -120,6 +120,15 @@ namespace NXWidgets
bool open(void);
/**
* Each implementation of INxWindow must provide a method to recover
* the contained CWidgetControl instance.
*
* @return The contained CWidgetControl instance
*/
CWidgetControl *getWidgetControl(void) const;
/**
* Request the position and size information of the toolbar. The values
* will be returned asynchronously through the client callback method.
NxWidgets/libnxwidgets/include/cnxwindow.hxx
+9
View File
@@ -130,6 +130,15 @@ namespace NXWidgets
bool open(void);
/**
* Each implementation of INxWindow must provide a method to recover
* the contained CWidgetControl instance.
*
* @return The contained CWidgetControl instance
*/
CWidgetControl *getWidgetControl(void) const;
/**
* Request the position and size information of the window. The values
* will be returned asynchronously through the client callback method.
NxWidgets/libnxwidgets/include/inxwindow.hxx
+10
View File
@@ -60,6 +60,7 @@
namespace NXWidgets
{
struct SBitmap;
class CWidgetControl;
/**
* This class defines common operations on a any NX window.
@@ -89,6 +90,15 @@ namespace NXWidgets
virtual bool open(void) = 0;
/**
* Each implementation of INxWindow must provide a method to recover
* the contained CWidgetControl instance.
*
* @return The contained CWidgetControl instance
*/
virtual CWidgetControl *getWidgetControl(void) const = 0;
/**
* Request the position and size information of the window. The values
* will be returned asynchronously through the client callback method.