Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Develop into Freeze #183

Merged
merged 8 commits into from
Jul 3, 2024
Merged

Merge Develop into Freeze #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c84e3b4
readd check for tabs in sources
ernstblechaPT Jun 25, 2024
9135cfb
replace tabulator in manually written cpp and h files
ernstblechaPT Jun 25, 2024
753e5a6
fix indentation in generated files
ernstblechaPT Jun 25, 2024
8707a0c
fix indentation in code of function ANY_AS_STRING
ernstblechaPT Jun 25, 2024
aeb83c1
Merge pull request #173 from eclipse-4diac/freeze
azoitl Jun 26, 2024
82136a8
tabs remove from resource.cpp
MoritzO02 Jun 26, 2024
f000900
Upgraded CMake4Eclipse project config
azoitl Jun 18, 2024
67fb3c5
Merge pull request #182 from eclipse-4diac/freeze
azoitl Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 25 additions & 60 deletions .cproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule cmakelistsFolder="" moduleId="de.marw.cmake4eclipse.mbs.settings">
<targets>
<target name="all"/>
<target name="clean"/>
<target name="help"/>
<target name="install"/>
<target name="test"/>
</targets>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="cmake4eclipse.mbs.config.debug.1660483861">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cmake4eclipse.mbs.config.debug.1660483861" moduleId="org.eclipse.cdt.core.settings" name="Debug_Posix">
<cconfiguration id="cmake4eclipse.mbs.config.debug.1283498410">
<storageModule buildSystemId="de.marw.cmake4eclipse.mbs.cmake4eclipse" id="cmake4eclipse.mbs.config.debug.1283498410" moduleId="org.eclipse.cdt.core.settings" name="Debug">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.PE64" point="org.eclipse.cdt.core.BinaryParser"/>
Expand All @@ -14,80 +23,36 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildArtefactType="cmake4eclipse.mbs.buildArtefactType.cmake" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=cmake4eclipse.mbs.buildArtefactType.cmake,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" description="" id="cmake4eclipse.mbs.config.debug.1660483861" name="Debug_Posix" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="cmake4eclipse.mbs.config.debug">
<folderInfo id="cmake4eclipse.mbs.config.debug.1660483861." name="/" resourcePath="">
<toolChain id="cmake4eclipse.mbs.config.debug.toolChain.627625016" name="CMake driven" superClass="cmake4eclipse.mbs.config.debug.toolChain">
<targetPlatform id="cmake4eclipse.mbs.targetPlatform.cmake.917959077" name="Any Platform" superClass="cmake4eclipse.mbs.targetPlatform.cmake"/>
<builder buildPath="/org.eclipse.4diac.forte/_build/Debug" id="cmake4eclipse.mbs.builder.1976008197" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CMake Builder" superClass="cmake4eclipse.mbs.builder"/>
<tool id="cmake4eclipse.mbs.toolchain.tool.dummy.1827102752" name="CMake" superClass="cmake4eclipse.mbs.toolchain.tool.dummy">
<inputType id="cmake4eclipse.mbs.inputType.c.1847222460" superClass="cmake4eclipse.mbs.inputType.c"/>
<inputType id="cmake4eclipse.mbs.inputType.cpp.2120222146" superClass="cmake4eclipse.mbs.inputType.cpp"/>
<configuration buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" description="" id="cmake4eclipse.mbs.config.debug.1283498410" name="Debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.dockerdpath=,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="cmake4eclipse.mbs.config.debug">
<folderInfo id="cmake4eclipse.mbs.config.debug.1283498410." name="/" resourcePath="">
<toolChain id="cmake4eclipse.mbs.config.debug.toolChain.1128916177" name="CMake driven" superClass="cmake4eclipse.mbs.config.debug.toolChain">
<targetPlatform id="cmake4eclipse.mbs.targetPlatform.cmake.1833460757" name="Any Platform" superClass="cmake4eclipse.mbs.targetPlatform.cmake"/>
<builder buildPath="/org.eclipse.4diac.forte/_build/Debug" id="cmake4eclipse.mbs.builder.854497440" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CMake Builder" superClass="cmake4eclipse.mbs.builder"/>
<tool id="cmake4eclipse.mbs.toolchain.tool.dummy.869551843" name="CMake" superClass="cmake4eclipse.mbs.toolchain.tool.dummy">
<inputType id="cmake4eclipse.mbs.inputType.c.970261053" superClass="cmake4eclipse.mbs.inputType.c"/>
<inputType id="cmake4eclipse.mbs.inputType.cpp.1713005143" superClass="cmake4eclipse.mbs.inputType.cpp"/>
</tool>
</toolChain>
</folderInfo>
</configuration>
</storageModule>
<storageModule buildDir="build/${ConfigName}" dirtyTs="1696800405461" moduleId="de.marw.cmake4eclipse.mbs.settings">
<options otherArguments="-DFORTE_ARCHITECTURE=Posix&#10; -DFORTE_COM_ETH=ON&#10; -DFORTE_COM_FBDK=ON&#10; -DFORTE_COM_LOCAL=ON&#10; -DFORTE_MODULE_CONVERT=ON&#10; -DFORTE_MODULE_IEC61131=ON&#10; -DFORTE_MODULE_UTILS=ON"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
<cconfiguration id="cmake4eclipse.mbs.config.release.2092763462">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cmake4eclipse.mbs.config.release.2092763462" moduleId="org.eclipse.cdt.core.settings" name="Release_Posix">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.PE64" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildArtefactType="cmake4eclipse.mbs.buildArtefactType.cmake" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=cmake4eclipse.mbs.buildArtefactType.cmake,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" description="" id="cmake4eclipse.mbs.config.release.2092763462" name="Release_Posix" optionalBuildProperties="" parent="cmake4eclipse.mbs.config.release">
<folderInfo id="cmake4eclipse.mbs.config.release.2092763462." name="/" resourcePath="">
<toolChain id="cmake4eclipse.mbs.config.release.toolChain.92782083" name="CMake driven" superClass="cmake4eclipse.mbs.config.release.toolChain">
<targetPlatform id="cmake4eclipse.mbs.targetPlatform.cmake.575493456" name="Any Platform" superClass="cmake4eclipse.mbs.targetPlatform.cmake"/>
<builder buildPath="/org.eclipse.4diac.forte/_build/Release" id="cmake4eclipse.mbs.builder.1239905550" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CMake Builder" superClass="cmake4eclipse.mbs.builder"/>
<tool id="cmake4eclipse.mbs.toolchain.tool.dummy.1874874312" name="CMake" superClass="cmake4eclipse.mbs.toolchain.tool.dummy">
<inputType id="cmake4eclipse.mbs.inputType.c.855977962" superClass="cmake4eclipse.mbs.inputType.c"/>
<inputType id="cmake4eclipse.mbs.inputType.cpp.514085371" superClass="cmake4eclipse.mbs.inputType.cpp"/>
</tool>
</toolChain>
</folderInfo>
</configuration>
<storageModule buildDir="build/${ConfigName}" dirtyTs="1719689122851" moduleId="de.marw.cmake4eclipse.mbs.settings">
<options otherArguments="-DFORTE_ARCHITECTURE=Posix&#10;-DFORTE_COM_ETH=ON&#10;-DFORTE_COM_FBDK=ON&#10;-DFORTE_COM_LOCAL=ON&#10;-DFORTE_MODULE_CONVERT=ON&#10;-DFORTE_MODULE_IEC61131=ON&#10;-DFORTE_MODULE_UTILS=ON"/>
</storageModule>
<storageModule moduleId="de.marw.cmake4eclipse.mbs.settings"/>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="org.eclipse.4diac.forte.cmake4eclipse.mbs.projectType.1800498883" name="" projectType="cmake4eclipse.mbs.projectType"/>
</storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="org.eclipse.4diac.forte.cmake4eclipse.mbs.projectType.2054396440" name="Cmake4eclipse" projectType="cmake4eclipse.mbs.projectType"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Debug_Posix">
<resource resourceType="PROJECT" workspacePath="/org.eclipse.4diac.forte"/>
</configuration>
<configuration configurationName="Default">
<resource resourceType="PROJECT" workspacePath="/org.eclipse.4diac.forte"/>
</configuration>
<configuration configurationName="Debug">
<resource resourceType="PROJECT" workspacePath="/org.eclipse.4diac.forte"/>
</configuration>
<configuration configurationName="Release">
<resource resourceType="PROJECT" workspacePath="/org.eclipse.4diac.forte"/>
</configuration>
</storageModule>
<storageModule cmakelistsFolder="" moduleId="de.marw.cmake4eclipse.mbs.settings">
<targets>
<target name=""/>
</targets>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
</cproject>
20 changes: 20 additions & 0 deletions .github/workflows/tab_check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform.
# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
name: Check for Tabs

