rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +01:00
Code Issues Releases Activity

Fixed files with mixed line endings

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3168 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
corvus 2011-04-15 12:03:20 +00:00 committed by corvus
parent 4b3b6b212d
commit 08eabd21e4
3 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
flight/Bootloaders/AHRS/inc/ahrs_bl.h
View File

@ -29,25 +29,25 @@
/* PIOS Includes */
#include <pios.h>
/** Start programming
returns: true if FLASH erased and ready to program
*/
bool StartProgramming(void);
/** Write a block to FLASH
buffer contains the data to be written
returns: true if FLASH programmed correctly
*/
bool WriteData(uint32_t offset, uint8_t *buffer, uint32_t size);
/** Read a block from FLASH
returns: true if FLASH read correctly.
Buffer is set to the read data
*/
bool ReadData(uint32_t offset, uint8_t *buffer, uint32_t size);
#include <pios.h>
/** Start programming
returns: true if FLASH erased and ready to program
*/
bool StartProgramming(void);
/** Write a block to FLASH
buffer contains the data to be written
returns: true if FLASH programmed correctly
*/
bool WriteData(uint32_t offset, uint8_t *buffer, uint32_t size);
/** Read a block from FLASH
returns: true if FLASH read correctly.
Buffer is set to the read data
*/
bool ReadData(uint32_t offset, uint8_t *buffer, uint32_t size);
#endif /* AHRS_BL_H */

22
ground/openpilotgcs/src/libs/libqxt/src/gui/qxtconfirmationmessage.cpp
View File

@ -195,17 +195,17 @@ QxtConfirmationMessage::~QxtConfirmationMessage()
}
/*!
Opens an confirmation message box with the specified \a title, \a text and \a confirmation.
The standard \a buttons are added to the message box. \a defaultButton specifies
the button used when Enter is pressed. \a defaultButton must refer to a button that
was given in \a buttons. If \a defaultButton is QMessageBox::NoButton, QMessageBox
chooses a suitable default automatically.
Returns the identity of the standard button that was clicked.
If Esc was pressed instead, the escape button is returned.
If \a parent is \c 0, the message box is an application modal dialog box.
If \a parent is a widget, the message box is window modal relative to \a parent.
Opens an confirmation message box with the specified \a title, \a text and \a confirmation.
The standard \a buttons are added to the message box. \a defaultButton specifies
the button used when Enter is pressed. \a defaultButton must refer to a button that
was given in \a buttons. If \a defaultButton is QMessageBox::NoButton, QMessageBox
chooses a suitable default automatically.
Returns the identity of the standard button that was clicked.
If Esc was pressed instead, the escape button is returned.
If \a parent is \c 0, the message box is an application modal dialog box.
If \a parent is a widget, the message box is window modal relative to \a parent.
*/
QMessageBox::StandardButton QxtConfirmationMessage::confirm(QWidget* parent,
const QString& title, const QString& text, const QString& confirmation,

76
ground/openpilotgcs/src/libs/libqxt/src/gui/qxtflowview.cpp
View File

@ -148,11 +148,11 @@ QAbstractItemModel * QxtFlowView::model()
return d->model;
}
/*!
/*!
\property QxtFlowView::backgroundColor
\brief the background color
The default value is black.
\brief the background color
The default value is black.
*/
QColor QxtFlowView::backgroundColor() const
{
@ -165,13 +165,13 @@ void QxtFlowView::setBackgroundColor(const QColor& c)
triggerRender();
}
/*!
/*!
\property QxtFlowView::slideSize
\brief the slide size
The slide dimensions are in pixels.
The default value is 150x200.
\brief the slide size
The slide dimensions are in pixels.
The default value is 150x200.
*/
QSize QxtFlowView::slideSize() const
{
@ -186,11 +186,11 @@ void QxtFlowView::setSlideSize(QSize size)
triggerRender();
}
/*!
/*!
\property QxtFlowView::reflectionEffect
\brief the reflection effect
The default value is PlainReflection.
\brief the reflection effect
The default value is PlainReflection.
*/
QxtFlowView::ReflectionEffect QxtFlowView::reflectionEffect() const
{
@ -203,11 +203,11 @@ void QxtFlowView::setReflectionEffect(ReflectionEffect effect)
d->reset();
}
/*!
/*!
\property QxtFlowView::pictureRole
\brief the picture role
The default value is Qt::DecorationRole.
\brief the picture role
The default value is Qt::DecorationRole.
*/
int QxtFlowView::pictureRole()
{
@ -220,11 +220,11 @@ void QxtFlowView::setPictureRole(int a)
d->reset();
}
/*!
/*!
\property QxtFlowView::pictureColumn
\brief the picture column
The default value is \c 0.
\brief the picture column
The default value is \c 0.
*/
int QxtFlowView::pictureColumn()
{
@ -261,11 +261,11 @@ void QxtFlowView::setTextColumn(int a)
}
#endif
/*!
/*!
\property QxtFlowView::rootIndex
\brief the root index
The root index is the parent index to the view's toplevel items. The root can be invalid.
\brief the root index
The root index is the parent index to the view's toplevel items. The root can be invalid.
*/
QModelIndex QxtFlowView::rootIndex() const
{
@ -277,14 +277,14 @@ void QxtFlowView::setRootIndex(QModelIndex index)
d->rootindex = index;
}
/*!
/*!
\property QxtFlowView::currentIndex
\brief the current index
The slide of the current index is shown in the middle of the viewport.
\bold {Note:} No animation effect will be produced.
\sa showSlide()
\brief the current index
The slide of the current index is shown in the middle of the viewport.
\bold {Note:} No animation effect will be produced.
\sa showSlide()
*/
QModelIndex QxtFlowView::currentIndex() const
{
@ -739,11 +739,11 @@ void QxtFlowViewPrivate::reset()
QModelIndex idx = model->index(i, piccolumn, rootindex);
insertSlide(i, qvariant_cast<QImage>(model->data(idx, picrole)));
modelmap.insert(i, idx);
}
if(modelmap.count())
currentcenter=modelmap.at(0);
else
currentcenter=QModelIndex();
}
if(modelmap.count())
currentcenter=modelmap.at(0);
else
currentcenter=QModelIndex();
}
triggerRender();
}