pqm/pqmdatalogger: Rms data logging.

Signed-off-by: andreidanila1 <[email protected]>
analogdevicesinc · Nov 19, 2024 · f0e977f · f0e977f
1 parent 82197e4
commit f0e977f
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 13 deletions.
diff --git a/plugins/pqm/include/pqm/pqmdatalogger.h b/plugins/pqm/include/pqm/pqmdatalogger.h
@@ -44,15 +44,17 @@ class PqmDataLogger : public QObject
 
 	void setChnlsName(QStringList chnlsName);
 	void acquireBufferData(double val, int chIdx);
-	void acquireAttrData(QString attrName, QString value, QString chId);
+	void acquireAttrData(QMap<QString, QMap<QString, QString>> pqmAttr);
 	void acquirePqEvents(QString event);
 	void log();
 	void writeToFile();
 public Q_SLOTS:
 	void logPressed(ActiveInstrument instr, const QString &filePath = "");
 
 private:
-	void acquireHarmonics(QString attrName, QString value, QString chId);
+	void acquireHarmonics(QMap<QString, QMap<QString, QString>> pqmAttr);
+	void acquireRmsChnlAttr(QMap<QString, QMap<QString, QString>> pqmAttr);
+	void acquireRmsDeviceAttr(QMap<QString, QMap<QString, QString>> pqmAttr);
 	void createHeader();
 
 	ActiveInstrument m_crtInstr;
@@ -62,6 +64,12 @@ public Q_SLOTS:
 	QQueue<QString> m_logQue;
 	QFutureWatcher<void> *m_writeFw;
 	QMutex m_mutex;
+	const QString ATTR_HARMONICS = "harmonics";
+	const QString PQM_DEVICE = "pqm";
+	const QStringList m_rmsHeader{"rms", "angle", "deviation_under", "deviation_over", "pinst", "pst", "plt"};
+	const QMap<QString, QStringList> m_rmsDeviceAttr{
+		{"voltage", {"u2", "u0", "sneg_voltage", "spos_voltage", "szro_voltage"}},
+		{"current", {"i2", "i0", "sneg_current", "spos_current", "szro_current"}}};
 };
 
 } // namespace scopy::pqm

diff --git a/plugins/pqm/src/acquisitionmanager.cpp b/plugins/pqm/src/acquisitionmanager.cpp
@@ -172,9 +172,9 @@ bool AcquisitionManager::readPqmAttributes()
 			attrName = iio_channel_get_attr(chnl, j);
 			iio_channel_attr_read(chnl, attrName, dest, MAX_ATTR_SIZE);
 			m_pqmAttr[chnlId][attrName] = QString(dest);
-			m_pqmLog->acquireAttrData(attrName, dest, chnlId);
 		}
 	}
+	m_pqmLog->acquireAttrData(m_pqmAttr);
 	handlePQEvents();
 	m_pqmLog->log();
 	return true;

diff --git a/plugins/pqm/src/pqmdatalogger.cpp b/plugins/pqm/src/pqmdatalogger.cpp
@@ -63,20 +63,64 @@ void PqmDataLogger::acquireBufferData(double val, int chIdx)
 	m_logQue.enqueue(QString::number(val) + ",");
 }
 
-void PqmDataLogger::acquireHarmonics(QString attrName, QString value, QString chId)
+void PqmDataLogger::acquireHarmonics(QMap<QString, QMap<QString, QString>> pqmAttr)
 {
-	if(attrName.compare("harmonics") != 0) {
-		return;
+	QMutexLocker locker(&m_mutex);
+	for(const QString &ch : qAsConst(m_chnlsName)) {
+		if(!pqmAttr[ch].contains(ATTR_HARMONICS)) {
+			continue;
+		}
+		QString harmonics = pqmAttr[ch][ATTR_HARMONICS];
+		m_logQue.enqueue(QTime::currentTime().toString("hh:mm:ss.zzz") + "," + ch + "," +
+				 harmonics.split(" ").join(",") + "\n");
 	}
+}
+
+void PqmDataLogger::acquireRmsChnlAttr(QMap<QString, QMap<QString, QString>> pqmAttr)
+{
 	QMutexLocker locker(&m_mutex);
-	m_logQue.enqueue(QTime::currentTime().toString("hh:mm:ss.zzz") + "," + chId + "," + value.split(" ").join(",") +
-			 "\n");
+	m_logQue.enqueue("Time,Phase," + m_rmsHeader.join(",") + "\n");
+	for(const QString &ch : qAsConst(m_chnlsName)) {
+		m_logQue.enqueue(QTime::currentTime().toString("hh:mm:ss.zzz") + "," + ch + ",");
+		for(const QString &attr : m_rmsHeader) {
+			if(!pqmAttr[ch].contains(attr)) {
+				m_logQue.enqueue("-,");
+				continue;
+			}
+			m_logQue.enqueue(pqmAttr[ch][attr] + ",");
+		}
+		m_logQue.enqueue("\n");
+	}
+	m_logQue.enqueue("\n");
 }
 
-void PqmDataLogger::acquireAttrData(QString attrName, QString value, QString chId)
+void PqmDataLogger::acquireRmsDeviceAttr(QMap<QString, QMap<QString, QString>> pqmAttr)
+{
+	QMutexLocker locker(&m_mutex);
+	for(auto it = m_rmsDeviceAttr.begin(); it != m_rmsDeviceAttr.end(); ++it) {
+		const QStringList attributes = it.value();
+		m_logQue.enqueue(QTime::currentTime().toString("hh:mm:ss.zzz") + "," + it.key() + "," +
+				 attributes.join(",") + "\n,,");
+		for(const QString &attr : attributes) {
+			if(!pqmAttr[PQM_DEVICE].contains(attr)) {
+				m_logQue.enqueue("-,");
+				continue;
+			}
+			m_logQue.enqueue(pqmAttr[PQM_DEVICE][attr] + ",");
+		}
+		m_logQue.enqueue("\n");
+	}
+	m_logQue.enqueue("\n");
+}
+
+void PqmDataLogger::acquireAttrData(QMap<QString, QMap<QString, QString>> pqmAttr)
 {
 	if(m_crtInstr == Harmonics) {
-		acquireHarmonics(attrName, value, chId);
+		acquireHarmonics(pqmAttr);
+	}
+	if(m_crtInstr == Rms) {
+		acquireRmsChnlAttr(pqmAttr);
+		acquireRmsDeviceAttr(pqmAttr);
 	}
 }
 
@@ -149,13 +193,12 @@ void PqmDataLogger::createHeader()
 	QFile f(m_filePath);
 	if(f.open(QIODevice::WriteOnly)) {
 		QTextStream stream(&f);
-		stream << "Time ,";
 		switch(m_crtInstr) {
 		case Waveform:
-			stream << m_chnlsName.join(",");
+			stream << "Time," << m_chnlsName.join(",");
 			break;
 		case Harmonics:
-			stream << "Phase ,";
+			stream << "Time,Phase,";
 			for(int i = 0; i <= 50; i++) {
 				stream << i << ",";
 			}