From c854b746900491170b42da6e2d03c8350a5b3eb8 Mon Sep 17 00:00:00 2001 From: pip Date: Wed, 2 Feb 2011 17:53:30 +0000 Subject: [PATCH] Fixed carrier frequency problems. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2699 ebee16cc-31ac-478f-84a7-5cbb03baadba --- .../src/plugins/pipxtreme/pipxtremegadgetwidget.cpp | 2 +- .../src/plugins/pipxtreme/pipxtremegadgetwidget.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/pipxtreme/pipxtremegadgetwidget.cpp b/ground/openpilotgcs/src/plugins/pipxtreme/pipxtremegadgetwidget.cpp index d92271862..d732cd84f 100644 --- a/ground/openpilotgcs/src/plugins/pipxtreme/pipxtremegadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/pipxtreme/pipxtremegadgetwidget.cpp @@ -494,7 +494,7 @@ void PipXtremeGadgetWidget::saveToFlash() s = m_widget->doubleSpinBox_Frequency->text().trimmed(); s.replace(' ', ""); // remove all spaces - settings.frequency_Hz = s.toFloat(&ok) * 1e6; + settings.frequency_Hz = (uint32_t)(s.toDouble(&ok) * 1e6); if (s.isEmpty() || !ok || settings.frequency_Hz < settings.min_frequency_Hz || settings.frequency_Hz > settings.max_frequency_Hz) { error("Check your \"Frequency\" entry!", 0); diff --git a/ground/openpilotgcs/src/plugins/pipxtreme/pipxtremegadgetwidget.h b/ground/openpilotgcs/src/plugins/pipxtreme/pipxtremegadgetwidget.h index c32422dc5..08db4e78f 100644 --- a/ground/openpilotgcs/src/plugins/pipxtreme/pipxtremegadgetwidget.h +++ b/ground/openpilotgcs/src/plugins/pipxtreme/pipxtremegadgetwidget.h @@ -81,7 +81,7 @@ typedef struct uint32_t min_frequency_Hz; uint32_t max_frequency_Hz; - float frequency_Hz; + uint32_t frequency_Hz; uint32_t max_rf_bandwidth; @@ -99,7 +99,7 @@ typedef struct typedef struct { - float start_frequency; + uint32_t start_frequency; float frequency_step_size; uint16_t magnitudes; // int8_t magnitude[0];