Skip to content

P
proview
Commit 72283fbc authored by claes's avatar claes
Browse files
Options

Sound support for ge dynamic and alarms

parent 7fc5388a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1171 additions and 13 deletions
src/lib/rt/src/rt_mh_appl.h
View file @ 72283fbc
/*
* Proview $Id: rt_mh_appl.h,v 1.4 2005-09-01 14:57:56 claes Exp $
* Proview $Id: rt_mh_appl.h,v 1.5 2005-11-14 16:29:25 claes Exp $
* Copyright (C) 2005 SSAB Oxelösund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -111,6 +111,7 @@ struct mhs_ApplMessage {
This attribute is only used when calling mh_ApplGetMsgInfo.*/
mh_uSupInfo SupInfo; /**< Supplies the type of supervision data that should be associated
with the message: analog, digital or none. See mh_eSupType.*/
pwr_sAttrRef EventSound; /**< Reference to sound object. Determines the alarm sound. */
};
/**@}*/
......
src/lib/rt/src/rt_mh_net.x
View file @ 72283fbc
#ifdef RPC_HDR
%/*
% * Proview $Id: rt_mh_net.x,v 1.2 2005-09-01 14:57:56 claes Exp $
% * Proview $Id: rt_mh_net.x,v 1.3 2005-11-14 16:29:25 claes Exp $
% * Copyright (C) 2005 SSAB Oxelsund AB.
% *
% * This program is free software; you can redistribute it and/or
......@@ -364,6 +364,7 @@ struct mh_sMessage {
pwr_tString80 EventText;
mh_mEventStatus Status;
mh_uSupInfo SupInfo;
pwr_sAttrRef EventSound;
};
struct mh_sReturn {
......
src/wbl/bcomp/src/basecomponent.wb_load
View file @ 72283fbc
......@@ -31084,7 +31084,7 @@ Alarm HH, H, L, LL"
EndObject
EndObject
Object Template BaseTempSensor 2178646016 01-JAN-1970 01:00:00.00
Body RtBody 04-OCT-2005 10:17:56.86
Body RtBody 11-NOV-2005 08:58:38.19
Attr Super.Super.Specification = "TemperatureSensor"
Attr Super.Value.PresMaxLimit = 1.000000e+02
Attr Super.LimitHH.AlarmText = "HighHigh limit exceeded, tempsensor, "
......@@ -31096,7 +31096,7 @@ Alarm HH, H, L, LL"
Attr Super.LimitLL.AlarmText = "Below Low limit, tempsensor, "
Attr Super.LimitLL.Limit = 5.000000e+00
Attr Super.Trend.Multiple = 1
Attr Super.Trend.DataName = "BaseComponent:Class-BaseSensor-Template.Value.ActualValue"
Attr Super.Trend.DataName = "BaseComponent:Class-BaseTempSensor-Template.Super.Value.ActualValue"
Attr Super.Trend.StorageTime = 239
Attr Super.Trend.BufferStatus[0] = 1
Attr Super.Trend.BufferStatus[1] = 1
......@@ -43430,7 +43430,7 @@ Alarm HH, H, L, LL"
EndObject
EndObject
Object Template BaseLevelSensor 2178121728 01-JAN-1970 01:00:00.00
Body RtBody 04-OCT-2005 10:19:58.90
Body RtBody 11-NOV-2005 08:59:20.90
Attr Super.Super.Specification = "Sensor"
Attr Super.Value.PresMaxLimit = 1.000000e+02
Attr Super.LimitHH.AlarmText = "HighHigh limit exceeded, levelsensor, "
......@@ -43442,7 +43442,7 @@ Alarm HH, H, L, LL"
Attr Super.LimitLL.AlarmText = "Below LowLow limit, levelsensor, "
Attr Super.LimitLL.Limit = 5.000000e+00
Attr Super.Trend.Multiple = 1
Attr Super.Trend.DataName = "BaseComponent:Class-BaseSensor-Template.Value.ActualValue"
Attr Super.Trend.DataName = "BaseComponent:Class-BaseLevelSensor-Template.Super.Value.ActualValue"
Attr Super.Trend.StorageTime = 239
Attr Super.Trend.BufferStatus[0] = 1
Attr Super.Trend.BufferStatus[1] = 1
......@@ -53042,7 +53042,7 @@ Alarm HH, H, L, LL"
EndObject
EndObject
Object Template BasePositSensor 2172878848 01-JAN-1970 01:00:00.00
Body RtBody 03-OCT-2005 17:41:06.50
Body RtBody 11-NOV-2005 08:59:55.97
Attr Super.Super.Specification = "PositionalSensor"
Attr Super.Value.PresMaxLimit = 1.000000e+02
Attr Super.LimitHH.AlarmText = "HighHigh limit exceeded, sensor, "
......@@ -53054,13 +53054,13 @@ Alarm HH, H, L, LL"
Attr Super.LimitLL.AlarmText = "Below LowLow limit, sensor, "
Attr Super.LimitLL.Limit = 5.000000e+00
Attr Super.Trend.Multiple = 1
Attr Super.Trend.DataName = "BaseComponent:Class-BaseSensor-Template.Value.ActualValue"
Attr Super.Trend.DataName = "BaseComponent:Class-BasePressureSensor-Template.Super.Value.ActualValue"
Attr Super.Trend.StorageTime = 239
Attr Super.Trend.BufferStatus[0] = 1
Attr Super.Trend.BufferStatus[1] = 1
Attr Super.Trend.NoOfBuffers = 2
Attr Super.Trend.NoOfBufElement = 239
Attr Super.DefTrend = "BaseComponent:Class-BaseSensor-Template.Trend"
Attr Super.DefTrend = "BaseComponent:Class-BasePressureSensor-Template.Super.Trend"
Attr Gain = 1.000000e+00
EndBody
EndObject
src/wbl/bcomp/src/os_linux/hw_x86/makefile
View file @ 72283fbc
......@@ -110,12 +110,14 @@ $(doc_dir)/en_us/orm/%_allclasses.html : ../../%.wb_load
@ co_convert -w -d $(doc_dir)/en_us/orm -g $(pwre_sroot)/wbl/mcomp/src/cnv_setup.dat "$(source)"
@ co_convert -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_$(source)classes.h
@ co_convert -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_$(source)classes.hpp
@ co_convert -k -d $(doc_dir)/en_us/orm
$(doc_dir)/sv_se/orm/%_allclasses.html : ../../%.wb_load
@ echo "Generating html files for $(source) classes sv_se..."
@ co_convert -w -l sv_se -d $(doc_dir)/sv_se/orm -g $(pwre_sroot)/wbl/mcomp/src/cnv_setup.dat "$(source)"
@ co_convert -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_$(source)classes.h
@ co_convert -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_$(source)classes.hpp
@ co_convert -k -d $(doc_dir)/sv_se/orm
$(doc_dir)/en_us/%.ps : ../../%.wb_load
@ echo "Generating postscript file for $(source) classes en_us..."
......
src/wbl/mcomp/src/os_linux/hw_x86/makefile
View file @ 72283fbc
......@@ -110,12 +110,14 @@ $(doc_dir)/en_us/orm/%_allclasses.html : ../../%.wb_load
@ co_convert -w -d $(doc_dir)/en_us/orm -g $(pwre_sroot)/wbl/mcomp/src/cnv_setup.dat "$(source)"
@ co_convert -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_$(source)classes.h
@ co_convert -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_$(source)classes.hpp
@ co_convert -k -d $(doc_dir)/en_us/orm
$(doc_dir)/sv_se/orm/%_allclasses.html : ../../%.wb_load
@ echo "Generating html files for $(source) classes sv_se..."
@ co_convert -w -l sv_se -d $(doc_dir)/sv_se/orm -g $(pwre_sroot)/wbl/mcomp/src/cnv_setup.dat "$(source)"
@ co_convert -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_$(source)classes.h
@ co_convert -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_$(source)classes.hpp
@ co_convert -k -d $(doc_dir)/sv_se/orm
$(doc_dir)/en_us/%.ps : ../../%.wb_load
@ echo "Generating postscript file for $(source) classes en_us..."
......
src/wbl/pwrb/src/pwrb_c_asup.wb_load
View file @ 72283fbc
!
! Proview $Id: pwrb_c_asup.wb_load,v 1.9 2005-09-01 14:58:01 claes Exp $
! Proview $Id: pwrb_c_asup.wb_load,v 1.10 2005-11-14 16:26:19 claes Exp $
! Copyright (C) 2005 SSAB Oxelösund AB.
!
! This program is free software; you can redistribute it and/or
......@@ -301,6 +301,17 @@ SObject pwrb:Class
EndBody
EndObject
!/**
! Reference to a sound object, that defines the sound at the operator
! place when the alarm is active. If no sound object is supplied, an
! ordinary beep is used.
!*/
Object Sound $Attribute 39
Body SysBody
Attr PgmName = "Sound"
Attr TypeRef = "pwrs:Type-$AttrRef"
EndBody
EndObject
!/**
! Specifies the complete name of supervised parameter.
! Attribute is filled in by the user if the input named
! IN is left open. If the input is connected the names
......
src/wbl/pwrb/src/pwrb_c_cyclesup.wb_load
View file @ 72283fbc
!
! Proview $Id: pwrb_c_cyclesup.wb_load,v 1.6 2005-09-01 14:58:01 claes Exp $
! Proview $Id: pwrb_c_cyclesup.wb_load,v 1.7 2005-11-14 16:26:20 claes Exp $
! Copyright (C) 2005 SSAB Oxelsund AB.
!
! This program is free software; you can redistribute it and/or
......@@ -340,6 +340,17 @@ SObject pwrb:Class
EndBody
EndObject
!/**
! Reference to a sound object, that defines the sound at the operator
! place when the alarm is active. If no sound object is supplied, an
! ordinary beep is used.
!*/
Object Sound $Attribute 46
Body SysBody
Attr PgmName = "Sound"
Attr TypeRef = "pwrs:Type-$AttrRef"
EndBody
EndObject
!/**
! Attribute is filled in by the user if the input named
! IN is left open. If the input is connected the names
! are filled in by the PROVIEW/R system at compilation.
......
src/wbl/pwrb/src/pwrb_c_dsup.wb_load
View file @ 72283fbc
!
! Proview $Id: pwrb_c_dsup.wb_load,v 1.9 2005-09-01 14:58:01 claes Exp $
! Proview $Id: pwrb_c_dsup.wb_load,v 1.10 2005-11-14 16:26:20 claes Exp $
! Copyright (C) 2005 SSAB Oxelösund AB.
!
! This program is free software; you can redistribute it and/or
......@@ -303,6 +303,17 @@ SObject pwrb:Class
EndBody
EndObject
!/**
! Reference to a sound object, that defines the sound at the operator
! place when the alarm is active. If no sound object is supplied, an
! ordinary beep is used.
!*/
Object Sound $Attribute 36
Body SysBody
Attr PgmName = "Sound"
Attr TypeRef = "pwrs:Type-$AttrRef"
EndBody
EndObject
!/**
! Attribute is filled in by the user if the input named
! IN is left open. If the input is connected the names
! are filled in by the PROVIEW/R system at compilation.
......
src/wbl/pwrb/src/pwrb_c_nodelinksup.wb_load
View file @ 72283fbc
!
! Proview $Id: pwrb_c_nodelinksup.wb_load,v 1.5 2005-09-01 14:58:02 claes Exp $
! Proview $Id: pwrb_c_nodelinksup.wb_load,v 1.6 2005-11-14 16:26:20 claes Exp $
! Copyright (C) 2005 SSAB Oxelsund AB.
!
! This program is free software; you can redistribute it and/or
......@@ -295,6 +295,17 @@ SObject pwrb:Class
EndBody
EndObject
!/**
! Reference to a sound object, that defines the sound at the operator
! place when the alarm is active. If no sound object is supplied, an
! ordinary beep is used.
!*/
Object Sound $Attribute 41
Body SysBody
Attr PgmName = "Sound"
Attr TypeRef = "pwrs:Type-$AttrRef"
EndBody
EndObject
!/**
! Attribute is filled in by the server process to the
! NodeLinkSup object itself.
!*/
......
src/wbl/pwrb/src/pwrb_c_sound.wb_load 0 → 100644
View file @ 72283fbc
!
! Proview $Id: pwrb_c_sound.wb_load,v 1.1 2005-11-14 16:26:20 claes Exp $
! Copyright (C) 2005 SSAB Oxelsund AB.
!
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License as
! published by the Free Software Foundation, either version 2 of
! the License, or (at your option) any later version.
!
! This program is distributed in the hope that it will be useful
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! GNU General Public License for more details.
!
! You should have received a copy of the GNU General Public License
! along with the program, if not, write to the Free Software
! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
!
! pwrb_c_sound.wb_load -- Defines the class Sound.
!
SObject pwrb:Class
!/**
! @Version 1.0
! @Summary Defines a sound
! The Sound object defines a sound for an alarm, or for sound dynamics in
! the operator environment.
!
! The sound is specified by a souce, that can be a code word (for sinus waves) or a
! filepath to a sampled file.
!*/
Object Sound $ClassDef 438
Body SysBody
Attr Editor = pwr_eEditor_AttrEd
Attr Method = pwr_eMethod_Standard
Attr PopEditor = 1
EndBody
Object RtBody $ObjBodyDef 1
Body SysBody
Attr StructName = "Sound"
EndBody
!/**
! Optional description.
!*/
Object Description $Attribute 1
Body SysBody
Attr TypeRef = "pwrs:Type-$String80"
EndBody
EndObject
!/**
! Sound source. A codeword or a filepath.
!*/
Object Source $Attribute 2
Body SysBody
Attr TypeRef = "pwrs:Type-$String80"
EndBody
EndObject
!/**
! Sound priority.
!*/
Object Prio $Attribute 3
Body SysBody
Attr TypeRef = "pwrs:Type-$Int32"
EndBody
EndObject
!/**
! Default base tone for sine and square waves.
!*/
Object BaseTone $Attribute 4
Body SysBody
Attr TypeRef = "pwrb:Type-AudioToneEnum"
EndBody
EndObject
!/**
! Tone table.
!*/
Object ToneTable $Attribute 5
Body SysBody
Attr TypeRef = "pwrs:Type-$UInt32"
Attr Flags |= PWR_MASK_ARRAY
Attr Elements = 8
EndBody
EndObject
!/**
! Volume table.
!*/
Object VolumeTable $Attribute 6
Body SysBody
Attr TypeRef = "pwrs:Type-$Float32"
Attr Flags |= PWR_MASK_ARRAY
Attr Elements = 8
EndBody
EndObject
!/**
! Volume in percentage (0 - 100)
!*/
Object Volume $Attribute 7
Body SysBody
Attr TypeRef = "pwrs:Type-$Float32"
EndBody
EndObject
!/**
! Attack time in seconds.
!*/
Object Attack $Attribute 8
Body SysBody
Attr TypeRef = "pwrs:Type-$Float32"
EndBody
EndObject
!/**
! Timeconstant for sound decay.
!*/
Object Decay $Attribute 9
Body SysBody
Attr TypeRef = "pwrs:Type-$Float32"
EndBody
EndObject
!/**
! Sustain level in the interval 0 - 100
!*/
Object Sustain $Attribute 10
Body SysBody
Attr TypeRef = "pwrs:Type-$Float32"
EndBody
EndObject
!/**
! Release time in seconds.
!*/
Object Release $Attribute 11
Body SysBody
Attr TypeRef = "pwrs:Type-$Float32"
EndBody
EndObject
!/**
! Default length of sound in seconds.
!*/
Object Length $Attribute 12
Body SysBody
Attr TypeRef = "pwrs:Type-$Float32"
EndBody
EndObject
!/**
! Tremolo.
!*/
Object Tremolo $Attribute 13
Body SysBody
Attr TypeRef = "pwrs:Type-$Float32"
EndBody
EndObject
EndObject
Object Template Sound
Body RtBody
Attr Source = "Sine"
Attr BaseTone = 33
Attr VolumeTable[0] = 100
Attr Volume = 100
Attr Sustain = 100
Attr Length = 0.3
EndBody
EndObject
Object RtXtt $RtMenu
Object Play $MenuButton
Body SysBody
Attr ButtonName = "Play"
Attr MethodName = "Sound-Play"
Attr FilterName = "Sound-PlayFilter"
EndBody
EndObject
EndObject
EndObject
EndSObject
src/wbl/pwrb/src/pwrb_c_soundseqelem.wb_load 0 → 100644
View file @ 72283fbc
!
! Proview $Id: pwrb_c_soundseqelem.wb_load,v 1.1 2005-11-14 16:26:20 claes Exp $
! Copyright (C) 2005 SSAB Oxelsund AB.
!
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License as
! published by the Free Software Foundation, either version 2 of
! the License, or (at your option) any later version.
!
! This program is distributed in the hope that it will be useful
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! GNU General Public License for more details.
!
! You should have received a copy of the GNU General Public License
! along with the program, if not, write to the Free Software
! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
!
! pwrb_c_soundsequence.wb_load -- Defines the class SoundSequence.
!
SObject pwrb:Class
!/**
! @Version 1.0
! @Summary Defines an element sound sequence
! Definition of an element in a sound sequence.
!*/
Object SoundSeqElem $ClassDef 440
Body SysBody
Attr Editor = pwr_eEditor_AttrEd
Attr Method = pwr_eMethod_Standard
Attr PopEditor = 1
EndBody
Object RtBody $ObjBodyDef 1
Body SysBody
Attr StructName = "SoundSeqElem"
EndBody
!/**
! Element is used.
!*/
Object Used $Attribute 2
Body SysBody
Attr TypeRef = "pwrs:Type-$Boolean"
EndBody
EndObject
!/**
! Sound index.
!*/
Object SoundIdx $Attribute 3
Body SysBody
Attr TypeRef = "pwrs:Type-$UInt32"
EndBody
EndObject
!/**
! Start time.
!*/
Object StartTime $Attribute 4
Body SysBody
Attr TypeRef = "pwrs:Type-$Float32"
EndBody
EndObject
!/**
! Start time.
!*/
Object EndTime $Attribute 5
Body SysBody
Attr TypeRef = "pwrs:Type-$Float32"
EndBody
EndObject
!/**
! Element volume, right channel (1 - 100)
!*/
Object VolumeRight $Attribute 6
Body SysBody
Attr TypeRef = "pwrs:Type-$Float32"
EndBody
EndObject
!/**
! Element volume, left channel (1 - 100)
!*/
Object VolumeLeft $Attribute 7
Body SysBody
Attr TypeRef = "pwrs:Type-$Float32"
EndBody
EndObject
!/**
! Element tone.
!*/
Object Tone $Attribute 8
Body SysBody
Attr TypeRef = "pwrb:Type-AudioToneEnum"
EndBody
EndObject
EndObject
Object Template SoundSeqElem
Body RtBody
Attr VolumeRight = 80
Attr VolumeLeft = 80
Attr EndTime = 0.3
EndBody
EndObject
EndObject
EndSObject
src/wbl/pwrb/src/pwrb_c_soundsequence.wb_load 0 → 100644
View file @ 72283fbc
!
! Proview $Id: pwrb_c_soundsequence.wb_load,v 1.1 2005-11-14 16:26:20 claes Exp $
! Copyright (C) 2005 SSAB Oxelsund AB.
!
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License as
! published by the Free Software Foundation, either version 2 of
! the License, or (at your option) any later version.
!
! This program is distributed in the hope that it will be useful
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! GNU General Public License for more details.
!
! You should have received a copy of the GNU General Public License
! along with the program, if not, write to the Free Software
! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
!
! pwrb_c_soundsequence.wb_load -- Defines the class SoundSequence.
!
SObject pwrb:Class
!/**
! @Version 1.0
! @Summary Defines a sound sequense
! Definition of a sound sequence.
!*/
Object SoundSequence $ClassDef 439
Body SysBody
Attr Editor = pwr_eEditor_AttrEd
Attr Method = pwr_eMethod_Standard
Attr PopEditor = 1
EndBody
Object RtBody $ObjBodyDef 1
Body SysBody
Attr StructName = "SoundSequence"
EndBody
!/**
! Optional description.
!*/
Object Description $Attribute 1
Body SysBody
Attr TypeRef = "pwrs:Type-$String80"
EndBody
EndObject
!/**
! Reference to a sound object
!*/
Object SoundObject $Attribute 2
Body SysBody
Attr TypeRef = "pwrs:Type-$AttrRef"
Attr Flags |= PWR_MASK_ARRAY
Attr Elements = 3
EndBody
EndObject
!/**
! Sound priority.
!*/
Object Prio $Attribute 3
Body SysBody
Attr TypeRef = "pwrs:Type-$Int32"
EndBody
EndObject
!/**
! Length of sequence in seconds.
!*/
Object Length $Attribute 4
Body SysBody
Attr TypeRef = "pwrs:Type-$Float32"
EndBody
EndObject
!/**
! Echo (0 - 100).
!*/
Object Echo $Attribute 5
Body SysBody
Attr TypeRef = "pwrs:Type-$Float32"
EndBody
EndObject
!/**
! Sequence table.
!*/
Object SequenceTable $Attribute 6
Body SysBody
Attr TypeRef = "pwrb:Class-SoundSeqElem"
Attr Flags |= PWR_MASK_CLASS
Attr Flags |= PWR_MASK_ARRAY
Attr Elements = 20
EndBody
EndObject
EndObject
Object Template SoundSequence
Body RtBody
Attr Prio = 5
Attr Length = 0.6
Attr SequenceTable[0].Used = 1
Attr SequenceTable[0].VolumeRight = 80
Attr SequenceTable[0].VolumeLeft = 80
Attr SequenceTable[0].EndTime = 0.3
Attr SequenceTable[0].Tone = 28
EndBody
EndObject
Object RtXtt $RtMenu
Object Play $MenuButton
Body SysBody
Attr ButtonName = "Play"
Attr MethodName = "Sound-Play"
Attr FilterName = "Sound-PlayFilter"
EndBody
EndObject
EndObject
EndObject
EndSObject
src/wbl/pwrb/src/pwrb_td_audiotoneenum.wb_load 0 → 100644
View file @ 72283fbc
This diff is collapsed.
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