From 40e6430b2bc31e6c9ece6e2e0206b13a2c550619 Mon Sep 17 00:00:00 2001 From: Arthur Coolen <coolen@astron.nl> Date: Mon, 13 Mar 2017 15:22:30 +0000 Subject: [PATCH] Task #10099:added DPT points to indicate ilt modi --- .gitattributes | 1 + MAC/Deployment/data/PVSS/data/Cabinet.dpdef | 14 ++++++++++++++ MAC/Deployment/data/PVSS/data/FPGA.dpdef | 14 ++++++++++++++ MAC/Deployment/data/PVSS/data/Station.dpdef | 4 ++++ 4 files changed, 33 insertions(+) create mode 100644 MAC/Deployment/data/PVSS/data/Station.dpdef diff --git a/.gitattributes b/.gitattributes index f819b655a85..3f1c7945cd8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3782,6 +3782,7 @@ MAC/Deployment/data/PVSS/data/PVSSbase.dpdef -text MAC/Deployment/data/PVSS/data/PowerUnit.dpdef -text MAC/Deployment/data/PVSS/data/RTDBPort.dpdef -text MAC/Deployment/data/PVSS/data/SoftwareMonitor.dpdef -text +MAC/Deployment/data/PVSS/data/Station.dpdef -text MAC/Deployment/data/PVSS/data/StationControl.dpdef -text MAC/Deployment/data/PVSS/data/StationInfo.dpdef -text MAC/Deployment/data/PVSS/data/Stationbase.dpdef -text diff --git a/MAC/Deployment/data/PVSS/data/Cabinet.dpdef b/MAC/Deployment/data/PVSS/data/Cabinet.dpdef index 01681026172..715429212c8 100644 --- a/MAC/Deployment/data/PVSS/data/Cabinet.dpdef +++ b/MAC/Deployment/data/PVSS/data/Cabinet.dpdef @@ -23,3 +23,17 @@ controlMode string temperatureSensor bool humidityControl bool doorControl bool + +#for archiving purpose +compressed.avg_temperature float +compressed.avg_humidity float + +!# DpValue +!ElementName TypeName _original.._value +!_dt_Cabinet.Leaf _DynamicDatapoints "_mp_Cabinet.temperature:_archive", "_mp_Cabinet.humidity:_archive", "_mp_Cabinet.compressed.avg_temperature:_archive", "_mp_Cabinet.compressed.avg_humidity:_archive", "_mp_Cabinet.compressed.avg_temperature:_dp_fct", "_mp_Cabinet.compressed.avg_humidity:_dp_fct" +!_dt_Cabinet.DynamicAttribute _DynamicDatapoints "_da_none", "_da_none", "_da_none", "_da_none", "_da_none", "_da_none" + +!# DpFunction +!ElementName TypeName _dp_fct.._type _dp_fct.._param _dp_fct.._fct _dp_fct.._global _dp_fct.._old_new_compare _dp_fct.._stat_type _dp_fct.._interval _dp_fct.._time _dp_fct.._day_of_week _dp_fct.._day _dp_fct.._month _dp_fct.._delay _dp_fct.._read_archive _dp_fct.._inv_func _dp_fct.._inv_limit _dp_fct.._def_func _dp_fct.._def_limit _dp_fct.._user1_func _dp_fct.._user1_limit _dp_fct.._user2_func _dp_fct.._user2_limit _dp_fct.._user3_func _dp_fct.._user3_limit _dp_fct.._user4_func _dp_fct.._user4_limit _dp_fct.._user5_func _dp_fct.._user5_limit _dp_fct.._user6_func _dp_fct.._user6_limit _dp_fct.._user7_func _dp_fct.._user7_limit _dp_fct.._user8_func _dp_fct.._user8_limit _dp_fct.._interm_res _dp_fct.._interm_res_cyc +!_mp_Cabinet.compressed.avg_temperature Cabinet 63 _mp_Cabinet.temperature:_original.._value "p1" 0 8 300 0 -1 -1 -1 0 1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 1 10 +!_mp_Cabinet.compressed.avg_humidity Cabinet 63 _mp_Cabinet.humidity:_original.._value "p1" 0 8 300 0 -1 -1 -1 0 1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 1 10 diff --git a/MAC/Deployment/data/PVSS/data/FPGA.dpdef b/MAC/Deployment/data/PVSS/data/FPGA.dpdef index 5f70a07a01a..d12ceada648 100644 --- a/MAC/Deployment/data/PVSS/data/FPGA.dpdef +++ b/MAC/Deployment/data/PVSS/data/FPGA.dpdef @@ -10,3 +10,17 @@ hwVersion string # process information highTemp float fpgaTemp float + +#for archiving purpose +compressed.avg_highTemp float +compressed.avg_fpgaTemp float + +!# DpValue +!ElementName TypeName _original.._value +!_dt_FPGA.Leaf _DynamicDatapoints "_mp_FPGA.highTemp:_archive", "_mp_FPGA.fpgaTemp:_archive", "_mp_FPGA.compressed.avg_highTemp:_archive", "_mp_FPGA.compressed.avg_fpgaTemp:_archive", "_mp_FPGA.compressed.avg_highTemp:_dp_fct", "_mp_FPGA.compressed.avg_fpgaTemp:_dp_fct" +!_dt_FPGA.DynamicAttribute _DynamicDatapoints "_da_none", "_da_none", "_da_none", "_da_none", "_da_none", "_da_none" + +!# DpFunction +!ElementName TypeName _dp_fct.._type _dp_fct.._param _dp_fct.._fct _dp_fct.._global _dp_fct.._old_new_compare _dp_fct.._stat_type _dp_fct.._interval _dp_fct.._time _dp_fct.._day_of_week _dp_fct.._day _dp_fct.._month _dp_fct.._delay _dp_fct.._read_archive _dp_fct.._inv_func _dp_fct.._inv_limit _dp_fct.._def_func _dp_fct.._def_limit _dp_fct.._user1_func _dp_fct.._user1_limit _dp_fct.._user2_func _dp_fct.._user2_limit _dp_fct.._user3_func _dp_fct.._user3_limit _dp_fct.._user4_func _dp_fct.._user4_limit _dp_fct.._user5_func _dp_fct.._user5_limit _dp_fct.._user6_func _dp_fct.._user6_limit _dp_fct.._user7_func _dp_fct.._user7_limit _dp_fct.._user8_func _dp_fct.._user8_limit _dp_fct.._interm_res _dp_fct.._interm_res_cyc +!_mp_FPGA.compressed.avg_highTemp FPGA 63 _mp_FPGA.highTemp:_original.._value "p1" 0 8 300 0 -1 -1 -1 0 1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 1 10 +!_mp_FPGA.compressed.avg_fpgaTemp FPGA 63 _mp_FPGA.fpgaTemp:_original.._value "p1" 0 8 300 0 -1 -1 -1 0 1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 1 10 diff --git a/MAC/Deployment/data/PVSS/data/Station.dpdef b/MAC/Deployment/data/PVSS/data/Station.dpdef new file mode 100644 index 00000000000..c05db42255b --- /dev/null +++ b/MAC/Deployment/data/PVSS/data/Station.dpdef @@ -0,0 +1,4 @@ +# description of the station placeholder in the maindatabase +# next two points indicate if a stations and/or the stationswitch are in local mode or not +localMode.networkSwitch bool +localMode.stationSwitch bool \ No newline at end of file -- GitLab