martino/ec-gn-ja-pcf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed unused signals

Browse Source
This commit is contained in:
Martino Ferrari
2026-02-06 17:27:43 +01:00
parent 0177b52b7f
commit 89fac665f3
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
EC-GN-JA-PCF-IN/src/main/c++/GAMs/JARTStateMachineGAM/JARTStateMachineGAM.cpp
View File

@@ -153,9 +153,9 @@ bool JARTStateMachineGAM::Setup() {
using namespace MARTe; using namespace MARTe;
bool ok = (numberOfInputSignals == 13u); bool ok = (numberOfInputSignals == 13u);
if (ok) { if (ok) {
ok = (numberOfOutputSignals == 16u); ok = (numberOfOutputSignals == 14u);
if (!ok) { if (!ok) {
REPORT_ERROR(MARTe::ErrorManagement::ParametersError, "Seven output signals shall be defined %d",numberOfOutputSignals); REPORT_ERROR(MARTe::ErrorManagement::ParametersError, "14 output signals shall be defined %d",numberOfOutputSignals);
} }
} }
else { else {
@@ -218,8 +218,6 @@ bool JARTStateMachineGAM::Setup() {
outputMHVPSON = reinterpret_cast<uint32 *>(GetOutputSignalMemory(12)); outputMHVPSON = reinterpret_cast<uint32 *>(GetOutputSignalMemory(12));
outputSignalNI6259 = reinterpret_cast<uint32 *>(GetOutputSignalMemory(13)); outputSignalNI6259 = reinterpret_cast<uint32 *>(GetOutputSignalMemory(13));
outputSignalNI6528P3 = reinterpret_cast<uint8 *>(GetOutputSignalMemory(14));
outputSignalNI6528P4 = reinterpret_cast<uint8 *>(GetOutputSignalMemory(15));
*shotCounter = 0; *shotCounter = 0;
} }
@@ -389,20 +387,9 @@ bool JARTStateMachineGAM::Execute() {
} }
} }
if(*short_pulse_mode == 1){ if(*short_pulse_mode == 1){
p3Value = 1*aps_hvon_state + 8*bps_hvon_state +16*bps_swon_state + 64*(*outputBeamON); p3Value = aps_hvon_state + 8*bps_hvon_state +16*bps_swon_state + 64*(*outputBeamON);
*outputSignalNI6259 = 1*aps_swon_state; *outputSignalNI6259 = aps_swon_state;
*outputSignalNI6528P3 = ~p3Value;
//REPORT_ERROR(ErrorManagement::Debug, "short pulse mode with p3: %d.", p3Value);
} else {
p3Value = 1*aps_hvon_state +2*aps_swon_state + 8*bps_hvon_state +16*bps_swon_state + 64*(*outputBeamON);
*outputSignalNI6528P3 = ~p3Value;
//REPORT_ERROR(ErrorManagement::Debug, "long pulse mode with p3: %d.", p3Value);
} }
p4Value = 8*mhvps_hvon_state;
if (modulation) p4Value += 32;
if (pauseSet) p4Value += 1;
//*outputSignalNI6528P4 = ~(*ni6528p4Value | p4Value);
*outputSignalNI6528P4 = ~p4Value;
return true; return true;
} }

3
EC-GN-JA-PCF-IN/src/main/c++/GAMs/JARTStateMachineGAM/JARTStateMachineGAM.h
View File

@@ -221,8 +221,6 @@ private:
// Output signals for NI devices // Output signals for NI devices
MARTe::uint32 *outputSignalNI6259; MARTe::uint32 *outputSignalNI6259;
MARTe::uint8 *outputSignalNI6528P3;
MARTe::uint8 *outputSignalNI6528P4;
////////////////////////////// //////////////////////////////
//Internal Parameters //Internal Parameters
@@ -246,7 +244,6 @@ private:
// terminal values // terminal values
MARTe::uint8 p3Value; MARTe::uint8 p3Value;
MARTe::uint8 p4Value;
MARTe::uint8 aps_hvon_state; MARTe::uint8 aps_hvon_state;
MARTe::uint8 aps_swon_state; MARTe::uint8 aps_swon_state;
MARTe::uint8 mhvps_hvon_state; MARTe::uint8 mhvps_hvon_state;