mirror of https://github.com/EspoTek/Labrador.git
Caibration algorithm in pace but no user-friendy way of accessing it.
This commit is contained in:
EspoTek
parent
445a301029
commit
ee7aff7cf5
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE QtCreatorProject>
|
||||
<!-- Written by QtCreator 4.1.0, 2017-06-22T14:16:09. -->
|
||||
<!-- Written by QtCreator 4.1.0, 2017-06-26T09:22:20. -->
|
||||
<qtcreator>
|
||||
<data>
|
||||
<variable>EnvironmentId</variable>
|
||||
|
|
@ -612,7 +612,7 @@
|
|||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{10e6c62d-45a6-4a2c-85f8-d42b8e6f84d3}</value>
|
||||
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
|
||||
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
|
||||
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
|
||||
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">-1</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Esposch/Documents/GitHub/Labrador/Desktop_Interface</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
|
|
@ -868,58 +868,7 @@
|
|||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings">
|
||||
<value type="QString" key="AndroidDeviceSerialNumber">192.168.1.73:5555</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
|
||||
<value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
|
||||
<value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
|
||||
<value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
|
||||
<value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
|
||||
<value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
|
||||
<valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
|
||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
|
||||
<value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
|
||||
<value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
|
||||
<value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
|
||||
<value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
|
||||
<valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
|
||||
<value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
|
||||
<value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
|
||||
<value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
|
||||
<valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
|
||||
<value type="int">0</value>
|
||||
<value type="int">1</value>
|
||||
<value type="int">2</value>
|
||||
<value type="int">3</value>
|
||||
<value type="int">4</value>
|
||||
<value type="int">5</value>
|
||||
<value type="int">6</value>
|
||||
<value type="int">7</value>
|
||||
<value type="int">8</value>
|
||||
<value type="int">9</value>
|
||||
<value type="int">10</value>
|
||||
<value type="int">11</value>
|
||||
<value type="int">12</value>
|
||||
<value type="int">13</value>
|
||||
<value type="int">14</value>
|
||||
</valuelist>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Labrador</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidRunConfiguration:C:/Users/Esposch/Documents/GitHub/Labrador/Desktop_Interface/Labrador.pro</value>
|
||||
<value type="QString" key="QMakeProjectManager.QmakeAndroidRunConfiguration.ProFile">Labrador.pro</value>
|
||||
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
|
||||
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
|
||||
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
|
||||
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
|
||||
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
|
||||
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
|
||||
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">0</value>
|
||||
</valuemap>
|
||||
</data>
|
||||
<data>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -117,10 +117,11 @@ void isoDriver::analogConvert(short *shortPtr, QVector<double> *doublePtr, int T
|
|||
currentVmin = 20;
|
||||
|
||||
double ref = (channel == 1 ? ch1_ref : ch2_ref);
|
||||
double frontendGain = (channel == 1 ? frontendGain_CH1 : frontendGain_CH2);
|
||||
|
||||
double *data = doublePtr->data();
|
||||
for (int i=0;i<GRAPH_SAMPLES;i++){
|
||||
data[i] = (shortPtr[i] * (vcc/2)) / (R4/(R3+R4)*scope_gain*TOP);
|
||||
data[i] = (shortPtr[i] * (vcc/2)) / (frontendGain*scope_gain*TOP);
|
||||
if (driver->deviceMode != 7) data[i] += ref;
|
||||
#ifdef INVERT_MM
|
||||
if(driver->deviceMode == 7) data[i] *= -1;
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ public:
|
|||
genericUsbDriver *driver;
|
||||
bool doNotTouchGraph = true;
|
||||
double ch1_ref = 1.65, ch2_ref = 1.65;
|
||||
double frontendGain_CH1 = (R4/(R3+R4)), frontendGain_CH2 = (R4/(R3+R4));
|
||||
//State Vars
|
||||
bool AC_CH1 = false, AC_CH2 = false;
|
||||
bool cursorStatsEnabled = true;
|
||||
|
|
|
|||
|
|
@ -1298,6 +1298,30 @@ void MainWindow::calibrateStage2(){
|
|||
ui->controller_iso->internalBuffer375_CH1->voltage_ref = 3.3 - vref_CH1;
|
||||
ui->controller_iso->internalBuffer750->voltage_ref = 3.3 - vref_CH1;
|
||||
ui->controller_iso->internalBuffer375_CH2->voltage_ref = 3.3 - vref_CH2;
|
||||
QTimer::singleShot(5000, this, SLOT(calibrateStage3()));
|
||||
qDebug() << "5 seconds to gain calibration!";
|
||||
}
|
||||
|
||||
void MainWindow::calibrateStage3(){
|
||||
double vMeasured_CH1 = ui->controller_iso->meanVoltageLast(1, 1);
|
||||
double vMeasured_CH2 = ui->controller_iso->meanVoltageLast(1, 2);
|
||||
|
||||
qDebug() << "VMeasured (CH1) = " << vMeasured_CH1;
|
||||
qDebug() << "VMeasured (CH2) = " << vMeasured_CH2;
|
||||
|
||||
double vref_CH1 = ui->controller_iso->ch1_ref;
|
||||
double vref_CH2 = ui->controller_iso->ch2_ref;
|
||||
|
||||
//G^ <= G
|
||||
qDebug() << "Old gain (CH1) = " << ui->controller_iso->frontendGain_CH1;
|
||||
ui->controller_iso->frontendGain_CH1 = (vref_CH1 - vMeasured_CH1)*(ui->controller_iso->frontendGain_CH1)/vref_CH1;
|
||||
ui->controller_iso->frontendGain_CH2 = (vref_CH2 - vMeasured_CH2)*(ui->controller_iso->frontendGain_CH2)/vref_CH1;
|
||||
qDebug() << "New gain (CH1) = " << ui->controller_iso->frontendGain_CH1;
|
||||
|
||||
qDebug() << "isoBuffer not yet updated";
|
||||
ui->controller_iso->internalBuffer375_CH1->voltage_ref = 3.3 - vref_CH1;
|
||||
ui->controller_iso->internalBuffer750->voltage_ref = 3.3 - vref_CH1;
|
||||
ui->controller_iso->internalBuffer375_CH2->voltage_ref = 3.3 - vref_CH2;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -67,6 +67,8 @@ private slots:
|
|||
|
||||
void connectDisplaySignals();
|
||||
void calibrateStage2();
|
||||
void calibrateStage3();
|
||||
|
||||
|
||||
//Logic Analyzer
|
||||
void on_action300_toggled(bool arg1);
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
|
||||
QT_BEGIN_MOC_NAMESPACE
|
||||
struct qt_meta_stringdata_MainWindow_t {
|
||||
QByteArrayData data[72];
|
||||
char stringdata0[1604];
|
||||
QByteArrayData data[73];
|
||||
char stringdata0[1620];
|
||||
};
|
||||
#define QT_MOC_LITERAL(idx, ofs, len) \
|
||||
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
|
||||
|
|
@ -55,52 +55,53 @@ QT_MOC_LITERAL(22, 481, 34), // "on_actionSnap_to_Cursors_trig..."
|
|||
QT_MOC_LITERAL(23, 516, 33), // "on_actionEnter_Manually_trigg..."
|
||||
QT_MOC_LITERAL(24, 550, 21), // "connectDisplaySignals"
|
||||
QT_MOC_LITERAL(25, 572, 15), // "calibrateStage2"
|
||||
QT_MOC_LITERAL(26, 588, 20), // "on_action300_toggled"
|
||||
QT_MOC_LITERAL(27, 609, 20), // "on_action600_toggled"
|
||||
QT_MOC_LITERAL(28, 630, 21), // "on_action1200_toggled"
|
||||
QT_MOC_LITERAL(29, 652, 21), // "on_action2400_toggled"
|
||||
QT_MOC_LITERAL(30, 674, 21), // "on_action4800_toggled"
|
||||
QT_MOC_LITERAL(31, 696, 21), // "on_action9600_toggled"
|
||||
QT_MOC_LITERAL(32, 718, 22), // "on_action14400_toggled"
|
||||
QT_MOC_LITERAL(33, 741, 22), // "on_action19200_toggled"
|
||||
QT_MOC_LITERAL(34, 764, 22), // "on_action28800_toggled"
|
||||
QT_MOC_LITERAL(35, 787, 22), // "on_action38400_toggled"
|
||||
QT_MOC_LITERAL(36, 810, 22), // "on_action57600_toggled"
|
||||
QT_MOC_LITERAL(37, 833, 23), // "on_action115200_toggled"
|
||||
QT_MOC_LITERAL(38, 857, 22), // "on_action300_2_toggled"
|
||||
QT_MOC_LITERAL(39, 880, 22), // "on_action600_2_toggled"
|
||||
QT_MOC_LITERAL(40, 903, 23), // "on_action1200_2_toggled"
|
||||
QT_MOC_LITERAL(41, 927, 23), // "on_action2400_2_toggled"
|
||||
QT_MOC_LITERAL(42, 951, 23), // "on_action4800_2_toggled"
|
||||
QT_MOC_LITERAL(43, 975, 23), // "on_action9600_2_toggled"
|
||||
QT_MOC_LITERAL(44, 999, 24), // "on_action14400_2_toggled"
|
||||
QT_MOC_LITERAL(45, 1024, 24), // "on_action19200_2_toggled"
|
||||
QT_MOC_LITERAL(46, 1049, 24), // "on_action28800_2_toggled"
|
||||
QT_MOC_LITERAL(47, 1074, 24), // "on_action38400_2_toggled"
|
||||
QT_MOC_LITERAL(48, 1099, 24), // "on_action57600_2_toggled"
|
||||
QT_MOC_LITERAL(49, 1124, 25), // "on_action115200_2_toggled"
|
||||
QT_MOC_LITERAL(50, 1150, 17), // "cycleBaudRate_CH1"
|
||||
QT_MOC_LITERAL(51, 1168, 26), // "cycleBaudRateBackwards_CH1"
|
||||
QT_MOC_LITERAL(52, 1195, 17), // "cycleBaudRate_CH2"
|
||||
QT_MOC_LITERAL(53, 1213, 26), // "cycleBaudRateBackwards_CH2"
|
||||
QT_MOC_LITERAL(54, 1240, 21), // "timeBaseNeedsChanging"
|
||||
QT_MOC_LITERAL(55, 1262, 8), // "positive"
|
||||
QT_MOC_LITERAL(56, 1271, 31), // "on_actionForce_Square_triggered"
|
||||
QT_MOC_LITERAL(57, 1303, 10), // "helloWorld"
|
||||
QT_MOC_LITERAL(58, 1314, 16), // "arrowUpTriggered"
|
||||
QT_MOC_LITERAL(59, 1331, 18), // "arrowDownTriggered"
|
||||
QT_MOC_LITERAL(60, 1350, 20), // "ctrlArrowUpTriggered"
|
||||
QT_MOC_LITERAL(61, 1371, 22), // "ctrlArrowDownTriggered"
|
||||
QT_MOC_LITERAL(62, 1394, 14), // "cycleDelayLeft"
|
||||
QT_MOC_LITERAL(63, 1409, 15), // "cycleDelayRight"
|
||||
QT_MOC_LITERAL(64, 1425, 23), // "enableLabradorDebugging"
|
||||
QT_MOC_LITERAL(65, 1449, 26), // "on_actionAuto_Lock_toggled"
|
||||
QT_MOC_LITERAL(66, 1476, 25), // "on_actionRecord_triggered"
|
||||
QT_MOC_LITERAL(67, 1502, 32), // "on_actionTake_Snapshot_triggered"
|
||||
QT_MOC_LITERAL(68, 1535, 9), // "reinitUsb"
|
||||
QT_MOC_LITERAL(69, 1545, 15), // "reinitUsbStage2"
|
||||
QT_MOC_LITERAL(70, 1561, 13), // "resetUsbState"
|
||||
QT_MOC_LITERAL(71, 1575, 28) // "on_actionCalibrate_triggered"
|
||||
QT_MOC_LITERAL(26, 588, 15), // "calibrateStage3"
|
||||
QT_MOC_LITERAL(27, 604, 20), // "on_action300_toggled"
|
||||
QT_MOC_LITERAL(28, 625, 20), // "on_action600_toggled"
|
||||
QT_MOC_LITERAL(29, 646, 21), // "on_action1200_toggled"
|
||||
QT_MOC_LITERAL(30, 668, 21), // "on_action2400_toggled"
|
||||
QT_MOC_LITERAL(31, 690, 21), // "on_action4800_toggled"
|
||||
QT_MOC_LITERAL(32, 712, 21), // "on_action9600_toggled"
|
||||
QT_MOC_LITERAL(33, 734, 22), // "on_action14400_toggled"
|
||||
QT_MOC_LITERAL(34, 757, 22), // "on_action19200_toggled"
|
||||
QT_MOC_LITERAL(35, 780, 22), // "on_action28800_toggled"
|
||||
QT_MOC_LITERAL(36, 803, 22), // "on_action38400_toggled"
|
||||
QT_MOC_LITERAL(37, 826, 22), // "on_action57600_toggled"
|
||||
QT_MOC_LITERAL(38, 849, 23), // "on_action115200_toggled"
|
||||
QT_MOC_LITERAL(39, 873, 22), // "on_action300_2_toggled"
|
||||
QT_MOC_LITERAL(40, 896, 22), // "on_action600_2_toggled"
|
||||
QT_MOC_LITERAL(41, 919, 23), // "on_action1200_2_toggled"
|
||||
QT_MOC_LITERAL(42, 943, 23), // "on_action2400_2_toggled"
|
||||
QT_MOC_LITERAL(43, 967, 23), // "on_action4800_2_toggled"
|
||||
QT_MOC_LITERAL(44, 991, 23), // "on_action9600_2_toggled"
|
||||
QT_MOC_LITERAL(45, 1015, 24), // "on_action14400_2_toggled"
|
||||
QT_MOC_LITERAL(46, 1040, 24), // "on_action19200_2_toggled"
|
||||
QT_MOC_LITERAL(47, 1065, 24), // "on_action28800_2_toggled"
|
||||
QT_MOC_LITERAL(48, 1090, 24), // "on_action38400_2_toggled"
|
||||
QT_MOC_LITERAL(49, 1115, 24), // "on_action57600_2_toggled"
|
||||
QT_MOC_LITERAL(50, 1140, 25), // "on_action115200_2_toggled"
|
||||
QT_MOC_LITERAL(51, 1166, 17), // "cycleBaudRate_CH1"
|
||||
QT_MOC_LITERAL(52, 1184, 26), // "cycleBaudRateBackwards_CH1"
|
||||
QT_MOC_LITERAL(53, 1211, 17), // "cycleBaudRate_CH2"
|
||||
QT_MOC_LITERAL(54, 1229, 26), // "cycleBaudRateBackwards_CH2"
|
||||
QT_MOC_LITERAL(55, 1256, 21), // "timeBaseNeedsChanging"
|
||||
QT_MOC_LITERAL(56, 1278, 8), // "positive"
|
||||
QT_MOC_LITERAL(57, 1287, 31), // "on_actionForce_Square_triggered"
|
||||
QT_MOC_LITERAL(58, 1319, 10), // "helloWorld"
|
||||
QT_MOC_LITERAL(59, 1330, 16), // "arrowUpTriggered"
|
||||
QT_MOC_LITERAL(60, 1347, 18), // "arrowDownTriggered"
|
||||
QT_MOC_LITERAL(61, 1366, 20), // "ctrlArrowUpTriggered"
|
||||
QT_MOC_LITERAL(62, 1387, 22), // "ctrlArrowDownTriggered"
|
||||
QT_MOC_LITERAL(63, 1410, 14), // "cycleDelayLeft"
|
||||
QT_MOC_LITERAL(64, 1425, 15), // "cycleDelayRight"
|
||||
QT_MOC_LITERAL(65, 1441, 23), // "enableLabradorDebugging"
|
||||
QT_MOC_LITERAL(66, 1465, 26), // "on_actionAuto_Lock_toggled"
|
||||
QT_MOC_LITERAL(67, 1492, 25), // "on_actionRecord_triggered"
|
||||
QT_MOC_LITERAL(68, 1518, 32), // "on_actionTake_Snapshot_triggered"
|
||||
QT_MOC_LITERAL(69, 1551, 9), // "reinitUsb"
|
||||
QT_MOC_LITERAL(70, 1561, 15), // "reinitUsbStage2"
|
||||
QT_MOC_LITERAL(71, 1577, 13), // "resetUsbState"
|
||||
QT_MOC_LITERAL(72, 1591, 28) // "on_actionCalibrate_triggered"
|
||||
|
||||
},
|
||||
"MainWindow\0on_actionGain0_5_triggered\0"
|
||||
|
|
@ -121,15 +122,16 @@ QT_MOC_LITERAL(71, 1575, 28) // "on_actionCalibrate_triggered"
|
|||
"on_actionSnap_to_Cursors_triggered\0"
|
||||
"on_actionEnter_Manually_triggered\0"
|
||||
"connectDisplaySignals\0calibrateStage2\0"
|
||||
"on_action300_toggled\0on_action600_toggled\0"
|
||||
"on_action1200_toggled\0on_action2400_toggled\0"
|
||||
"on_action4800_toggled\0on_action9600_toggled\0"
|
||||
"on_action14400_toggled\0on_action19200_toggled\0"
|
||||
"on_action28800_toggled\0on_action38400_toggled\0"
|
||||
"on_action57600_toggled\0on_action115200_toggled\0"
|
||||
"on_action300_2_toggled\0on_action600_2_toggled\0"
|
||||
"on_action1200_2_toggled\0on_action2400_2_toggled\0"
|
||||
"on_action4800_2_toggled\0on_action9600_2_toggled\0"
|
||||
"calibrateStage3\0on_action300_toggled\0"
|
||||
"on_action600_toggled\0on_action1200_toggled\0"
|
||||
"on_action2400_toggled\0on_action4800_toggled\0"
|
||||
"on_action9600_toggled\0on_action14400_toggled\0"
|
||||
"on_action19200_toggled\0on_action28800_toggled\0"
|
||||
"on_action38400_toggled\0on_action57600_toggled\0"
|
||||
"on_action115200_toggled\0on_action300_2_toggled\0"
|
||||
"on_action600_2_toggled\0on_action1200_2_toggled\0"
|
||||
"on_action2400_2_toggled\0on_action4800_2_toggled\0"
|
||||
"on_action9600_2_toggled\0"
|
||||
"on_action14400_2_toggled\0"
|
||||
"on_action19200_2_toggled\0"
|
||||
"on_action28800_2_toggled\0"
|
||||
|
|
@ -158,7 +160,7 @@ static const uint qt_meta_data_MainWindow[] = {
|
|||
7, // revision
|
||||
0, // classname
|
||||
0, 0, // classinfo
|
||||
66, 14, // methods
|
||||
67, 14, // methods
|
||||
0, 0, // properties
|
||||
0, 0, // enums/sets
|
||||
0, 0, // constructors
|
||||
|
|
@ -166,72 +168,73 @@ static const uint qt_meta_data_MainWindow[] = {
|
|||
0, // signalCount
|
||||
|
||||
// slots: name, argc, parameters, tag, flags
|
||||
1, 0, 344, 2, 0x08 /* Private */,
|
||||
3, 0, 345, 2, 0x08 /* Private */,
|
||||
4, 0, 346, 2, 0x08 /* Private */,
|
||||
5, 0, 347, 2, 0x08 /* Private */,
|
||||
6, 0, 348, 2, 0x08 /* Private */,
|
||||
7, 0, 349, 2, 0x08 /* Private */,
|
||||
8, 0, 350, 2, 0x08 /* Private */,
|
||||
9, 0, 351, 2, 0x08 /* Private */,
|
||||
10, 0, 352, 2, 0x08 /* Private */,
|
||||
11, 1, 353, 2, 0x08 /* Private */,
|
||||
13, 1, 356, 2, 0x08 /* Private */,
|
||||
15, 1, 359, 2, 0x08 /* Private */,
|
||||
17, 1, 362, 2, 0x08 /* Private */,
|
||||
18, 1, 365, 2, 0x08 /* Private */,
|
||||
19, 1, 368, 2, 0x08 /* Private */,
|
||||
20, 1, 371, 2, 0x08 /* Private */,
|
||||
21, 1, 374, 2, 0x08 /* Private */,
|
||||
22, 0, 377, 2, 0x08 /* Private */,
|
||||
23, 0, 378, 2, 0x08 /* Private */,
|
||||
24, 0, 379, 2, 0x08 /* Private */,
|
||||
25, 0, 380, 2, 0x08 /* Private */,
|
||||
26, 1, 381, 2, 0x08 /* Private */,
|
||||
27, 1, 384, 2, 0x08 /* Private */,
|
||||
28, 1, 387, 2, 0x08 /* Private */,
|
||||
29, 1, 390, 2, 0x08 /* Private */,
|
||||
30, 1, 393, 2, 0x08 /* Private */,
|
||||
31, 1, 396, 2, 0x08 /* Private */,
|
||||
32, 1, 399, 2, 0x08 /* Private */,
|
||||
33, 1, 402, 2, 0x08 /* Private */,
|
||||
34, 1, 405, 2, 0x08 /* Private */,
|
||||
35, 1, 408, 2, 0x08 /* Private */,
|
||||
36, 1, 411, 2, 0x08 /* Private */,
|
||||
37, 1, 414, 2, 0x08 /* Private */,
|
||||
38, 1, 417, 2, 0x08 /* Private */,
|
||||
39, 1, 420, 2, 0x08 /* Private */,
|
||||
40, 1, 423, 2, 0x08 /* Private */,
|
||||
41, 1, 426, 2, 0x08 /* Private */,
|
||||
42, 1, 429, 2, 0x08 /* Private */,
|
||||
43, 1, 432, 2, 0x08 /* Private */,
|
||||
44, 1, 435, 2, 0x08 /* Private */,
|
||||
45, 1, 438, 2, 0x08 /* Private */,
|
||||
46, 1, 441, 2, 0x08 /* Private */,
|
||||
47, 1, 444, 2, 0x08 /* Private */,
|
||||
48, 1, 447, 2, 0x08 /* Private */,
|
||||
49, 1, 450, 2, 0x08 /* Private */,
|
||||
50, 0, 453, 2, 0x08 /* Private */,
|
||||
51, 0, 454, 2, 0x08 /* Private */,
|
||||
52, 0, 455, 2, 0x08 /* Private */,
|
||||
53, 0, 456, 2, 0x08 /* Private */,
|
||||
54, 1, 457, 2, 0x08 /* Private */,
|
||||
56, 1, 460, 2, 0x08 /* Private */,
|
||||
57, 0, 463, 2, 0x08 /* Private */,
|
||||
58, 0, 464, 2, 0x08 /* Private */,
|
||||
59, 0, 465, 2, 0x08 /* Private */,
|
||||
60, 0, 466, 2, 0x08 /* Private */,
|
||||
61, 0, 467, 2, 0x08 /* Private */,
|
||||
62, 0, 468, 2, 0x08 /* Private */,
|
||||
63, 0, 469, 2, 0x08 /* Private */,
|
||||
64, 0, 470, 2, 0x08 /* Private */,
|
||||
65, 1, 471, 2, 0x08 /* Private */,
|
||||
66, 1, 474, 2, 0x08 /* Private */,
|
||||
67, 0, 477, 2, 0x08 /* Private */,
|
||||
68, 0, 478, 2, 0x08 /* Private */,
|
||||
69, 0, 479, 2, 0x08 /* Private */,
|
||||
70, 0, 480, 2, 0x08 /* Private */,
|
||||
71, 0, 481, 2, 0x08 /* Private */,
|
||||
1, 0, 349, 2, 0x08 /* Private */,
|
||||
3, 0, 350, 2, 0x08 /* Private */,
|
||||
4, 0, 351, 2, 0x08 /* Private */,
|
||||
5, 0, 352, 2, 0x08 /* Private */,
|
||||
6, 0, 353, 2, 0x08 /* Private */,
|
||||
7, 0, 354, 2, 0x08 /* Private */,
|
||||
8, 0, 355, 2, 0x08 /* Private */,
|
||||
9, 0, 356, 2, 0x08 /* Private */,
|
||||
10, 0, 357, 2, 0x08 /* Private */,
|
||||
11, 1, 358, 2, 0x08 /* Private */,
|
||||
13, 1, 361, 2, 0x08 /* Private */,
|
||||
15, 1, 364, 2, 0x08 /* Private */,
|
||||
17, 1, 367, 2, 0x08 /* Private */,
|
||||
18, 1, 370, 2, 0x08 /* Private */,
|
||||
19, 1, 373, 2, 0x08 /* Private */,
|
||||
20, 1, 376, 2, 0x08 /* Private */,
|
||||
21, 1, 379, 2, 0x08 /* Private */,
|
||||
22, 0, 382, 2, 0x08 /* Private */,
|
||||
23, 0, 383, 2, 0x08 /* Private */,
|
||||
24, 0, 384, 2, 0x08 /* Private */,
|
||||
25, 0, 385, 2, 0x08 /* Private */,
|
||||
26, 0, 386, 2, 0x08 /* Private */,
|
||||
27, 1, 387, 2, 0x08 /* Private */,
|
||||
28, 1, 390, 2, 0x08 /* Private */,
|
||||
29, 1, 393, 2, 0x08 /* Private */,
|
||||
30, 1, 396, 2, 0x08 /* Private */,
|
||||
31, 1, 399, 2, 0x08 /* Private */,
|
||||
32, 1, 402, 2, 0x08 /* Private */,
|
||||
33, 1, 405, 2, 0x08 /* Private */,
|
||||
34, 1, 408, 2, 0x08 /* Private */,
|
||||
35, 1, 411, 2, 0x08 /* Private */,
|
||||
36, 1, 414, 2, 0x08 /* Private */,
|
||||
37, 1, 417, 2, 0x08 /* Private */,
|
||||
38, 1, 420, 2, 0x08 /* Private */,
|
||||
39, 1, 423, 2, 0x08 /* Private */,
|
||||
40, 1, 426, 2, 0x08 /* Private */,
|
||||
41, 1, 429, 2, 0x08 /* Private */,
|
||||
42, 1, 432, 2, 0x08 /* Private */,
|
||||
43, 1, 435, 2, 0x08 /* Private */,
|
||||
44, 1, 438, 2, 0x08 /* Private */,
|
||||
45, 1, 441, 2, 0x08 /* Private */,
|
||||
46, 1, 444, 2, 0x08 /* Private */,
|
||||
47, 1, 447, 2, 0x08 /* Private */,
|
||||
48, 1, 450, 2, 0x08 /* Private */,
|
||||
49, 1, 453, 2, 0x08 /* Private */,
|
||||
50, 1, 456, 2, 0x08 /* Private */,
|
||||
51, 0, 459, 2, 0x08 /* Private */,
|
||||
52, 0, 460, 2, 0x08 /* Private */,
|
||||
53, 0, 461, 2, 0x08 /* Private */,
|
||||
54, 0, 462, 2, 0x08 /* Private */,
|
||||
55, 1, 463, 2, 0x08 /* Private */,
|
||||
57, 1, 466, 2, 0x08 /* Private */,
|
||||
58, 0, 469, 2, 0x08 /* Private */,
|
||||
59, 0, 470, 2, 0x08 /* Private */,
|
||||
60, 0, 471, 2, 0x08 /* Private */,
|
||||
61, 0, 472, 2, 0x08 /* Private */,
|
||||
62, 0, 473, 2, 0x08 /* Private */,
|
||||
63, 0, 474, 2, 0x08 /* Private */,
|
||||
64, 0, 475, 2, 0x08 /* Private */,
|
||||
65, 0, 476, 2, 0x08 /* Private */,
|
||||
66, 1, 477, 2, 0x08 /* Private */,
|
||||
67, 1, 480, 2, 0x08 /* Private */,
|
||||
68, 0, 483, 2, 0x08 /* Private */,
|
||||
69, 0, 484, 2, 0x08 /* Private */,
|
||||
70, 0, 485, 2, 0x08 /* Private */,
|
||||
71, 0, 486, 2, 0x08 /* Private */,
|
||||
72, 0, 487, 2, 0x08 /* Private */,
|
||||
|
||||
// slots: parameters
|
||||
QMetaType::Void,
|
||||
|
|
@ -255,6 +258,7 @@ static const uint qt_meta_data_MainWindow[] = {
|
|||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
|
|
@ -283,7 +287,7 @@ static const uint qt_meta_data_MainWindow[] = {
|
|||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void, QMetaType::Bool, 55,
|
||||
QMetaType::Void, QMetaType::Bool, 56,
|
||||
QMetaType::Void, QMetaType::Bool, 12,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
|
|
@ -331,51 +335,52 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
|
|||
case 18: _t->on_actionEnter_Manually_triggered(); break;
|
||||
case 19: _t->connectDisplaySignals(); break;
|
||||
case 20: _t->calibrateStage2(); break;
|
||||
case 21: _t->on_action300_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 22: _t->on_action600_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 23: _t->on_action1200_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 24: _t->on_action2400_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 25: _t->on_action4800_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 26: _t->on_action9600_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 27: _t->on_action14400_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 28: _t->on_action19200_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 29: _t->on_action28800_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 30: _t->on_action38400_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 31: _t->on_action57600_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 32: _t->on_action115200_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 33: _t->on_action300_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 34: _t->on_action600_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 35: _t->on_action1200_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 36: _t->on_action2400_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 37: _t->on_action4800_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 38: _t->on_action9600_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 39: _t->on_action14400_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 40: _t->on_action19200_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 41: _t->on_action28800_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 42: _t->on_action38400_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 43: _t->on_action57600_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 44: _t->on_action115200_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 45: _t->cycleBaudRate_CH1(); break;
|
||||
case 46: _t->cycleBaudRateBackwards_CH1(); break;
|
||||
case 47: _t->cycleBaudRate_CH2(); break;
|
||||
case 48: _t->cycleBaudRateBackwards_CH2(); break;
|
||||
case 49: _t->timeBaseNeedsChanging((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 50: _t->on_actionForce_Square_triggered((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 51: _t->helloWorld(); break;
|
||||
case 52: _t->arrowUpTriggered(); break;
|
||||
case 53: _t->arrowDownTriggered(); break;
|
||||
case 54: _t->ctrlArrowUpTriggered(); break;
|
||||
case 55: _t->ctrlArrowDownTriggered(); break;
|
||||
case 56: _t->cycleDelayLeft(); break;
|
||||
case 57: _t->cycleDelayRight(); break;
|
||||
case 58: _t->enableLabradorDebugging(); break;
|
||||
case 59: _t->on_actionAuto_Lock_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 60: _t->on_actionRecord_triggered((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 61: _t->on_actionTake_Snapshot_triggered(); break;
|
||||
case 62: _t->reinitUsb(); break;
|
||||
case 63: _t->reinitUsbStage2(); break;
|
||||
case 64: _t->resetUsbState(); break;
|
||||
case 65: _t->on_actionCalibrate_triggered(); break;
|
||||
case 21: _t->calibrateStage3(); break;
|
||||
case 22: _t->on_action300_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 23: _t->on_action600_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 24: _t->on_action1200_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 25: _t->on_action2400_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 26: _t->on_action4800_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 27: _t->on_action9600_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 28: _t->on_action14400_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 29: _t->on_action19200_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 30: _t->on_action28800_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 31: _t->on_action38400_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 32: _t->on_action57600_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 33: _t->on_action115200_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 34: _t->on_action300_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 35: _t->on_action600_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 36: _t->on_action1200_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 37: _t->on_action2400_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 38: _t->on_action4800_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 39: _t->on_action9600_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 40: _t->on_action14400_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 41: _t->on_action19200_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 42: _t->on_action28800_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 43: _t->on_action38400_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 44: _t->on_action57600_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 45: _t->on_action115200_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 46: _t->cycleBaudRate_CH1(); break;
|
||||
case 47: _t->cycleBaudRateBackwards_CH1(); break;
|
||||
case 48: _t->cycleBaudRate_CH2(); break;
|
||||
case 49: _t->cycleBaudRateBackwards_CH2(); break;
|
||||
case 50: _t->timeBaseNeedsChanging((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 51: _t->on_actionForce_Square_triggered((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 52: _t->helloWorld(); break;
|
||||
case 53: _t->arrowUpTriggered(); break;
|
||||
case 54: _t->arrowDownTriggered(); break;
|
||||
case 55: _t->ctrlArrowUpTriggered(); break;
|
||||
case 56: _t->ctrlArrowDownTriggered(); break;
|
||||
case 57: _t->cycleDelayLeft(); break;
|
||||
case 58: _t->cycleDelayRight(); break;
|
||||
case 59: _t->enableLabradorDebugging(); break;
|
||||
case 60: _t->on_actionAuto_Lock_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 61: _t->on_actionRecord_triggered((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 62: _t->on_actionTake_Snapshot_triggered(); break;
|
||||
case 63: _t->reinitUsb(); break;
|
||||
case 64: _t->reinitUsbStage2(); break;
|
||||
case 65: _t->resetUsbState(); break;
|
||||
case 66: _t->on_actionCalibrate_triggered(); break;
|
||||
default: ;
|
||||
}
|
||||
}
|
||||
|
|
@ -406,13 +411,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
|
|||
if (_id < 0)
|
||||
return _id;
|
||||
if (_c == QMetaObject::InvokeMetaMethod) {
|
||||
if (_id < 66)
|
||||
if (_id < 67)
|
||||
qt_static_metacall(this, _c, _id, _a);
|
||||
_id -= 66;
|
||||
_id -= 67;
|
||||
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
|
||||
if (_id < 66)
|
||||
if (_id < 67)
|
||||
*reinterpret_cast<int*>(_a[0]) = -1;
|
||||
_id -= 66;
|
||||
_id -= 67;
|
||||
}
|
||||
return _id;
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue