| @@ -41,33 +41,30 @@ classdef FunctionGenerator < Equipment | |||||
| end | end | ||||
| function fg = set.waveform(fg,w) | function fg = set.waveform(fg,w) | ||||
| fg.waveform = FunctionGenerator.getWave(w); | |||||
| fg.write(strcat('FUNCtion:SHAPe ', fg.waveform)); | |||||
| fg.write(strcat('FUNCtion:SHAPe ', FunctionGenerator.getWave(w))); | |||||
| end | end | ||||
| function fg = set.frequency(fg,f) | function fg = set.frequency(fg,f) | ||||
| fg.frequency = Equipment.forceNum(f); | |||||
| fg.write(strcat('FREQuency ', num2str(fg.frequency))); | |||||
| Equipment.forceNum(f); | |||||
| fg.write(strcat('FREQuency ', num2str(f))); | |||||
| end | end | ||||
| function fg = set.voltage(fg,v) | function fg = set.voltage(fg,v) | ||||
| fg.voltage = Equipment.forceNum(v); | |||||
| fg.write(strcat('VOLTage ', num2str(fg.voltage))); | |||||
| Equipment.forceNum(v); | |||||
| fg.write(strcat('VOLTage ', num2str(v))); | |||||
| end | end | ||||
| function fg = set.unit(fg,u) | function fg = set.unit(fg,u) | ||||
| fg.unit = FunctionGenerator.getUnit(u); | |||||
| fg.write(strcat('VOLTage:UNIT ', fg.unit)); | |||||
| fg.write(strcat('VOLTage:UNIT ', FunctionGenerator.getUnit(u))); | |||||
| end | end | ||||
| function fg = set.offset(fg,o) | function fg = set.offset(fg,o) | ||||
| fg.offset = Equipment.forceNum(o); | |||||
| fg.write(strcat('VOLTage:OFFSet ', num2str(fg.offset))); | |||||
| Equipment.forceNum(o); | |||||
| fg.write(strcat('VOLTage:OFFSet ', num2str(o))); | |||||
| end | end | ||||
| function fg = set.load(fg,l) | function fg = set.load(fg,l) | ||||
| fg.load = FunctionGenerator.getLoad(l); | |||||
| fg.write(strcat('OUTPut:LOAD ', fg.load)); | |||||
| fg.write(strcat('OUTPut:LOAD ', FunctionGenerator.getLoad(l))); | |||||
| end | end | ||||
| end | end | ||||