admt: Fix displayed turn count

- Code cleanup potential memory leaks
- Disabled ECC on startup
- Adusted layout for calibration tab
- Replaced maps with QMap

Signed-off-by: John Lloyd Juanillo <[email protected]>

Author: JJuanill

plugins/admt/include/admt/admtcontroller.h

@@ -24,7 +24,6 @@
 
 #include "scopy-admt_export.h"
 
-#include <bitset>
 #include <iio.h>
 
 #include <QElapsedTimer>
@@ -34,14 +33,10 @@
 #include <iioutil/connectionprovider.h>
 #include <pluginbase/statusbarmanager.h>
 
-#include <algorithm>
 #include <cmath>
-#include <complex>
 #include <cstdint>
 #include <cstdlib>
-#include <iterator>
 #include <math.h>
-#include <numeric>
 #include <vector>
 
 using namespace std;
@@ -266,6 +261,7 @@ public Q_SLOTS:
 Q_SIGNALS:
 	void streamData(double value);
 	void streamBufferedData(const QVector<double> &value);
+	void requestDisconnect();
 
 private:
 	QWidget *m_page;
@@ -288,4 +284,4 @@ public Q_SLOTS:
 };
 } // namespace scopy::admt
 
-#endif // ADMTCONTROLLER_H
+#endif // ADMTCONTROLLER_H

plugins/admt/include/admt/harmoniccalibration.h

@@ -104,6 +104,7 @@ class SCOPY_ADMT_EXPORT HarmonicCalibration : public QWidget
 	bool running() const;
 	void setRunning(bool newRunning);
 	void requestDisconnect();
+
 public Q_SLOTS:
 	void run(bool);
 	void stop();
@@ -150,16 +151,28 @@ public Q_SLOTS:
 	double rotation, angle, count, temp = 0.0, motor_rpm, amax, rotate_vmax, dmax, disable, target_pos, current_pos,
 				       ramp_mode, afeDiag0, afeDiag1, afeDiag2;
 
+	QPen channel0Pen, channel1Pen, channel2Pen, channel3Pen, channel4Pen, channel5Pen, channel6Pen, channel7Pen;
+
+	QMap<string, string> deviceRegisterMap;
+	QMap<string, int> GENERALRegisterMap;
+	QMap<string, bool> DIGIOENRegisterMap, FAULTRegisterMap, DIAG1RegisterMap;
+	QMap<string, double> DIAG2RegisterMap, DIAG1AFERegisterMap;
+
+	QVector<double> acquisitionAngleList, acquisitionABSAngleList, acquisitionTmp0List, acquisitionTmp1List,
+		acquisitionSineList, acquisitionCosineList, acquisitionRadiusList, acquisitionAngleSecList,
+		acquisitionSecAnglIList, acquisitionSecAnglQList, graphDataList, graphPostDataList;
+
 	QPushButton *openLastMenuButton, *calibrationStartMotorButton, *calibrateDataButton, *extractDataButton,
 		*clearCalibrateDataButton, *clearCommandLogButton, *applySequenceButton, *readAllRegistersButton;
 	QButtonGroup *rightMenuButtonGroup;
 
-	QLineEdit *acquisitionMotorRPMLineEdit, *calibrationMotorRPMLineEdit, *motorTargetPositionLineEdit,
-		*displayLengthLineEdit, *dataGraphSamplesLineEdit, *tempGraphSamplesLineEdit,
-		*acquisitionMotorCurrentPositionLineEdit, *calibrationH1MagLineEdit, *calibrationH2MagLineEdit,
-		*calibrationH3MagLineEdit, *calibrationH8MagLineEdit, *calibrationH1PhaseLineEdit,
-		*calibrationH2PhaseLineEdit, *calibrationH3PhaseLineEdit, *calibrationH8PhaseLineEdit,
-		*calibrationMotorCurrentPositionLineEdit, *AFEDIAG0LineEdit, *AFEDIAG1LineEdit, *AFEDIAG2LineEdit;
+	QLineEdit *acquisitionMotorRPMLineEdit, *calibrationCycleCountLineEdit, *calibrationSamplesPerCycleLineEdit,
+		*calibrationMotorRPMLineEdit, *motorTargetPositionLineEdit, *displayLengthLineEdit,
+		*dataGraphSamplesLineEdit, *tempGraphSamplesLineEdit, *acquisitionMotorCurrentPositionLineEdit,
+		*calibrationH1MagLineEdit, *calibrationH2MagLineEdit, *calibrationH3MagLineEdit,
+		*calibrationH8MagLineEdit, *calibrationH1PhaseLineEdit, *calibrationH2PhaseLineEdit,
+		*calibrationH3PhaseLineEdit, *calibrationH8PhaseLineEdit, *calibrationMotorCurrentPositionLineEdit,
+		*AFEDIAG0LineEdit, *AFEDIAG1LineEdit, *AFEDIAG2LineEdit;
 
 	QLabel *rawAngleValueLabel, *rotationValueLabel, *angleValueLabel, *countValueLabel, *tempValueLabel,
 		*motorAmaxValueLabel, *motorRotateVmaxValueLabel, *motorDmaxValueLabel, *motorDisableValueLabel,
