Commit: e8305f1a9058c8ef458912ad24c94ede126f9536 - QtSimpleDAQ_CO_PulseGen (git)

QtSDK と NI-DAQmxBase (Linux) を使った単純なサンプル

Commit MetaInfo

• Revision: e8305f1a9058c8ef458912ad24c94ede126f9536 (tree)
• Time: 2012-12-08 18:31:13
• Author: arakaki <alucky4416@user...>
• Commiter: arakaki

Log Message

ADD: Select ContSamp/FiniteSamp mode.

Change Summary

• modified: daqthread.cpp
• modified: daqthread.h
• modified: mainwindow.cpp
• modified: mainwindow.h
• modified: mainwindow.ui

Incremental Difference

--- a/daqthread.cpp
+++ b/daqthread.cpp
@@ -25,13 +25,15 @@ void DAQThread::stop()
     stopped = true;
 }
 
-void DAQThread::startPulseOutput(QString &devname, float freq, float duty)
+void DAQThread::startPulseOutput(QString &devname, float freq, float duty, int continue_mode = 1, unsigned long long int pulsecount = 1)
 {
     QString tmpname = devname + "/ctr0";
     // qDebug() << "counter name  is " << tmpname;
     ctrname = tmpname.toLocal8Bit();
     pulse_freq = freq;
     pulse_duty = (float64)(duty / 100.0);
+    cont_mode = continue_mode ? DAQmx_Val_ContSamps : DAQmx_Val_FiniteSamps;
+    pulse_count = pulsecount;
     EvtQue->enqueue(Ev_Start);
 }
 
@@ -71,6 +73,17 @@ void DAQThread::run()
 
     while(!stopped) {
         if (EvtQue->isEmpty()) {
+            if (state == State_OUTPUT) {
+                bool32 done = 0;
+                DAQmxBaseIsTaskDone(taskHandle, &done);
+                if (done) {
+                    DAQmxErrChk (DAQmxBaseClearTask(taskHandle));
+                    taskHandle = 0;
+                    emit pulse_output_stopped();
+                    qDebug() << "done, stop pulse output."; // stop Pulse
+                    state = State_IDLE;
+                }
+            }
             msleep(100);
             continue;  // Jump to Next Loop
         }
@@ -84,7 +97,7 @@ void DAQThread::run()
                 DAQmxErrChk (DAQmxBaseCreateTask("", &taskHandle));
                 DAQmxErrChk (DAQmxBaseCreateCOPulseChanFreq (taskHandle, ctrname, "", DAQmx_Val_Hz, DAQmx_Val_Low, (float64)0.0, pulse_freq, pulse_duty));
                 //    int32 DAQmxBaseCfgImplicitTiming (TaskHandle taskHandle, int32 sampleMode, uInt64 sampsPerChanToAcquire);
-                DAQmxErrChk (DAQmxBaseCfgImplicitTiming (taskHandle, DAQmx_Val_ContSamps, (uInt64)1)); // error, when USB-621x
+                DAQmxErrChk (DAQmxBaseCfgImplicitTiming (taskHandle, cont_mode, pulse_count));
                 //DAQmxErrChk (DAQmxBaseExportSignal(taskHandle, DAQmx_Val_CounterOutputEvent, "/Dev1/PFI6")); // not worked! , default "/Dev1/PFI4"
                 DAQmxErrChk (DAQmxBaseStartTask (taskHandle));
                 emit pulse_output_started();
@@ -111,7 +124,7 @@ void DAQThread::run()
                 //    int32 DAQmxBaseCreateCOPulseChanFreq (TaskHandle taskHandle, const char counter[ ], const char nameToAssignToChannel[ ], int32 units, int32 idleState, float64 initialDelay, float64 freq, float64 dutyCycle);
                 DAQmxErrChk (DAQmxBaseCreateCOPulseChanFreq (taskHandle, ctrname, "", DAQmx_Val_Hz, DAQmx_Val_Low, (float64)0.0, pulse_freq, pulse_duty));
                 //    int32 DAQmxBaseCfgImplicitTiming (TaskHandle taskHandle, int32 sampleMode, uInt64 sampsPerChanToAcquire);
-                DAQmxErrChk (DAQmxBaseCfgImplicitTiming (taskHandle, DAQmx_Val_ContSamps, (uInt64)1));
+                DAQmxErrChk (DAQmxBaseCfgImplicitTiming (taskHandle, cont_mode, pulse_count));
                 DAQmxErrChk (DAQmxBaseStartTask (taskHandle));
             }
             break;

--- a/daqthread.h
+++ b/daqthread.h
@@ -15,7 +15,7 @@ public:
     ~DAQThread();
     void stop();
 
-    void startPulseOutput(QString &devname, float freq, float duty);
+    void startPulseOutput(QString &devname, float freq, float duty, int continue_mode, unsigned long long int pulsecount);
     void stopPulseOutput();
     void changePulseOutput(float freq, float duty);
 
@@ -38,6 +38,8 @@ private:
     QByteArray ctrname; //  = "Dev1/ctr0";
     float64 pulse_freq;
     float64 pulse_duty;
+    int32   cont_mode; // 1 = DAQmx_Val_ContSamps or 0 = DAQmx_Val_FiniteSamps
+    uInt64  pulse_count; // pulse count when DAQmx_Val_FiniteSamps
 
     // State Machine, state Id
     enum { State_IDLE = 0,

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -71,11 +71,16 @@ void MainWindow::on_pushButton_Output_clicked()
 {
     if (flag_output_status) {
         DaqTh->stopPulseOutput();
-        ui->pushButton_Output->setText("ON");
-        ui->comboBox_DevName->setEnabled(true);
-        flag_output_status = false;
+//        ui->pushButton_Output->setText("ON");
+//        ui->comboBox_DevName->setEnabled(true);
+//        flag_output_status = false;
     } else {
-        DaqTh->startPulseOutput(DevName, (float)ui->doubleSpinBox_Freq->value(), (float)ui->doubleSpinBox_Duty->value());
+        int mode = ui->checkBox_ContMode->isChecked() ? 1 : 0;
+        DaqTh->startPulseOutput(DevName,
+                                (float)ui->doubleSpinBox_Freq->value(),
+                                (float)ui->doubleSpinBox_Duty->value(),
+                                mode,
+                                (unsigned long long int)ui->spinBox_PulseCount->value());
         ui->pushButton_Output->setText("OFF");
         ui->comboBox_DevName->setEnabled(false);
         flag_output_status = true;
@@ -108,6 +113,15 @@ void MainWindow::on_horizontalSlider_Duty_valueChanged(int value)
     ui->doubleSpinBox_Duty->setValue((double)value);
 }
 
+void MainWindow::on_checkBox_ContMode_toggled(bool checked)
+{
+    if (checked) {
+        ui->spinBox_PulseCount->setEnabled(false);
+    } else {
+        ui->spinBox_PulseCount->setEnabled(true);
+    }
+}
+
 void MainWindow::daqmxbase_ready()
 {
     ui->statusBar->showMessage("Idle...");
@@ -133,6 +147,9 @@ void MainWindow::pulse_output_started()
 
 void MainWindow::pulse_output_stopped()
 {
+    ui->pushButton_Output->setText("ON");
+    ui->comboBox_DevName->setEnabled(true);
+    flag_output_status = false;
+
     ui->statusBar->showMessage("Idle...");
 }
-

--- a/mainwindow.h
+++ b/mainwindow.h
@@ -30,12 +30,15 @@ private slots:
 
     void on_horizontalSlider_Duty_valueChanged(int value);
 
+    void on_checkBox_ContMode_toggled(bool checked);
+
     void daqmxbase_ready();
     void daqmxbase_final();
     void daqmxbase_error(QString ErrMsg);
     void pulse_output_started();
     void pulse_output_stopped();
 
+
 private:
     Ui::MainWindow *ui;
 

--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -376,6 +376,63 @@
      <string>x Scale</string>
     </property>
    </widget>
+   <widget class="QCheckBox" name="checkBox_ContMode">
+    <property name="geometry">
+     <rect>
+      <x>340</x>
+      <y>150</y>
+      <width>161</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Continue Output Pulse</string>
+    </property>
+    <property name="checked">
+     <bool>true</bool>
+    </property>
+   </widget>
+   <widget class="QLabel" name="label_10">
+    <property name="geometry">
+     <rect>
+      <x>340</x>
+      <y>170</y>
+      <width>111</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Output Pulse Count</string>
+    </property>
+   </widget>
+   <widget class="QSpinBox" name="spinBox_PulseCount">
+    <property name="enabled">
+     <bool>false</bool>
+    </property>
+    <property name="geometry">
+     <rect>
+      <x>340</x>
+      <y>190</y>
+      <width>121</width>
+      <height>22</height>
+     </rect>
+    </property>
+    <property name="wrapping">
+     <bool>false</bool>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+    </property>
+    <property name="minimum">
+     <number>1</number>
+    </property>
+    <property name="maximum">
+     <number>214748647</number>
+    </property>
+    <property name="value">
+     <number>1</number>
+    </property>
+   </widget>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
@@ -383,7 +440,7 @@
      <x>0</x>
      <y>0</y>
      <width>562</width>
-     <height>26</height>
+     <height>22</height>
     </rect>
    </property>
   </widget>