rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-29 14:52:12 +01:00
Code Issues Releases Activity

Remove "toMSecsSinceEpoch" usage to be compatible with earlier versions of Qt

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2720 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2011-02-04 15:02:46 +00:00 committed by pip
parent b50965ba9f
commit 59a8b90653
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ground/openpilotgcs/src/plugins/pipxtreme/pipxtreme.ui
View File

@ -440,6 +440,12 @@
</item> </item>
<item row="7" column="1"> <item row="7" column="1">
<widget class="QProgressBar" name="progressBar_RSSI"> <widget class="QProgressBar" name="progressBar_RSSI">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Received Signal Strength Indicator</string> <string>Received Signal Strength Indicator</string>
</property> </property>
@ -452,9 +458,15 @@
<property name="value"> <property name="value">
<number>-60</number> <number>-60</number>
</property> </property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="textVisible"> <property name="textVisible">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="textDirection">
<enum>QProgressBar::TopToBottom</enum>
</property>
<property name="format"> <property name="format">
<string>%v</string> <string>%v</string>
</property> </property>
@ -472,6 +484,12 @@
</item> </item>
<item row="8" column="1"> <item row="8" column="1">
<widget class="QLineEdit" name="lineEdit_RxAFC"> <widget class="QLineEdit" name="lineEdit_RxAFC">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QLineEdit { <string notr="true">QLineEdit {
border: none; border: none;
@ -756,6 +774,12 @@
</item> </item>
<item row="9" column="1"> <item row="9" column="1">
<widget class="QLineEdit" name="lineEdit_Retries"> <widget class="QLineEdit" name="lineEdit_Retries">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QLineEdit { <string notr="true">QLineEdit {
border: none; border: none;

6
ground/openpilotgcs/src/plugins/pipxtreme/pipxtremegadgetwidget.cpp
View File

@ -114,7 +114,8 @@ PipXtremeGadgetWidget::PipXtremeGadgetWidget(QWidget *parent) :
m_widget = new Ui_PipXtremeWidget(); m_widget = new Ui_PipXtremeWidget();
m_widget->setupUi(this); m_widget->setupUi(this);
qsrand(QDateTime::currentDateTime().toMSecsSinceEpoch()); // qsrand(QDateTime::currentDateTime().toMSecsSinceEpoch()); // only available with Qt 4.7.1 and later
qsrand(QDateTime::currentDateTime().toTime_t());
device_input_buffer.size = 8192; device_input_buffer.size = 8192;
device_input_buffer.used = 0; device_input_buffer.used = 0;
@ -444,7 +445,8 @@ void PipXtremeGadgetWidget::enableTelemetry()
void PipXtremeGadgetWidget::randomiseAESKey() void PipXtremeGadgetWidget::randomiseAESKey()
{ {
uint32_t crc = ((uint32_t)qrand() << 16) ^ qrand() ^ QDateTime::currentDateTime().toMSecsSinceEpoch(); // uint32_t crc = ((uint32_t)qrand() << 16) ^ qrand() ^ QDateTime::currentDateTime().toMSecsSinceEpoch(); // only available with Qt 4.7.1 and later
uint32_t crc = ((uint32_t)qrand() << 16) ^ qrand() ^ QDateTime::currentDateTime().toTime_t();
QString key = ""; QString key = "";
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)