File tree Expand file tree Collapse file tree 3 files changed +9
-9
lines changed Expand file tree Collapse file tree 3 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -66,7 +66,7 @@ export default class Export104 extends LitElement {
6666 if ( signal104Data . isMonitorSignal ) {
6767 line . push ( signal104Data . ioa ?? '' , '' ) ;
6868 } else {
69- line . push ( '' , signal104Data . ioa ?? '' ) ;
69+ line . push ( signal104Data . ioa ?? '' , signal104Data . ioa ?? '' ) ;
7070 }
7171
7272 lines . push ( line ) ;
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ interface ExtractSignal104Result {
1717
1818enum SignalType {
1919 Monitor ,
20- Control ,
20+ MonitorAndControl ,
2121 Unknown
2222}
2323
@@ -88,7 +88,7 @@ function extractSignal104Data(addressElement: Element, doc: XMLDocument): Extrac
8888
8989 const substationName = parentSubstation . getAttribute ( 'name' ) ;
9090
91- const name = `${ substationName } ${ voltageLevelName } ${ bayName } ${ doiDesc } ` ;
91+ const name = `${ substationName } ${ voltageLevelName } ${ bayName } ${ doiDesc } ` ;
9292
9393 return {
9494 signal : {
@@ -112,7 +112,7 @@ function getSignalType(tiString: string): SignalType {
112112 if ( ( ti >= 1 && ti <= 21 ) || ( ti >= 30 && ti <= 40 ) ) {
113113 return SignalType . Monitor ;
114114 } else if ( ( ti >= 45 && ti <= 51 ) || ( ti >= 58 && ti <= 64 ) ) {
115- return SignalType . Control ;
115+ return SignalType . MonitorAndControl ;
116116 } else {
117117 return SignalType . Unknown ;
118118 }
Original file line number Diff line number Diff line change @@ -16,35 +16,35 @@ describe('Export104 foundation', () => {
1616
1717 const expectedSignals = [
1818 {
19- name : 'S1F2V105Control1 ' ,
19+ name : 'S1 F2 V105 Control1 ' ,
2020 signalNumber : '3001' ,
2121 isMonitorSignal : false ,
2222 ioa : '1053001' ,
2323 ti : '50'
2424 } ,
2525 {
26- name : 'S1F2V105Control2 ' ,
26+ name : 'S1 F2 V105 Control2 ' ,
2727 signalNumber : '3002' ,
2828 isMonitorSignal : false ,
2929 ioa : '1053002' ,
3030 ti : '64'
3131 } ,
3232 {
33- name : 'S1F1V104Behavior ' ,
33+ name : 'S1 F1 V104 Behavior ' ,
3434 signalNumber : '2001' ,
3535 isMonitorSignal : true ,
3636 ioa : '1042001' ,
3737 ti : '35'
3838 } ,
3939 {
40- name : 'S1F1V104Behavior ' ,
40+ name : 'S1 F1 V104 Behavior ' ,
4141 signalNumber : '2002' ,
4242 isMonitorSignal : true ,
4343 ioa : '1042002' ,
4444 ti : '35'
4545 } ,
4646 {
47- name : 'S1F1V103Behavior ' ,
47+ name : 'S1 F1 V103 Behavior ' ,
4848 signalNumber : '1003' ,
4949 isMonitorSignal : true ,
5050 ioa : '1031003' ,
You can’t perform that action at this time.
0 commit comments