@@ -249,10 +262,10 @@ public Q_SLOTS:
 	ToolTemplate *createRegistersWidget();
 	ToolTemplate *createUtilityWidget();
 
-	void readDeviceProperties();
+	bool readDeviceProperties();
 	void initializeADMT();
 	bool readSequence();
-	bool writeSequence(const map<string, int> &settings);
+	bool writeSequence(QMap<string, int> settings);
 	void applySequence();
 	bool changeCNVPage(uint32_t page);
 	void initializeMotor();
@@ -263,6 +276,7 @@ public Q_SLOTS:
 	void stopCurrentMotorPositionMonitor();
 	void currentMotorPositionTask(int sampleRate);
 	bool resetGENERAL();
+	void stopTasks();
 
 #pragma region Acquisition Methods
 	bool updateChannelValues();
@@ -383,6 +397,7 @@ public Q_SLOTS:
 					 QWidget *parent = nullptr);
 	void configureCoeffRow(QWidget *container, QHBoxLayout *layout, QLabel *hLabel, QLabel *hMagLabel,
 			       QLabel *hPhaseLabel);
+	void initializeChannelColors();
 #pragma endregion
 
 #pragma region Connect Methods

plugins/admt/src/admtcontroller.cpp

@@ -28,14 +28,11 @@
 #include <cstdlib>
 #include <cstring>
 #include <iioutil/connectionprovider.h>
-#include <iomanip>
-#include <iostream>
 #include <iterator>
 #include <list>
 #include <math.h>
 #include <numeric>
 #include <string>
-#include <thread>
 #include <vector>
 
 static const size_t maxAttrSize = 512;
