adrv9002: code refactoring

Signed-off-by: IonutMuthi <[email protected]>

Author: IonutMuthi

iio-widgets/src/datastrategy/channelattrdatastrategy.cpp

@@ -106,7 +106,6 @@ QPair<QString, QString> ChannelAttrDataStrategy::read()
 	}
 
 	// the members that contain data need to be refreshed before the signals are emitted
-	QString oldData = m_data;
 	m_data = currentValue;
 	m_optionalData = options;
 

packages/adrv9002/plugins/adrv9002plugin/include/adrv9002plugin/adrv9002.h

@@ -83,8 +83,9 @@ private Q_SLOTS:
 				     const QString &title);
 	IIOWidget *createRangeWidget(iio_channel *ch, const QString &attr, const QString &range, const QString &title);
 	IIOWidget *createCheckboxWidget(iio_channel *ch, const QString &attr, const QString &label);
-	QLabel *createReadOnlyLabel(iio_channel *ch, const QString &attr, double divisor = 1.0,
-				    const QString &title = QString());
+
+	IIOWidget *createReadOnlyWidget(iio_channel *ch, const QString &attr, const QString &title);
+	IIOWidget *createContinuousReadOnlyWidget(iio_channel *ch, const QString &attr, const QString &title);
 
 	// Standard Scopy tool components
 	iio_context *m_ctx = nullptr;

packages/adrv9002/plugins/adrv9002plugin/include/adrv9002plugin/channelconfigwidget.h

@@ -48,10 +48,10 @@ class SCOPY_ADRV9002PLUGIN_EXPORT ChannelConfigWidget : public QWidget
 	struct ChannelData
 	{
 		bool enabled = true;
-		bool freqOffsetCorrection = false;
-		QString bandwidth = "38000000";
-		QString sampleRate = "61440000";
-		QString rfInput = "Rx1A"; // Only used for RX channels
+		bool freqOffsetCorrectionEnable = false;
+		uint32_t channelBandwidthHz = 38000000;
+		uint32_t sampleRateHz = 61440000;
+		uint8_t rfPort = 0; // Only used for RX channels
 	};
 
 	explicit ChannelConfigWidget(const QString &title, ChannelMode mode, const QStringList &rfInputOptions = {},

packages/adrv9002/plugins/adrv9002plugin/include/adrv9002plugin/profilegeneratorconstants.h

@@ -23,6 +23,7 @@
 
 #include <QString>
 #include <QStringList>
+#include "profilegeneratortypes.h"
 
 namespace scopy::adrv9002 {
 
@@ -78,6 +79,15 @@ class IOOOptions
 	static const QStringList DUPLEX_MODE_OPTIONS;
 };
 
+class ProfileGeneratorConstants
+{
+public:
+	// Create complete lte_defaults configuration template
+	static RadioConfig lteDefaults();
+	// Create complete lte_lvs_3072_MHz_10 configuration template
+	static RadioConfig lte_lvs3072MHz10();
+};
+
 } // namespace scopy::adrv9002
 
-#endif // PROFILEGENERATORCONSTANTS_H
+#endif // PROFILEGENERATORCONSTANTS_H

packages/adrv9002/plugins/adrv9002plugin/include/adrv9002plugin/profilegeneratortypes.h

@@ -34,31 +34,107 @@ enum ChannelType
 	CHANNEL_TX2
 };
 
-struct ChannelConfig
+struct RxChannelConfig
 {
+	//  Enable channel
 	bool enabled;
-	bool freqOffsetCorrection;
-	QString bandwidth;
-	QString sampleRate;
-	QString rfInput; // For RX only
+	// Enable high performance ADC, otherwise use low-power ADC
+	bool adcHighPerformanceMode;
+	// Enable ADC frequency offset correction
+	bool freqOffsetCorrectionEnable;
+	// Power mode of front-end analog filter Options are:
+	// 	0 - Low power
+	// 	1 - Medium power
+	// 	2 - High power
+	uint8_t analogFilterPowerMode;
+	// Use second order (Biquad) analog filter, otherwise first order TIA is used
+	bool analogFilterBiquad;
+	// Front-end analog filter 1dB (Biquad) or 3 dB (TIA) bandwidth in Hz
+	uint32_t analogFilterBandwidthHz;
+	// Channel bandwidth of interest at ADC in Hz
+	uint32_t channelBandwidthHz;
+	// RX channel sample rate at digital interface
+	uint32_t sampleRateHz;
+	// Enable NCO to perform frequency translation
+	bool ncoEnable;
+	// NCO frequency in Hz
+	int32_t ncoFrequencyHz;
+	// RF port source used for channel Options are:
+	//        0 - RX_A
+	//        1 - RX_B
+	uint8_t rfPort;
 };
 
-struct OrxConfig
+struct TxChannelConfig
 {
+	// Enable channel
 	bool enabled;
+	// Data rate at digital interface in Hz
+	uint32_t sampleRateHz;
+	// Enable DAC frequency offset correction
+	bool freqOffsetCorrectionEnable;
+	// Power mode of front-end analog filter Options are:
+	// 	0 - Low power
+	// 	1 - Medium power
+	// 	2 - High power
+	uint8_t analogFilterPowerMode;
+	// Channel bandwidth of interest at DAC in Hz
+	uint32_t channelBandwidthHz;
+	// Enable observation path
+	bool orxEnabled;
+	// Set external loopback mode. Options are:
+	//        0 - Disabled
+	//        1 - Before PA
+	//        2 - After PA
+	uint8_t elbType;
+};
+
+struct ClockConfig
+{
+	// Template-based parameters (from iio-oscilloscope clock_config)
+	uint32_t deviceClockFrequencyKhz;
+	bool deviceClockOutputEnable;
+	uint8_t deviceClockOutputDivider;
+	//  Enable high performance PLL mode, otherwise low-power mode is used
+	bool clockPllHighPerformanceEnable;
+	//  PLL power mode. Options:
+	//    0 = low power
+	//    1 = medium performance
+	//    2 = high performance
+	uint8_t clockPllPowerMode;
+	// Processor clock divider. Valid values are 1, 2, 4, 8, 16, 32, 64, 128, 256
+	uint8_t processorClockDivider;
 };
 
 struct RadioConfig
 {
-	bool fdd;	   // Duplex mode (false=TDD, true=FDD)
-	bool lvds;	   // SSI interface (true=LVDS, false=CMOS)
+	// SSI lanes to use Valid cases:
+	//          1 (CMOS/LVDS)
+	//          2 (LVDS)
+	//          4 (CMOS)
 	uint8_t ssi_lanes; // 1, 2, or 4 lanes
+	// Use DDR mode at digital interface, false will use SDR
+	bool ddr;
+	// Use short strobe mode at digital interface, false will use long strobe
+	bool shortStrobe;
+	// Use LVDS mode at digital interface, false will use CMOS
+	bool lvds;
+	// ADC clock rate mode select. Options are:
+	// 	1 = LOW
+	// 	2 = MEDIUM
+	// 	3 = HIGH
+	uint8_t adcRateMode;
+	//  Use FDD duplex mode, false will use TDD
+	bool fdd;
+
+	// Channel configurations
+	RxChannelConfig rx_config[2]; // RX1, RX2
+	TxChannelConfig tx_config[2]; // TX1, TX2
 
-	ChannelConfig rx_config[2]; // RX1, RX2
-	ChannelConfig tx_config[2]; // TX1, TX2
-	bool orx_enabled[2];	    // ORX1, ORX2
+	// Clock configuration
+	ClockConfig clk_config;
 };
 
 } // namespace scopy::adrv9002
 
-#endif // PROFILEGENERATORTYPES_H
+#endif // PROFILEGENERATORTYPES_H

packages/adrv9002/plugins/adrv9002plugin/include/adrv9002plugin/profilegeneratorwidget.h

