From cb05310c2faa576313ebb0a637b09588a3a588a1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 10 Jul 2012 12:53:25 -0500 Subject: Add initial instrument command functions --- servers/gpib_server_lin/src/signal_functions.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'servers/gpib_server_lin/src/signal_functions.cpp') diff --git a/servers/gpib_server_lin/src/signal_functions.cpp b/servers/gpib_server_lin/src/signal_functions.cpp index 38dd771..2b90987 100644 --- a/servers/gpib_server_lin/src/signal_functions.cpp +++ b/servers/gpib_server_lin/src/signal_functions.cpp @@ -34,7 +34,7 @@ extern char falpha[1024]; -int signal_get_last_error(char * funcgenType, int gpibDevice, char * extendedError) { +int signal_get_last_error(const char * funcgenType, int gpibDevice, char * extendedError) { char error_array[1024]; int ei; char * ep; @@ -81,7 +81,7 @@ int signal_get_last_error(char * funcgenType, int gpibDevice, char * extendedErr return 1; } -int signal_reset(char * funcgenType, int gpibDevice, char * extendedError) +int signal_reset(const char * funcgenType, int gpibDevice, char * extendedError) { if ((strcmp("AG33250A", funcgenType) == 0)) { printf("[INFO] Resetting function generator\n\r"); @@ -163,7 +163,7 @@ int signal_reset(char * funcgenType, int gpibDevice, char * extendedError) return 1; } -int signal_set_frequency(float desired_frequency, char * funcgenType, int gpibDevice, char * extendedError) { +int signal_set_frequency(float desired_frequency, const char * funcgenType, int gpibDevice, char * extendedError) { if ((strcmp("AG33250A", funcgenType) == 0)) { printf("[INFO] Setting function generator frequency to %f\n\r", desired_frequency); if (strcmp("AG33250A", funcgenType) == 0) { @@ -187,7 +187,7 @@ int signal_set_frequency(float desired_frequency, char * funcgenType, int gpibDe } } -int signal_set_duty_cycle(float desired_dcycle, char * funcgenType, int gpibDevice, char * extendedError) { +int signal_set_duty_cycle(float desired_dcycle, const char * funcgenType, int gpibDevice, char * extendedError) { if ((strcmp("AG33250A", funcgenType) == 0)) { printf("[INFO] Setting function generator period to %f\n\r", desired_dcycle); if (strcmp("AG33250A", funcgenType) == 0) { @@ -211,7 +211,7 @@ int signal_set_duty_cycle(float desired_dcycle, char * funcgenType, int gpibDevi } } -int signal_set_waveform(char * waveform, char * funcgenType, int gpibDevice, char * extendedError) { +int signal_set_waveform(char * waveform, const char * funcgenType, int gpibDevice, char * extendedError) { if ((strcmp("AG33250A", funcgenType) == 0)) { printf("[INFO] Setting function generator waveform to %s\n\r", waveform); if (strcmp("AG33250A", funcgenType) == 0) { @@ -235,7 +235,7 @@ int signal_set_waveform(char * waveform, char * funcgenType, int gpibDevice, cha } } -int signal_set_peak_peak_voltage(float desired_voltage, char * funcgenType, int gpibDevice, char * extendedError) { +int signal_set_peak_peak_voltage(float desired_voltage, const char * funcgenType, int gpibDevice, char * extendedError) { if ((strcmp("AG33250A", funcgenType) == 0)) { printf("[INFO] Setting function generator peak-peak voltage to %f\n\r", desired_voltage); if (strcmp("AG33250A", funcgenType) == 0) { @@ -259,7 +259,7 @@ int signal_set_peak_peak_voltage(float desired_voltage, char * funcgenType, int } } -int signal_set_offset_voltage(float desired_voltage, char * funcgenType, int gpibDevice, char * extendedError) { +int signal_set_offset_voltage(float desired_voltage, const char * funcgenType, int gpibDevice, char * extendedError) { if ((strcmp("AG33250A", funcgenType) == 0)) { printf("[INFO] Setting function generator peak-peak voltage to %f\n\r", desired_voltage); if (strcmp("AG33250A", funcgenType) == 0) { -- cgit v1.2.3