Skip to content

Commit 9683d8d

Browse files
committed
admt: Disable ECC when configuring DIGIOEN, GENERAL, and Harmonic registers
Signed-off-by: John Lloyd Juanillo <[email protected]>
1 parent 4c4bf7a commit 9683d8d

File tree

3 files changed

+292
-165
lines changed

3 files changed

+292
-165
lines changed

plugins/admt/include/admt/admtcontroller.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class SCOPY_ADMT_EXPORT ADMTController : public QObject
138138
GENERAL,
139139
DIGIOEN,
140140
ANGLECK,
141-
ECCDCDE,
141+
ECCCDE,
142142
ECCDIS,
143143
CONFIGURATION_REGISTER_COUNT
144144
};

plugins/admt/include/admt/harmoniccalibration.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public Q_SLOTS:
227227
*DIGIO5FNCToggleSwitch, *DIGIOALLToggleSwitch;
228228

229229
RegisterBlockWidget *cnvPageRegisterBlock, *digIORegisterBlock, *faultRegisterBlock, *generalRegisterBlock,
230-
*digIOEnRegisterBlock, *angleCkRegisterBlock, *eccDcdeRegisterBlock, *eccDisRegisterBlock,
230+
*digIOEnRegisterBlock, *angleCkRegisterBlock, *eccCdeRegisterBlock, *eccDisRegisterBlock,
231231
*absAngleRegisterBlock, *angleRegisterBlock, *angleSecRegisterBlock, *sineRegisterBlock,
232232
*cosineRegisterBlock, *secAnglIRegisterBlock, *secAnglQRegisterBlock, *radiusRegisterBlock,
233233
*diag1RegisterBlock, *diag2RegisterBlock, *tmp0RegisterBlock, *tmp1RegisterBlock, *cnvCntRegisterBlock,
@@ -311,8 +311,8 @@ public Q_SLOTS:
311311
void computeSineCosineOfAngles(QVector<double> graphDataList);
312312
void populateAngleErrorGraphs();
313313
void populateCorrectedAngleErrorGraphs();
314-
void clearHarmonicRegisters();
315-
void flashHarmonicValues();
314+
bool clearHarmonicRegisters();
315+
bool flashHarmonicValues();
316316
void calculateHarmonicValues();
317317
void updateCalculatedCoeffAngle();
318318
void updateCalculatedCoeffHex();
@@ -359,10 +359,11 @@ public Q_SLOTS:
359359
void getDIAG2Register();
360360
void getDIAG1Register();
361361
void getFAULTRegister();
362-
void toggleDIGIOEN(string DIGIOENName, bool value);
362+
bool toggleDIGIOEN(string DIGIOENName, bool value);
363363
void toggleMTDiagnostics(int mode);
364364
void toggleFaultRegisterMode(int mode);
365365
bool resetDIGIO();
366+
bool disableECC(bool disable);
366367
void clearCommandLog();
367368
#pragma endregion
368369

0 commit comments

Comments
 (0)