Skip to content

Commit 38a4f42

Browse files
Fixed comment alignment after tab to space conversion
1 parent 60bbd8a commit 38a4f42

File tree

3 files changed

+37
-37
lines changed

3 files changed

+37
-37
lines changed

src/lib/transport/DataSubscriber.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
// 03/26/2012 - Stephen C. Wills
2020
// Generated original version of source code.
2121
// 03/22/2018 - J. Ritchie Carroll
22-
// Updated DataSubscriber callback function signatures to always include instance reference.
22+
// Updated DataSubscriber callback function signatures to always include instance reference.
2323
//
2424
//******************************************************************************************************
2525

src/lib/transport/SubscriberInstance.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@ namespace transport
151151
//
152152
// - Signal ID list -
153153
// subscriber.SetFilterExpression("7aaf0a8f-3a4f-4c43-ab43-ed9d1e64a255;"
154-
// "93673c68-d59d-4926-b7e9-e7678f9f66b4;"
155-
// "65ac9cf6-ae33-4ece-91b6-bb79343855d5;"
156-
// "3647f729-d0ed-4f79-85ad-dae2149cd432;"
157-
// "069c5e29-f78a-46f6-9dff-c92cb4f69371;"
158-
// "25355a7b-2a9d-4ef2-99ba-4dd791461379");
154+
// "93673c68-d59d-4926-b7e9-e7678f9f66b4;"
155+
// "65ac9cf6-ae33-4ece-91b6-bb79343855d5;"
156+
// "3647f729-d0ed-4f79-85ad-dae2149cd432;"
157+
// "069c5e29-f78a-46f6-9dff-c92cb4f69371;"
158+
// "25355a7b-2a9d-4ef2-99ba-4dd791461379");
159159
//
160160
// - Measurement key list pattern -
161161
// subscriber.SetFilterExpression("PPA:1;PPA:2;PPA:3;PPA:4;PPA:5;PPA:6;PPA:7;PPA:8;PPA:9;PPA:10;PPA:11;PPA:12;PPA:13;PPA:14");

src/lib/transport/TransportTypes.h

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,15 @@ namespace transport
128128
Angle, // Phase angle
129129
Magnitude, // Phase magnitude
130130
Frequency, // Line frequency
131-
DfDt, // Frequency delta over time (dF/dt)
132-
Status, // Status flags
133-
Digital, // Digital value
134-
Analog, // Analog value
135-
Calculation, // Calculated value
131+
DfDt, // Frequency delta over time (dF/dt)
132+
Status, // Status flags
133+
Digital, // Digital value
134+
Analog, // Analog value
135+
Calculation, // Calculated value
136136
Statistic, // Statistical value
137137
Alarm, // Alarm value
138-
Quality, // Quality flags
139-
Unknown // Undetermined signal type
138+
Quality, // Quality flags
139+
Unknown // Undetermined signal type
140140
};
141141

142142
extern const char* SignalKindDescription[];
@@ -180,54 +180,54 @@ namespace transport
180180

181181
struct MeasurementMetadata
182182
{
183-
std::string DeviceAcronym; // Associated (parent) device for measurement (key to DeviceMetadata.Acronym)
184-
std::string ID; // Measurement key string, format: "Source:ID" (if useful)
185-
Guid SignalID { Empty::Guid }; // Unique UUID of this individual measurement (lookup key!)
186-
std::string PointTag; // Well formatted tag name for historians, e.g., OSI-PI, etc.
187-
SignalReference Reference; // Parsed signal reference structure
183+
std::string DeviceAcronym; // Associated (parent) device for measurement (key to DeviceMetadata.Acronym)
184+
std::string ID; // Measurement key string, format: "Source:ID" (if useful)
185+
Guid SignalID { Empty::Guid }; // Unique UUID of this individual measurement (lookup key!)
186+
std::string PointTag; // Well formatted tag name for historians, e.g., OSI-PI, etc.
187+
SignalReference Reference; // Parsed signal reference structure
188188
uint16_t PhasorSourceIndex {}; // Measurement phasor index, if measurement represents a "Phasor"
189189
std::string Description; // Detailed measurement description (free-form)
190-
datetime_t UpdatedOn; // Time of last meta-data update
190+
datetime_t UpdatedOn; // Time of last meta-data update
191191
};
192192

