Updated triangualr waveform gen
This commit is contained in:
@@ -51,7 +51,7 @@ JATriangleWaveGAM::JATriangleWaveGAM() {
|
||||
frequency = NULL_PTR(MARTe::float32 *);
|
||||
amplitude = NULL_PTR(MARTe::float32 *);
|
||||
offset = NULL_PTR(MARTe::float32 *);
|
||||
plcStandby = NULL_PTR(MARTe::uint32 *);
|
||||
plcStandby = NULL_PTR(MARTe::uint8 *);
|
||||
waveOutput = NULL_PTR(MARTe::float32 *);
|
||||
time = 0.0f;
|
||||
}
|
||||
@@ -130,7 +130,7 @@ bool JATriangleWaveGAM::Setup() {
|
||||
}
|
||||
else {
|
||||
TypeDescriptor inputType = GetSignalType(InputSignals, plcStandbyIndex);
|
||||
ok = (inputType == UnsignedInteger32Bit);
|
||||
ok = (inputType == UnsignedInteger8Bit);
|
||||
if (!ok) {
|
||||
REPORT_ERROR(ErrorManagement::ParametersError, "PLCSTANDBY shall be defined as uint32.");
|
||||
}
|
||||
@@ -147,7 +147,7 @@ bool JATriangleWaveGAM::Setup() {
|
||||
frequency = reinterpret_cast<float32 *>(GetInputSignalMemory(freqIndex));
|
||||
amplitude = reinterpret_cast<float32 *>(GetInputSignalMemory(ampIndex));
|
||||
offset = reinterpret_cast<float32 *>(GetInputSignalMemory(offsetIndex));
|
||||
plcStandby = reinterpret_cast<uint32 *>(GetInputSignalMemory(plcStandbyIndex));
|
||||
plcStandby = reinterpret_cast<uint8 *>(GetInputSignalMemory(plcStandbyIndex));
|
||||
waveOutput = reinterpret_cast<float32 *>(GetOutputSignalMemory(0));
|
||||
}
|
||||
return ok;
|
||||
|
||||
@@ -114,7 +114,7 @@ private:
|
||||
//MARTe::uint32 *plcReady;
|
||||
|
||||
// Input signal condition CCPS_STANDBY
|
||||
MARTe::uint32 *plcStandby;
|
||||
MARTe::uint8 *plcStandby;
|
||||
|
||||
MARTe::float32 *waveOutput;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user