admt: Added turn count to acquisition tab

- Removed raw motor target and current position
- Added reset motor position button
- Revised ABS angle turn count calculation
- Code cleanup

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

Author: JJuanill

plugins/admt/include/admt/admtcontroller.h

@@ -191,8 +191,8 @@ class SCOPY_ADMT_EXPORT ADMTController : public QObject
 	const uint32_t HarmonicPages[HARMONIC_REGISTER_COUNT] = {0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02};
 	const uint32_t SensorRegisters[SENSOR_REGISTER_COUNT] = {0x03, 0x05, 0x08, 0x10, 0x11, 0x12, 0x13,
 								 0x18, 0x1D, 0x1E, 0x20, 0x23, 0x14};
-	const uint32_t SensorPages[SENSOR_REGISTER_COUNT] = {UINT32_MAX, UINT32_MAX, UINT32_MAX, 0x00, 0x00, 0x00, 0x00,
-							     0x00,	 0x00,	     0x00,	 0x00, 0x00, 0x02};
+	const uint32_t SensorPages[SENSOR_REGISTER_COUNT] = {0x00, UINT32_MAX, UINT32_MAX, 0x00, 0x00, 0x00, 0x00,
+							     0x00, 0x00,       0x00,	   0x00, 0x00, 0x02};
 
 	const uint32_t
 		RampGeneratorDriverFeatureControlRegisters[RAMP_GENERATOR_DRIVER_FEATURE_CONTROL_REGISTER_COUNT] = {

plugins/admt/include/admt/harmoniccalibration.h

@@ -272,8 +272,6 @@ public Q_SLOTS:
 	void startDeviceStatusMonitor();
 	void stopDeviceStatusMonitor();
 	void getDeviceFaultStatus(int sampleRate);
-	void startCurrentMotorPositionMonitor();
-	void stopCurrentMotorPositionMonitor();
 	void currentMotorPositionTask(int sampleRate);
 	bool resetGENERAL();
 	void stopTasks();
@@ -357,7 +355,7 @@ public Q_SLOTS:
 	int readMotorRegisterValue(uint32_t address, uint32_t *value);
 	void setRampMode(bool motorRotationClockwise);
 	void getRampMode();
-	void startResetMotorToZero();
+	void startResetMotorToZero(bool enableWatcher = false);
 	void stopResetMotorToZero();
 	void resetMotorToZero();
 #pragma endregion
@@ -387,8 +385,6 @@ public Q_SLOTS:
 #pragma endregion
 
 #pragma region UI Helper Methods
-	void updateLabelValue(QLabel *label, int channelIndex);
-	void updateLabelValue(QLabel *label, ADMTController::MotorAttribute attribute);
 	bool updateChannelValue(int channelIndex);
 	void updateLineEditValue(QLineEdit *lineEdit, double value);
 	void toggleWidget(QPushButton *widget, bool value);
@@ -406,6 +402,7 @@ public Q_SLOTS:
 	void connectLineEditToDouble(QLineEdit *lineEdit, double &variable);
 	void connectLineEditToNumberWrite(QLineEdit *lineEdit, double &variable,
 					  ADMTController::MotorAttribute attribute);
+	void connectLineEditToMotorTurnCount(QLineEdit *lineEdit, int &variable, int min, int max);
 	void connectMenuComboToNumber(MenuCombo *menuCombo, double &variable);
 	void connectMenuComboToNumber(MenuCombo *menuCombo, int &variable);
 	void connectLineEditToRPSConversion(QLineEdit *lineEdit, double &vmax);

plugins/admt/src/admtcontroller.cpp

@@ -1213,12 +1213,12 @@ uint16_t ADMTController::setGeneralRegisterBitMapping(uint16_t currentRegisterVa
 int ADMTController::getAbsAngleTurnCount(uint16_t registerValue)
 {
 	// Bits 15:8: Turn count in quarter turns
-	uint8_t turnCount = (registerValue & 0xFF00) >> 8;
+	uint8_t turnCount = (registerValue >> 8) & 0xFC;
 
-	if(turnCount <= 0xD7) {
+	if(turnCount <= 0xD4) {
 		// Straight binary turn count
 		return turnCount / 4; // Convert from quarter turns to whole turns
-	} else if(turnCount >= 0xD8 && turnCount <= 0xDB) {
+	} else if(turnCount == 0xD8) {
 		// Invalid turn count
 		return turnCount / 4;
 	} else {