@@ -252,13 +249,17 @@ double ADMTController::getChannelValue(const char *deviceName, const char *chann
 
 	double *scaleVal = new double(1);
 	int scaleRet = iio_channel_attr_read_double(channel, scaleAttr, scaleVal);
-	if(scaleRet != 0)
+	if(scaleRet != 0) {
+		delete scaleVal;
 		return static_cast<double>(UINT64_MAX); // return QString("Cannot read scale attribute");
+	}
 	scale = *scaleVal;
+	delete scaleVal;
 
 	char *offsetDst = new char[maxAttrSize];
 	iio_channel_attr_read(channel, offsetAttr, offsetDst, maxAttrSize);
 	offsetAttrVal = std::atoi(offsetDst);
+	delete[] offsetDst;
 
 	iio_buffer *iioBuffer = iio_device_create_buffer(admtDevice, bufferSize, false);
 	if(iioBuffer == NULL)
@@ -273,14 +274,9 @@ double ADMTController::getChannelValue(const char *deviceName, const char *chann
 	if(numBytesRead < 0)
 		return static_cast<double>(UINT64_MAX); // return QString("Cannot refill buffer.");
 
-	pointerIncrement = reinterpret_cast<ptrdiff_t>(iio_buffer_step(iioBuffer));
-	pointerEnd = static_cast<int8_t *>(iio_buffer_end(iioBuffer));
-
 	const struct iio_data_format *format = iio_channel_get_data_format(channel);
 	const struct iio_data_format channelFormat = *format;
 	unsigned int repeat = channelFormat.repeat;
-	uint8_t bitLength = static_cast<uint8_t>(channelFormat.bits);
-	size_t offset = static_cast<uint8_t>(channelFormat.shift);
 
 	QString result;
 	std::list<char> rawSamples;
@@ -726,7 +722,6 @@ void ADMTController::getPreCalibrationFFT(const vector<double> &PANG, vector<dou
 void ADMTController::postcalibrate(vector<double> PANG, int cycleCount, int samplesPerCycle, bool CCW)
 {
 	int circshiftData = 0;
-	QString result = "";
 
 	/* Check CCW flag to know if array is to be reversed */
 	if(CCW)
@@ -1220,12 +1215,12 @@ int ADMTController::getAbsAngleTurnCount(uint16_t registerValue)
 	// Bits 15:8: Turn count in quarter turns
 	uint8_t turnCount = (registerValue & 0xFF00) >> 8;
 
-	if(turnCount <= 0xD5) {
+	if(turnCount <= 0xD7) {
 		// Straight binary turn count
 		return turnCount / 4; // Convert from quarter turns to whole turns
-	} else if(turnCount == 0xD6) {
+	} else if(turnCount >= 0xD8 && turnCount <= 0xDB) {
 		// Invalid turn count
-		return -1;
+		return -10;
 	} else {
 		// 2's complement turn count
 		int8_t signedTurnCount = static_cast<int8_t>(turnCount); // Handle as signed value
@@ -1688,9 +1683,7 @@ int ADMTController::streamIO()
 	iio_library_get_version(&major, &minor, git_tag);
 	bool has_repeat = ((major * 10000) + minor) >= 8 ? true : false;
 
-	double *scaleAttrValue = new double(1);
 	int offsetAttrValue = 0;
-	char *offsetDst = new char[maxAttrSize];
 
 	if(!m_iioCtx)
 		return result; // Check if the context is valid
@@ -1704,12 +1697,18 @@ int ADMTController::streamIO()
 	if(channel == NULL)
 		return result;
 	iio_channel_enable(channel);							     // Enable the channel
+	double *scaleAttrValue = new double(1);
 	int scaleRet = iio_channel_attr_read_double(channel, scaleAttrName, scaleAttrValue); // Read the scale attribute
-	if(scaleRet != 0)
+	if(scaleRet != 0) {
+		delete scaleAttrValue;
 		return scaleRet;
+	}
+
+	char *offsetDst = new char[maxAttrSize];
 	iio_channel_attr_read(channel, offsetAttrName, offsetDst,
 			      maxAttrSize); // Read the offset attribute
 	offsetAttrValue = atoi(offsetDst);
+	delete[] offsetDst;
 	struct iio_buffer *buffer = iio_device_create_buffer(admtDevice, samples, isCyclic); // Create a buffer
 
 	while(!stopStream) {
@@ -1739,6 +1738,7 @@ int ADMTController::streamIO()
 		}
 	}
 
+	delete scaleAttrValue;
 	iio_buffer_destroy(buffer);
 	return 0;
 }
@@ -1765,9 +1765,7 @@ void ADMTController::bufferedStreamIO(int totalSamples, int targetSampleRate)
 	iio_library_get_version(&major, &minor, git_tag);
 	bool has_repeat = ((major * 10000) + minor) >= 8 ? true : false;
 
-	double *scaleAttrValue = new double(1);
 	int offsetAttrValue = 0;
-	char *offsetDst = new char[maxAttrSize];
 
 	if(!m_iioCtx)
 		return; // result; // Check if the context is valid
@@ -1781,9 +1779,14 @@ void ADMTController::bufferedStreamIO(int totalSamples, int targetSampleRate)
 	if(channel == NULL)
 		return;									     // result;
 	iio_channel_enable(channel);							     // Enable the channel
+	double *scaleAttrValue = new double(1);
 	int scaleRet = iio_channel_attr_read_double(channel, scaleAttrName, scaleAttrValue); // Read the scale attribute
-	if(scaleRet != 0)
+	if(scaleRet != 0) {
+		delete scaleAttrValue;
 		return; // scaleRet;
+	}
+
+	char *offsetDst = new char[maxAttrSize];
 	iio_channel_attr_read(channel, offsetAttrName, offsetDst,
 			      maxAttrSize); // Read the offset attribute
 	offsetAttrValue = atoi(offsetDst);
@@ -1831,6 +1834,9 @@ void ADMTController::bufferedStreamIO(int totalSamples, int targetSampleRate)
 	}
 
 	Q_EMIT streamBufferedData(bufferedValues);
+
+	delete scaleAttrValue;
+	delete[] offsetDst;
 }
 
 void ADMTController::handleStreamBufferedData(const QVector<double> &value) { streamBufferedValues = value; }

plugins/admt/src/admtplugin.cpp

@@ -100,6 +100,9 @@ bool ADMTPlugin::onConnect()
 	harmonicCalibration = new HarmonicCalibration(m_admtController, isDebug);
 	m_toolList[0]->setTool(harmonicCalibration);
 
+	connect(m_admtController, &ADMTController::requestDisconnect, this, &ADMTPlugin::disconnectDevice,
+		Qt::QueuedConnection);
+
 	return true;
 }