mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-11-01 09:11:36 +08:00
Fix STM32 USART4/5 vs UART4/5 confusion
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4671 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
@@ -113,6 +113,18 @@ bool CBgWindow::open(void)
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Each implementation of INxWindow must provide a method to recover
|
||||
* the contained CWidgetControl instance.
|
||||
*
|
||||
* @return The contained CWidgetControl instance
|
||||
*/
|
||||
|
||||
CWidgetControl *CBgWindow::getWidgetControl(void) const
|
||||
{
|
||||
return m_widgetControl;
|
||||
}
|
||||
|
||||
/**
|
||||
* Request the position and size information of the window. The values
|
||||
* will be returned asynchronously through the client callback method.
|
||||
|
||||
@@ -120,7 +120,7 @@ CNxServer::~CNxServer(void)
|
||||
#ifndef CONFIG_NX_MULTIUSER
|
||||
bool CNxServer::connect(void)
|
||||
{
|
||||
#if defined(SCREENS_EXTERNINIT)
|
||||
#if defined(CONFIG_NXWIDGETS_EXTERNINIT)
|
||||
// Use external graphics driver initialization
|
||||
|
||||
m_hDevice = up_nxdrvinit(CONFIG_NXWIDGETS_DEVNO);
|
||||
|
||||
@@ -111,6 +111,18 @@ bool CNxTkWindow::open(void)
|
||||
return m_hNxTkWindow != NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* Each implementation of INxWindow must provide a method to recover
|
||||
* the contained CWidgetControl instance.
|
||||
*
|
||||
* @return The contained CWidgetControl instance
|
||||
*/
|
||||
|
||||
CWidgetControl *CNxTkWindow::getWidgetControl(void) const
|
||||
{
|
||||
return m_widgetControl;
|
||||
}
|
||||
|
||||
/**
|
||||
* Open a toolbar on the framed window
|
||||
*
|
||||
|
||||
@@ -117,6 +117,18 @@ bool CNxToolbar::open(void)
|
||||
return ret == OK;
|
||||
}
|
||||
|
||||
/**
|
||||
* Each implementation of INxWindow must provide a method to recover
|
||||
* the contained CWidgetControl instance.
|
||||
*
|
||||
* @return The contained CWidgetControl instance
|
||||
*/
|
||||
|
||||
CWidgetControl *CNxToolbar::getWidgetControl(void) const
|
||||
{
|
||||
return m_widgetControl;
|
||||
}
|
||||
|
||||
/**
|
||||
* Request the position and size information of the toolbar. The values
|
||||
* will be returned asynchronously through the client callback method.
|
||||
|
||||
@@ -103,6 +103,18 @@ bool CNxWindow::open(void)
|
||||
return m_hNxWindow != NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* Each implementation of INxWindow must provide a method to recover
|
||||
* the contained CWidgetControl instance.
|
||||
*
|
||||
* @return The contained CWidgetControl instance
|
||||
*/
|
||||
|
||||
CWidgetControl *CNxWindow::getWidgetControl(void) const
|
||||
{
|
||||
return m_widgetControl;
|
||||
}
|
||||
|
||||
/**
|
||||
* Request the position and size information of the window. The values
|
||||
* will be returned asynchronously through the client callback method.
|
||||
|
||||
Reference in New Issue
Block a user