Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
977ef31b
Commit
977ef31b
authored
Mar 13, 2011
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ещё подправил конструкторы у сообщенй (оптимизация).
parent
38da890e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
MessageType.h
include/MessageType.h
+4
-4
MessageType.cc
src/Various/MessageType.cc
+4
-4
No files found.
include/MessageType.h
View file @
977ef31b
...
...
@@ -127,7 +127,7 @@ namespace UniSetTypes
UniversalIO
::
IOTypes
st
=
UniversalIO
::
DigitalInput
,
ObjectId
consumer
=
UniSetTypes
::
DefaultObjectId
);
SensorMessage
(
ObjectId
id
,
long
value
,
IOController_i
::
CalibrateInfo
&
ci
,
SensorMessage
(
ObjectId
id
,
long
value
,
const
IOController_i
::
CalibrateInfo
&
ci
,
Priority
priority
=
Message
::
Medium
,
UniversalIO
::
IOTypes
st
=
UniversalIO
::
AnalogInput
,
ObjectId
consumer
=
UniSetTypes
::
DefaultObjectId
);
...
...
@@ -181,7 +181,7 @@ namespace UniSetTypes
Warning
};
InfoMessage
();
InfoMessage
(
ObjectId
id
,
std
::
string
str
,
ObjectId
node
=
conf
->
getLocalNode
(),
InfoMessage
(
ObjectId
id
,
const
std
::
string
str
,
ObjectId
node
=
conf
->
getLocalNode
(),
Character
ch
=
InfoMessage
::
Normal
,
Priority
priority
=
Message
::
Medium
,
ObjectId
consumer
=
UniSetTypes
::
DefaultObjectId
);
...
...
@@ -231,11 +231,11 @@ namespace UniSetTypes
};
AlarmMessage
();
AlarmMessage
(
ObjectId
id
,
std
::
string
str
,
ObjectId
node
=
conf
->
getLocalNode
(),
AlarmMessage
(
ObjectId
id
,
const
std
::
string
str
,
ObjectId
node
=
conf
->
getLocalNode
(),
Character
ch
=
AlarmMessage
::
Alarm
,
Priority
prior
=
Message
::
Medium
,
ObjectId
cons
=
UniSetTypes
::
DefaultObjectId
);
AlarmMessage
(
ObjectId
id
,
std
::
string
str
,
MessageCode
ccode
,
AlarmMessage
(
ObjectId
id
,
const
std
::
string
str
,
MessageCode
ccode
,
ObjectId
node
=
conf
->
getLocalNode
(),
Character
ch
=
AlarmMessage
::
Alarm
,
Priority
prior
=
Message
::
Medium
,
ObjectId
cons
=
UniSetTypes
::
DefaultObjectId
);
...
...
src/Various/MessageType.cc
View file @
977ef31b
...
...
@@ -116,7 +116,7 @@ tid(UniSetTypes::DefaultThresholdId)
ci
.
precision
=
0
;
}
SensorMessage
::
SensorMessage
(
ObjectId
id
,
long
value
,
IOController_i
::
CalibrateInfo
&
ci
,
SensorMessage
::
SensorMessage
(
ObjectId
id
,
long
value
,
const
IOController_i
::
CalibrateInfo
&
ci
,
Priority
priority
,
UniversalIO
::
IOTypes
st
,
ObjectId
consumer
)
:
id
(
id
),
...
...
@@ -172,7 +172,7 @@ route(false)
{
type
=
Message
::
Info
;
}
InfoMessage
::
InfoMessage
(
ObjectId
id
,
string
str
,
ObjectId
node
,
Character
ch
,
InfoMessage
::
InfoMessage
(
ObjectId
id
,
const
string
str
,
ObjectId
node
,
Character
ch
,
Priority
priority
,
ObjectId
consumer
)
:
id
(
id
),
infocode
(
UniSetTypes
::
DefaultMessageCode
),
...
...
@@ -219,7 +219,7 @@ route(false)
type
=
Message
::
Alarm
;
}
AlarmMessage
::
AlarmMessage
(
ObjectId
id
,
string
str
,
ObjectId
node
,
AlarmMessage
::
AlarmMessage
(
ObjectId
id
,
const
string
str
,
ObjectId
node
,
Character
ch
,
Priority
prior
,
ObjectId
cons
)
:
id
(
id
),
alarmcode
(
UniSetTypes
::
DefaultMessageCode
),
...
...
@@ -236,7 +236,7 @@ route(false)
this
->
consumer
=
cons
;
}
AlarmMessage
::
AlarmMessage
(
ObjectId
id
,
string
str
,
MessageCode
ccode
,
AlarmMessage
::
AlarmMessage
(
ObjectId
id
,
const
string
str
,
MessageCode
ccode
,
ObjectId
node
,
Character
ch
,
Priority
prior
,
ObjectId
cons
)
:
id
(
id
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment