diff options
Diffstat (limited to 'servers/gpib_server_lin/src/gpib_conn.cpp')
| -rw-r--r-- | servers/gpib_server_lin/src/gpib_conn.cpp | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/servers/gpib_server_lin/src/gpib_conn.cpp b/servers/gpib_server_lin/src/gpib_conn.cpp index 3e8777f..2e7079d 100644 --- a/servers/gpib_server_lin/src/gpib_conn.cpp +++ b/servers/gpib_server_lin/src/gpib_conn.cpp @@ -1037,10 +1037,12 @@ void GPIBSocket::commandLoop() { ds << (TQ_UINT32&)measurement.parameter_a; ds << (TQ_UINT32&)measurement.parameter_a_type; ds << measurement.parameter_a_value; + ds << measurement.frequency; ds << (TQ_UINT32&)measurement.parameter_b_status; ds << (TQ_UINT32&)measurement.parameter_b; ds << (TQ_UINT32&)measurement.parameter_b_type; ds << measurement.parameter_b_value; + ds << measurement.frequency; writeEndOfFrame(); } else { @@ -1050,7 +1052,7 @@ void GPIBSocket::commandLoop() { } else if (m_instrumentCommand == "SETMEASUREDPARAMETERS") { // Want to set the measured parameters uint8_t all_ok = 1; - uint8_t number_of_parameters; + TQ_UINT8 number_of_parameters; companalyzer_measurement::companalyzer_measurement_t parameter_a; companalyzer_measurement::companalyzer_measurement_t parameter_b; ds >> number_of_parameters; @@ -1074,6 +1076,30 @@ void GPIBSocket::commandLoop() { writeEndOfFrame(); } } + else if (m_instrumentCommand == "GETMAXMEASUREMENTFREQUENCY") { // Want to get the maximum supported measurement frequency + double frequency; + if (companalyzer_get_max_measurement_frequency(&frequency, m_serverParent->m_companalyzerType.ascii(), m_serverParent->m_companalyzerDeviceSocket, errorbuf) == 0) { + ds << TQString("ACK"); + ds << frequency; + writeEndOfFrame(); + } + else { + ds << TQString(errorbuf); + writeEndOfFrame(); + } + } + else if (m_instrumentCommand == "GETMINMEASUREMENTFREQUENCY") { // Want to get the minimum supported measurement frequency + double frequency; + if (companalyzer_get_min_measurement_frequency(&frequency, m_serverParent->m_companalyzerType.ascii(), m_serverParent->m_companalyzerDeviceSocket, errorbuf) == 0) { + ds << TQString("ACK"); + ds << frequency; + writeEndOfFrame(); + } + else { + ds << TQString(errorbuf); + writeEndOfFrame(); + } + } else if (m_instrumentCommand == "SETMEASUREMENTFREQUENCY") { // Want to set the measurement frequency double frequency; ds >> frequency; |