193193
typedef SharedPtr<MeasurementMetadata> MeasurementMetadataPtr;
194194

195195
struct PhasorMetadata
196196
{
197197
std::string DeviceAcronym; // Associated (parent) device for phasor (key to DeviceMetadata.Acronym)
198-
std::string Label; // Channel name for "phasor" (covers two measurements)
199-
std::string Type; // Phasor type, i.e., "V" for voltage or "I" for current
200-
std::string Phase; // Phasor phase, one of, "+", "-", "0", "A", "B" or "C"
198+
std::string Label; // Channel name for "phasor" (covers two measurements)
199+
std::string Type; // Phasor type, i.e., "V" for voltage or "I" for current
200+
std::string Phase; // Phasor phase, one of, "+", "-", "0", "A", "B" or "C"
201201
uint16_t SourceIndex {}; // Phasor ordered index, uses 1-based indexing (key to MeasurementMetadata.PhasorSourceIndex)
202-
datetime_t UpdatedOn; // Time of last meta-data update
202+
datetime_t UpdatedOn; // Time of last meta-data update
203203
};
204204

205205
typedef SharedPtr<PhasorMetadata> PhasorMetadataPtr;
206206

207207
struct PhasorReference
208208
{
209-
PhasorMetadataPtr Phasor; // Phasor metadata, includes phasor type, i.e., voltage or current
210-
MeasurementMetadataPtr Angle; // Angle measurement metadata for phasor
211-
MeasurementMetadataPtr Magnitude; // Magnitude measurement metadata for phasor
209+
PhasorMetadataPtr Phasor; // Phasor metadata, includes phasor type, i.e., voltage or current
210+
MeasurementMetadataPtr Angle; // Angle measurement metadata for phasor
211+
MeasurementMetadataPtr Magnitude; // Magnitude measurement metadata for phasor
212212
};
213213

214214
typedef SharedPtr<PhasorReference> PhasorReferencePtr;
215215

216216
struct DeviceMetadata
217217
{
218-
std::string Acronym; // Alpha-numeric device acronym, e.g., PMU/station name (all-caps - no spaces)
219-
std::string Name; // User-defined device name / description (free-form)
218+
std::string Acronym; // Alpha-numeric device acronym, e.g., PMU/station name (all-caps - no spaces)
219+
std::string Name; // User-defined device name / description (free-form)
220220
Guid UniqueID { Empty::Guid }; // Device unique UUID (used for C37.118 v3 config frame)
221-
uint16_t AccessID {}; // ID code used for device connection / reference
222-
std::string ParentAcronym; // Original PDC name (if useful / not assigned for directly connected devices)
223-
std::string ProtocolName; // Original protocol name (if useful)
221+
uint16_t AccessID {}; // ID code used for device connection / reference
222+
std::string ParentAcronym; // Original PDC name (if useful / not assigned for directly connected devices)
223+
std::string ProtocolName; // Original protocol name (if useful)
224224
uint16_t FramesPerSecond {}; // Device reporting rate, e.g., 30 fps
225-
std::string CompanyAcronym; // Original device company name (if useful)
226-
std::string VendorAcronym; // Original device vendor name (if useful / provided)
225+
std::string CompanyAcronym; // Original device company name (if useful)
226+
std::string VendorAcronym; // Original device vendor name (if useful / provided)
227227
std::string VendorDeviceName; // Original vendor device name, e.g., PMU brand (if useful / provided)
228-
float64_t Longitude {}; // Device longitude (if reported)
229-
float64_t Latitude {}; // Device latitude (if reported)
230-
datetime_t UpdatedOn; // Time of last meta-data update
228+
float64_t Longitude {}; // Device longitude (if reported)
229+
float64_t Latitude {}; // Device latitude (if reported)
230+
datetime_t UpdatedOn; // Time of last meta-data update
231231

232232
// Associated measurement and phasor meta-data
233233
std::vector<MeasurementMetadataPtr> Measurements; // DataPublisher does not need to assign
@@ -305,7 +305,7 @@ namespace transport
305305
// DateTime SOC;
306306
// int milliseconds;
307307
// Measurement StatusFlags;
308-
// Measurement QualityFlags;
308+
// Measurement QualityFlags;
309309
// Measurement Frequency;
310310
// vector<Phasor> Phasors;
311311
// vector<Measurement> Analogs;

0 commit comments

Comments
 (0)