on:
push:
branches: [ "release", "develop", "freeze" ]
pull_request:
branches: [ "release", "develop", "freeze" ]

jobs:
build:
runs-on: ubuntu-latest
container: quay.io/eclipse4diac/4diac-fortebuildcontainer:latest

steps:
- uses: actions/[email protected]

- name: Test for Tabs
run: tests/findTabs.sh
12 changes: 2 additions & 10 deletions .project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,14 @@
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<name>de.marw.cmake4eclipse.mbs.genscriptbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>de.marw.cmake4eclipse.mbs.cmake4eclipsenature</nature>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
</natures>
</projectDescription>
28 changes: 14 additions & 14 deletions src/arch/timerha.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@ DEFINE_HANDLER(CTimerHandler)


CTimerHandler::CTimerHandler(CDeviceExecution& paDeviceExecution) : CExternalEventHandler(paDeviceExecution),
mForteTime(0) {
mForteTime(0) {
}

CTimerHandler::~CTimerHandler() = default;

void CTimerHandler::registerOneShotTimedFB(CEventSourceFB *const paTimedFB, const CIEC_TIME &paTimeInterval) {
TForteUInt32 interval = convertIntervalToTimerHandlerUnits(paTimeInterval);
addToAddFBList(STimedFBListEntry(paTimedFB, mForteTime + interval, scmOneShotIndicator));
TForteUInt32 interval = convertIntervalToTimerHandlerUnits(paTimeInterval);
addToAddFBList(STimedFBListEntry(paTimedFB, mForteTime + interval, scmOneShotIndicator));
}

void CTimerHandler::registerPeriodicTimedFB(CEventSourceFB *const paTimedFB, const CIEC_TIME &paTimeInterval) {
TForteUInt32 interval = convertIntervalToTimerHandlerUnits(paTimeInterval);
addToAddFBList(STimedFBListEntry(paTimedFB, mForteTime + interval, interval));
TForteUInt32 interval = convertIntervalToTimerHandlerUnits(paTimeInterval);
addToAddFBList(STimedFBListEntry(paTimedFB, mForteTime + interval, interval));
}

TForteUInt32 CTimerHandler::convertIntervalToTimerHandlerUnits(const CIEC_TIME &paTimeInterval){
Expand All @@ -64,7 +64,7 @@ void CTimerHandler::unregisterTimedFB(CEventSourceFB *paTimedFB) {

void CTimerHandler::removeTimedFB(CEventSourceFB *paTimedFB) {
auto it = std::remove_if(mTimedFBList.begin(), mTimedFBList.end(),
[&paTimedFB](const STimedFBListEntry& entry) { return entry.mTimedFB == paTimedFB; });
[&paTimedFB](const STimedFBListEntry& entry) { return entry.mTimedFB == paTimedFB; });
mTimedFBList.erase(it, mTimedFBList.end());
}

Expand All @@ -88,26 +88,26 @@ void CTimerHandler::processTimedFBList() {
std::vector<STimedFBListEntry> triggered(mTimedFBList.begin(), last);
mTimedFBList.erase(mTimedFBList.begin(), last);
for (auto &fb : triggered) {
triggerTimedFB(fb);
triggerTimedFB(fb);
}
}

void CTimerHandler::triggerTimedFB(STimedFBListEntry paTimerListEntry) {
mDeviceExecution.startNewEventChain(paTimerListEntry.mTimedFB);
if(paTimerListEntry.mInterval != scmOneShotIndicator){
paTimerListEntry.mTimeOut = mForteTime + paTimerListEntry.mInterval; // the next activation time of this FB
addTimedFBEntry(paTimerListEntry); //re-register the timed FB
paTimerListEntry.mTimeOut = mForteTime + paTimerListEntry.mInterval; // the next activation time of this FB
addTimedFBEntry(paTimerListEntry); //re-register the timed FB
}
}

void CTimerHandler::processAddList() {
CCriticalRegion criticalRegion(mAddListSync);
for (auto entry : mAddFBList) {
if(entry.mTimeOut < mForteTime) {
triggerTimedFB(entry);
} else {
addTimedFBEntry(entry);
}
if(entry.mTimeOut < mForteTime) {
triggerTimedFB(entry);
} else {
addTimedFBEntry(entry);
}
}
mAddFBList.clear();
}
Expand Down
8 changes: 4 additions & 4 deletions src/arch/timerha.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ class CTimerHandler : public CExternalEventHandler{

/*!\brief Register an Event source Function Block for receiving a single timed event.
*
* \param paTimedFB the event source FB to be registered
* \param paTimeInterval delta time to next event
* \param paTimedFB the event source FB to be registered
* \param paTimeInterval delta time to next event
*/
void registerOneShotTimedFB(CEventSourceFB *const paTimedFB, const CIEC_TIME &paTimeInterval);

/*!\brief Register an Event source Function Block for receiving a periodic events.
*
* \param paTimedFB the event source FB to be registered
* \param paTimeInterval delta time between two events
* \param paTimedFB the event source FB to be registered
* \param paTimeInterval delta time between two events
*/
void registerPeriodicTimedFB(CEventSourceFB *const paTimedFB, const CIEC_TIME &paTimeInterval);

Expand Down
6 changes: 3 additions & 3 deletions src/arch/zephyr/sockhand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
#endif

inline in_addr_t inet_addr(const char *cp) {
in_addr_t in_addr;
if (0 == net_addr_pton(AF_INET, cp, &in_addr)) return in_addr;
return -1;
in_addr_t in_addr;
if (0 == net_addr_pton(AF_INET, cp, &in_addr)) return in_addr;
return -1;
}

void setupMulticastGroup(char* paIPAddr, const char* paMCInterface);
Expand Down
2 changes: 1 addition & 1 deletion src/com/opc_ua/opcua_layer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ EComResponse COPC_UA_Layer::sendData(void *, unsigned int) {
EComResponse COPC_UA_Layer::processInterrupt() {
CCriticalRegion criticalRegion(mRDBufferMutex);
if(mIsObjectNodeStruct) {
COPC_UA_ObjectStruct_Helper::setMemberValues(getCommFB()->getRDs(), mRDBuffer);
COPC_UA_ObjectStruct_Helper::setMemberValues(getCommFB()->getRDs(), mRDBuffer);
} else {
for(size_t i = 0; i < getCommFB()->getNumRD(); ++i) {
getCommFB()->getRDs()[i]->setValue(*mRDBuffer[i]);
Expand Down
12 changes: 6 additions & 6 deletions src/core/cominfra/structmembercomlayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ namespace forte {
* structmemb[localgroupname;structtype;structmembername]
*
* It is also possible to wirte to children of the structs using:
* structmemb[localgroupname;structtype;structmembername.structchildmembername]
* structmemb[localgroupname;structtype;structmembername.structchildmembername]
*
* or writing to array elements using:
* structmemb[localgroupname;structtype;structmembername(10).structchildmembername]
* Note: Please use 'array(0)' to access instead of 'array[0]'!!
* structmemb[localgroupname;structtype;structmembername(10).structchildmembername]
* Note: Please use 'array(0)' to access instead of 'array[0]'!!
*
*
* - localgroupname: is the local group this local com layer should attach to. If this is the
Expand Down Expand Up @@ -69,9 +69,9 @@ namespace forte {
bool parseArrayIndexFromString(const char *paNestedStructString, CIEC_INT& targetIndex);

enum EComStringIndex {
e_LOCALGROUPNAME,
e_STRUCTTYPE,
e_STRUCTMEMBERNAME
e_LOCALGROUPNAME,
e_STRUCTTYPE,
e_STRUCTMEMBERNAME
};
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/core/funcbloc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ void CFunctionBlock::readData(size_t paDINum, CIEC_ANY& paValue, const CDataConn

#ifdef FORTE_TRACE_CTF
void CFunctionBlock::writeData(size_t paDONum, CIEC_ANY& paValue, CDataConnection& paConn) {
if(paConn.isConnected()) {
if(paConn.isConnected()) {
#ifdef FORTE_SUPPORT_MONITORING
if(paValue.isForced() != true) {
#endif //FORTE_SUPPORT_MONITORING
Expand Down
2 changes: 1 addition & 1 deletion src/core/funcbloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ class CFunctionBlock {
paConn.readData(paValue);
}
#endif //FORTE_SUPPORT_MONITORING
}
}
}
#endif //FORTE_TRACE_CTF

Expand Down
4 changes: 2 additions & 2 deletions src/core/resource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,8 @@ EMGMResponse CResource::writeValue(forte::core::TNameIdentifier &paNameList, con
//this is not an identifier for the resource interface
fb = getContainedFB(runner);
if(!runner.isLastEntry()){
// currently we can not write values of FBs inside of FBs
return EMGMResponse::NoSuchObject;
// currently we can not write values of FBs inside of FBs
return EMGMResponse::NoSuchObject;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/modules/IEC61131-3/Conversion/F_ANY_AS_STRING_fbt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,6 @@ CIEC_ANY *FORTE_F_ANY_AS_STRING::getVarInternal(size_t) {
}

void FORTE_F_ANY_AS_STRING::alg_REQ(void) {
var_OUT = func_ANY_AS_STRING(var_IN);
var_OUT = func_ANY_AS_STRING(var_IN);
}

4 changes: 2 additions & 2 deletions src/modules/embrick/types/EBBusAdapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@ class FORTE_EBBusAdapter final : public forte::core::io::IOConfigFBMultiAdapter
virtual ~FORTE_EBBusAdapter() = default;

private:
static const TForteUInt8 scmSlaveConfigurationIO[];
static const TForteUInt8 scmSlaveConfigurationIONum;
static const TForteUInt8 scmSlaveConfigurationIO[];
static const TForteUInt8 scmSlaveConfigurationIONum;
};
4 changes: 2 additions & 2 deletions src/modules/gpiochip/gpiochip_config_fb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ void GPIOChipConfigFB::setInitialValues() {

void GPIOChipConfigFB::readInputData(const TEventID paEIID) {
for (auto i = 0; i < 7; i++) {
readData(i, *mDIs[i], mDIConns[i]);
readData(i, *mDIs[i], mDIConns[i]);
}
}

void GPIOChipConfigFB::writeOutputData(const TEventID paEIID) {
for (auto i = 0; i < 2; i++) {
writeData(i, *mDOs[i], mDOConns[i]);
writeData(i, *mDOs[i], mDOConns[i]);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/stdfblib/events/E_PULSE_fbt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ FORTE_E_PULSE::FORTE_E_PULSE(const CStringDictionary::TStringId paInstanceNameId
};

void FORTE_E_PULSE::setInitialValues() {
var_PT = 0_TIME;
var_Q = 0_BOOL;
var_PT = 0_TIME;
var_Q = 0_BOOL;
}

const SCFB_FBInstanceData FORTE_E_PULSE::scmInternalFBs[] = {
Expand Down
6 changes: 3 additions & 3 deletions src/stdfblib/events/E_TOF_fbt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ FORTE_E_TOF::FORTE_E_TOF(const CStringDictionary::TStringId paInstanceNameId, fo
};

void FORTE_E_TOF::setInitialValues() {
var_IN = 0_BOOL;
var_PT = 0_TIME;
var_Q = 0_BOOL;
var_IN = 0_BOOL;
var_PT = 0_TIME;
var_Q = 0_BOOL;
}

const SCFB_FBInstanceData FORTE_E_TOF::scmInternalFBs[] = {
Expand Down
Loading