mirrors
/
Labrador
mirror of https://github.com/EspoTek/Labrador.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed librador_send_signal_gen_settings(). It's unnecessary.

This commit is contained in:
Chris Esposito 2018-04-20 10:42:21 +10:00
parent cb2ba2a0c3
commit d5754f4b2e
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Matlab_Octave_API/___librador/librador/librador.cpp
View File

@ -84,12 +84,10 @@ int librador_reset_usb(){
int librador_update_signal_gen_settings(int channel, unsigned char *sampleBuffer, int numSamples, double usecs_between_samples, double amplitude_v, double offset_v){
CHECK_API_INITIALISED
return internal_librador_object->usb_driver->update_function_gen_settings(channel, sampleBuffer, numSamples, usecs_between_samples, amplitude_v, offset_v);
}
int librador_send_signal_gen_settings(int channel){
CHECK_API_INITIALISED
return internal_librador_object->usb_driver->send_function_gen_settings(channel);
int error = internal_librador_object->usb_driver->update_function_gen_settings(channel, sampleBuffer, numSamples, usecs_between_samples, amplitude_v, offset_v);
if(error){
return error-1000;
} else return internal_librador_object->usb_driver->send_function_gen_settings(channel);
}
int librador_set_power_supply_voltage(double voltage){
@ -177,7 +175,6 @@ int librador_send_sin_wave(int channel, double frequency_Hz, double amplitude_v,
}
librador_update_signal_gen_settings(channel, sampleBuffer, num_samples, usecs_between_samples, amplitude_v, offset_v);
librador_send_signal_gen_settings(channel);
free(sampleBuffer);
return 0;

1
Matlab_Octave_API/___librador/librador/librador.h
View File

@ -12,7 +12,6 @@ int LIBRADORSHARED_EXPORT librador_reset_usb();
int LIBRADORSHARED_EXPORT librador_avr_debug();
//a1
int LIBRADORSHARED_EXPORT librador_update_signal_gen_settings(int channel, unsigned char* sampleBuffer, int numSamples, double usecs_between_samples, double amplitude_v, double offset_v);
int LIBRADORSHARED_EXPORT librador_send_signal_gen_settings(int channel);
int LIBRADORSHARED_EXPORT librador_send_sin_wave(int channel, double frequency_Hz, double amplitude_v, double offset_v);
//a2
////As above