Skip to content

P
proview
Commit 6546dcec authored by Claes's avatar Claes
Browse files
Options

Class volume Miscellaneous and game pingpong added

parent 74f05bbb
Expand all Show whitespace changes
Inline Side-by-side
Showing with 7428 additions and 8 deletions
bcomp/lib/rt/src/os_templ/hw_templ/special.mk 0 → 100644
View file @ 6546dcec
copy : $(doc_dir)/sv_se/orm/rt_plc_bcomp_c.html \
$(doc_dir)/en_us/orm/rt_plc_bcomp_c.html
$(doc_dir)/sv_se/orm/rt_plc_bcomp_c.html : ../../rt_plc_bcomp.c
@ echo "Generating html files for rt_plc_bcomp sv_se..."
@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
$(doc_dir)/en_us/orm/rt_plc_bcomp_c.html : ../../rt_plc_bcomp.c
@ echo "Generating html files for rt_plc_bcomp en_us..."
@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
bcomp/lib/rt/src/rt_plc_bcomp.c
View file @ 6546dcec
......@@ -42,6 +42,7 @@
/*_*
RunTimeCounterFo
@aref runtimecounter
@aref runtimecounterfo RunTimeCounterFo
*/
void RunTimeCounterFo_init( pwr_sClass_RunTimeCounterFo *o)
......@@ -117,6 +118,7 @@ void RunTimeCounterFo_exec( plc_sThread *tp,
/*_*
CompModePID_Fo
@aref compmodepid
@aref compmodepid_fo CompModePID_Fo
*/
void CompModePID_Fo_init( pwr_sClass_CompModePID_Fo *o)
......@@ -200,6 +202,7 @@ void CompModePID_Fo_exec( plc_sThread *tp,
Revision: 2011-01-18 / Werner
Error in filtered derivate part corrected.
@aref comppid
@aref comppid_fo CompPID_Fo
*/
void CompPID_Fo_init( pwr_sClass_CompPID_Fo *o)
......@@ -374,7 +377,8 @@ void CompPID_Fo_exec( plc_sThread *tp,
/*_*
OnOffBurnerFo
@aref onoffburnerfo OnOffBurnerFo
@aref componoffburner
@aref componoffburnerfo CompOnOffBurnerFo
*/
void CompOnOffBurnerFo_init( pwr_sClass_CompOnOffBurnerFo *o)
{
......@@ -464,6 +468,7 @@ void CompOnOffBurnerFo_exec( plc_sThread *tp,
/*_*
CompOnOffZoneFo
@aref componoffzone
@aref componoffzonefo CompOnOffZoneFo
*/
void CompOnOffZoneFo_init( pwr_sClass_CompOnOffZoneFo *o)
......
bcomp/wbl/bcomp/src/basecomponent.wb_load
View file @ 6546dcec
......@@ -53280,13 +53280,14 @@ and no Auto/Man button."
EndObject
!/**
! @Version 1.0
! @Code rt_plc_bcomp.c
! @Summary Plc function object to CompModePID.
! Plc function object to CompModePID.
!
! @image orm_compmodepid_fo_fo.gif
!
! Connect the function object to an object of class or subclass of
! CompModePID_Fo.
! CompModePID.
!
! @b See also
! @classlink CompModePID basecomponent_compmodepid.html
......@@ -54128,13 +54129,14 @@ and no Auto/Man button."
EndObject
!/**
! @Version 1.0
! @Code rt_plc_bcomp.c
! @Summary Plc function object to CompPID.
! Plc function object to CompPID.
!
! @image orm_comppid_fo_fo.gif
!
! Connect the function object to an object of class or subclass of
! CompPID_Fo.
! CompPID.
!
! @b See also
! @classlink CompPID basecomponent_comppid.html
......@@ -111782,6 +111784,7 @@ Safety switch"
EndObject
!/**
! @Version 1.0
! @Code rt_plc_bcomp.c
! @Summary Count the run time of a component.
! Count the run time of a component.
!
......@@ -112030,6 +112033,7 @@ Safety switch"
EndObject
!/**
! @Version 1.0
! @Code rt_plc_bcomp.c
! @Summary Plc function object to RunTimeCounter.
! Plc function object to RunTimeCounter.
!
......@@ -173634,6 +173638,7 @@ OA2 = A4 + (OA1 - 5) / 90 * (A3 - A4);"
!/**
! @Version 1.0
! @Group Plc
! @Code rt_plc_bcomp.c
! @Summary Burner on/off sequence control, burner unit.
! Burner on/off sequence control, burner unit.
!
......@@ -173935,6 +173940,7 @@ OA2 = A4 + (OA1 - 5) / 90 * (A3 - A4);"
!/**
! @Version 1.0
! @Group Plc
! @Code rt_plc_bcomp.c
! @Summary Burner on/off sequence control, zone unit.
! Burner on/off sequence control, zone unit.
!
misc/lib/misc/src/misc_plc.c 0 → 100644
View file @ 6546dcec
This diff is collapsed.
misc/lib/misc/src/os_templ/hw_templ/makefile 0 → 100644
View file @ 6546dcec
include $(pwre_dir_symbols)
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
ifeq ($($(type_name)_generic_mk),)
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
endif
ifeq ($($(type_name)_generic_mk),)
include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
endif
-include ../../special.mk
-include ../special.mk
-include special.mk
misc/lib/misc/src/os_templ/hw_templ/special.mk 0 → 100644
View file @ 6546dcec
copy : $(doc_dir)/sv_se/orm/misc_plc_c.html \
$(doc_dir)/en_us/orm/misc_plc_c.html
$(doc_dir)/sv_se/orm/misc_plc_c.html : ../../misc_plc.c
@ echo "Generating html files for misc_plc sv_se..."
@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
$(doc_dir)/en_us/orm/misc_plc_c.html : ../../misc_plc.c
@ echo "Generating html files for misc_plc en_us..."
@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
misc/mmi/misc/src/misc_pingpong_settings.pwg 0 → 100644
View file @ 6546dcec
This diff is collapsed.
misc/mmi/misc/src/os_templ/hw_templ/makefile 0 → 100644
View file @ 6546dcec
include $(pwre_dir_symbols)
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
ifeq ($($(type_name)_generic_mk),)
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
endif
ifeq ($($(type_name)_generic_mk),)
include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
endif
-include ../../special.mk
-include ../special.mk
-include special.mk
misc/mmi/misc/src/pwr_c_misc_pingpong.pwg 0 → 100644
View file @ 6546dcec
This diff is collapsed.
misc/wbl/misc/src/miscellaneous.wb_load 0 → 100644
View file @ 6546dcec
This diff is collapsed.
misc/wbl/misc/src/os_templ/hw_templ/makefile 0 → 100644
View file @ 6546dcec
include $(pwre_dir_symbols)
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
ifeq ($($(type_name)_generic_mk),)
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
endif
ifeq ($($(type_name)_generic_mk),)
include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
endif
-include ../../special.mk
-include ../special.mk
-include special.mk
otherio/lib/rt/src/os_linux/rt_io_m_hilscher_cifx_pncontroller.cpp
View file @ 6546dcec
......@@ -1040,7 +1040,7 @@ static pwr_tStatus IoAgentRead( io_tCtx ctx, io_sAgent *ap)
int msg_size = 500;
APIOC_ALARM_IND_T *msg = (APIOC_ALARM_IND_T *)calloc( 1, msg_size);
sts = xChannelGetPacket( local->chan, msg_size, (CIFX_PACKET *)msg, 20);
sts = xChannelGetPacket( local->chan, msg_size, (CIFX_PACKET *)msg, 0);
if ( sts == CIFX_NO_ERROR) {
printf( "Diag message ?\n");
......
src/doc/web/src/orm_menu.js
View file @ 6546dcec
......@@ -66,6 +66,9 @@ foldersTree = gFld("<b>Object Reference Manual</b>", "../orm_intro.html")
aux1 = insFld(foldersTree, gFld("<b>KlocknerMoeller</b>", "klocknermoeller_index.html"))
KlocknerMoeller(aux1)
aux1 = insFld(foldersTree, gFld("<b>Miscellaneous</b>", "miscellaneous_index.html"))
Miscellaneous(aux1)
......
src/exp/rt/src/pwr_volumelist.dat
View file @ 6546dcec
......@@ -3,6 +3,7 @@ pwrb 0.0.0.2
nmps 0.0.1.1
tlog 0.0.1.2
remote 0.0.1.4
miscellaneous 0.0.0.9
basecomponent 0.0.0.10
profibus 0.0.250.7
opc 0.0.250.9
......
src/tools/pkg/deb/adm/pwr_volumelist.dat
View file @ 6546dcec
......@@ -4,9 +4,10 @@
TLog 0.0.1.2 PwrBase
SSAB 0.0.1.3 PwrBase
Remote 0.0.1.4 PwrBase
Miscellaneous 0.0.0.9 PwrBase
BaseComponent 0.0.0.10 PwrBase
Profibus 0.0.250.7 PwrBase
OtherManufacturer 0.2.250.1 PwrBase
OtherManufacturer 0.0.250.1 PwrBase
ABB 0.0.250.2 PwrBase
Siemens 0.0.250.3 PwrBase
Telemecanique 0.0.250.4 PwrBase
......
src/tools/pkg/deb_x86_64/adm/pwr_volumelist.dat
View file @ 6546dcec
......@@ -4,9 +4,10 @@
TLog 0.0.1.2 PwrBase
SSAB 0.0.1.3 PwrBase
Remote 0.0.1.4 PwrBase
Miscellaneous 0.0.0.9 PwrBase
BaseComponent 0.0.0.10 PwrBase
Profibus 0.0.250.7 PwrBase
OtherManufacturer 0.2.250.1 PwrBase
OtherManufacturer 0.0.250.1 PwrBase
ABB 0.0.250.2 PwrBase
Siemens 0.0.250.3 PwrBase
Telemecanique 0.0.250.4 PwrBase
......
src/tools/pkg/ubu/adm/pwr_volumelist.dat
View file @ 6546dcec
......@@ -4,9 +4,10 @@
TLog 0.0.1.2 PwrBase
SSAB 0.0.1.3 PwrBase
Remote 0.0.1.4 PwrBase
Miscellaneous 0.0.0.9 PwrBase
BaseComponent 0.0.0.10 PwrBase
Profibus 0.0.250.7 PwrBase
OtherManufacturer 0.2.250.1 PwrBase
OtherManufacturer 0.0.250.1 PwrBase
ABB 0.0.250.2 PwrBase
Siemens 0.0.250.3 PwrBase
Telemecanique 0.0.250.4 PwrBase
......
src/tools/pkg/ubu_x86_64/adm/pwr_volumelist.dat
View file @ 6546dcec
......@@ -4,9 +4,10 @@
TLog 0.0.1.2 PwrBase
SSAB 0.0.1.3 PwrBase
Remote 0.0.1.4 PwrBase
Miscellaneous 0.0.0.9 PwrBase
BaseComponent 0.0.0.10 PwrBase
Profibus 0.0.250.7 PwrBase
OtherManufacturer 0.2.250.1 PwrBase
OtherManufacturer 0.0.250.1 PwrBase
ABB 0.0.250.2 PwrBase
Siemens 0.0.250.3 PwrBase
Telemecanique 0.0.250.4 PwrBase
......
src/tools/pwre/src/os_linux/pwre.pl
View file @ 6546dcec
......@@ -825,6 +825,8 @@ sub create_all_modules ()
create();
_module("bcomp");
create();
_module("misc");
create();
_module("profibus");
create();
_module("sev");
......
wb/exp/wb/src/pwr_wb_palette.cnf
View file @ 6546dcec
......@@ -388,6 +388,7 @@ palette NavigatorPalette
classvolume Siemens Siemens
classvolume SsabOx SsabOx
classvolume Telemecanique Telemecanique
classvolume Miscellaneous Miscellaneous
}
}
......@@ -1066,6 +1067,10 @@ palette PlcEditorPalette
class Eurotherm_TC3001AggrSim
class SEW_Movidrive_1Sim
}
menu Miscellaneous
{
class Misc_PingPongFo
}
}
}
palette PlcEditorConPalette
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7