@@ -65,15 +65,29 @@ namespace scopy::adrv9002 {
 // Device Configuration Parser (Phase 1 addition)
 class DeviceConfigurationParser
 {
+
 public:
 	struct ParsedChannelData
 	{
+		//  Enable channel
 		bool enabled;
-		QString bandwidth;
-		QString sampleRate;
-		bool freqOffsetCorrection;
-		QString rfPort;	 // RX only
+		uint32_t analogFilterBandwidthHz;
+		// Channel bandwidth of interest at ADC in Hz
+		uint32_t channelBandwidthHz;
+		// RX channel sample rate at digital interface
+		uint32_t sampleRateHz;
+		// Enable ADC frequency offset correction
+		bool freqOffsetCorrectionEnable;
+		// RF port source used for channel Options are:
+		//        0 - RX_A
+		//        1 - RX_B
+		uint8_t rfPort; // RX only
+		// Enable observation path
 		bool orxEnabled; // TX only
+
+		// Data source tracking (NEW)
+		bool hasChannelData; // indicates if IIO channel attributes were read
+		QString dataSource;  // "profile_config", "iio_attributes", or "unavailable"
 	};
 
 	struct ParsedDeviceConfig
@@ -86,11 +100,11 @@ class DeviceConfigurationParser
 		ParsedChannelData txChannels[2];
 
 		// Clock config
-		QString deviceClock;
-		QString clockDivider;
+		uint32_t deviceClock;
+		uint32_t clockDivider;
 	};
 
-	static ParsedDeviceConfig parseProfileConfig(const QString &profileConfigText);
+	static ParsedDeviceConfig parseProfileConfig(iio_device *dev, const QString &profileConfigText);
 	static QString extractValueBetween(const QString &text, const QString &begin, const QString &end);
 	static QString mapRfPortFromDevice(const QString &devicePort, int channel);
 };
@@ -118,7 +132,7 @@ public Q_SLOTS:
 private Q_SLOTS:
 	void onPresetChanged();
 	void onRefreshProfile();
-	void onSaveToFile();
+	void onSaveToFile(bool isStreamFile);
 	void onLoadToDevice();
 	void updateProfileData();
 	void onDownloadCLI();
@@ -141,10 +155,15 @@ private Q_SLOTS:
 	void loadPresetData(const QString &presetName);
 	void updateDebugInfo();
 	void updateConfigFromUI();
+	int getConfigFromCurrent(RadioConfig &config);
+	int getConfigFromDefault(RadioConfig &config);
+	int getConfigFromDevice(RadioConfig &config);
+	void populateConfigFromUI(RadioConfig &config);
+	void populateConfigFromDeviceData(RadioConfig &config,
+					  const DeviceConfigurationParser::ParsedDeviceConfig &deviceConfig);
 
 	// Preset Management
 	void applyLTEDefaults();
-	void applyLTEPresetLogic();
 	bool isLTEModeActive() const;
 	bool isLiveDeviceModeActive() const;
 
@@ -162,10 +181,6 @@ private Q_SLOTS:
 	bool getTddModeEnabled();
 	bool isOrxAvailable(int orxIndex);
 
-	// Validation helpers
-	void validateChannelConfiguration();
-	void updateAllDependentControls();
-
 	// Phase 2: Complete UI Refresh System
 	void refreshAllUIStates();
 
@@ -187,11 +202,12 @@ private Q_SLOTS:
 
 	// Device Communication
 	QString readDeviceAttribute(const QString &attributeName);
+	QString getDeviceDriverVersion();
 
 	// Phase 1: Device Configuration Reading
 	bool readDeviceConfiguration();
+	iio_channel *findIIOChannel(const QString &channelName, bool isOutput);
 	void populateUIFromDeviceConfig(const DeviceConfigurationParser::ParsedDeviceConfig &config);
-	bool isDeviceConfigurationAvailable();
 	void resetPresetTracking();
 	void forceUpdateAllUIControls();
 	bool readAndApplyDeviceConfiguration();
@@ -216,7 +232,8 @@ private Q_SLOTS:
 	// Action Bar Components
 	QComboBox *m_presetCombo;
 	QPushButton *m_refreshProfileBtn;
-	AnimatedLoadingButton *m_saveToFileBtn;
+	AnimatedLoadingButton *m_saveStreamToFileBtn;
+	AnimatedLoadingButton *m_saveProfileToFileBtn;
 	AnimatedLoadingButton *m_loadToDeviceBtn;
 
 	// Radio Config Components

packages/adrv9002/plugins/adrv9002plugin/include/adrv9002plugin/profilemanager.h

@@ -70,7 +70,6 @@ public Q_SLOTS:
 
 private Q_SLOTS:
 	void onProfileFileChanged();
-	void doOnProfileFileChangedInThread();
 	void onStreamFileChanged();
 	void updateStatus();