Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

major changes to data creation and connection #229

Merged
merged 30 commits into from
Jan 9, 2022
Merged

major changes to data creation and connection #229

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
c1b725a
reworking Connection
julorenz Dec 23, 2021
941765d
linting
julorenz Dec 23, 2021
d0f51dc
colocating test ressources
julorenz Dec 25, 2021
1a0179f
linting
julorenz Dec 29, 2021
3f2e7a9
fixing tests ModularPlantManager
julorenz Dec 29, 2021
1554a03
updating files
julorenz Jan 2, 2022
93b4f9e
fix testing fix
julorenz Jan 4, 2022
19225b9
fixing issues and doku
julorenz Jan 4, 2022
e260a8e
refactoring feedbackMonitoringDA
julorenz Jan 4, 2022
85b768e
refactoring interlockDA
julorenz Jan 4, 2022
9946748
refactoring limitMonitoringDA
julorenz Jan 4, 2022
907d0be
refactoring OpModeDA
julorenz Jan 4, 2022
2331052
refactoring OSLevelDA
julorenz Jan 4, 2022
c26ef74
refactoring ResetDA
julorenz Jan 4, 2022
f5fea74
refactoring ScaleSettingsDA
julorenz Jan 4, 2022
d417bf2
refactoring ServiceOpModeDA
julorenz Jan 4, 2022
8e6c6d8
refactoring ServiceSourceModeDA
julorenz Jan 4, 2022
4743d87
refactoring SourceModeDA
julorenz Jan 4, 2022
862b6ce
refactoring UnitSettingsDA
julorenz Jan 4, 2022
f342730
refactoring valueLimitationDA
julorenz Jan 4, 2022
01ddd90
adding Handshake sequence
julorenz Jan 4, 2022
76c90f4
fixing rename of unitController
julorenz Jan 4, 2022
7dc1325
final adjustment to baseFunctions
julorenz Jan 4, 2022
edfe230
refactoring pimad parts
julorenz Jan 4, 2022
00f834d
updating files and tests
julorenz Jan 8, 2022
6fb21a7
linting
julorenz Jan 8, 2022
60fe06b
updating index.ts
julorenz Jan 8, 2022
e4511df
updating packages regarding ts version and linting
julorenz Jan 8, 2022
c07d854
updating api
julorenz Jan 9, 2022
b70dff1
Merge branch 'coreUpdate' into update/opcuaConnection
julorenz Jan 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactoring ScaleSettingsDA
  • Loading branch information
@julorenz
julorenz committed Jan 4, 2022
commit f5fea7405e4ea0eea8bbb4a182b4ad120dea62d5
2 changes: 1 addition & 1 deletion src/modularPlantManager/pea/dataAssembly/_extensions/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export * from './limitMonitoring/LimitMonitoring';
export * from './opMode/OpMode';
export * from './osLevel/OSLevel';
export * from './reset/Reset';
export * from './scaleSettingsDA/ScaleSettings';
export * from './scaleSettings/ScaleSettings';
export * from './sourceModeDA/SourceModeController';
export * from './unitDA/UnitSettings';
export * from './valueLimitationDA/ValueLimitation';
Expand Down
10 changes: 5 additions & 5 deletions ...eSettingsDA/ScaleSettingDA.mockup.spec.ts → ...scaleSettings/ScaleSetting.mockup.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import * as chai from 'chai';
import * as chaiAsPromised from 'chai-as-promised';
import {DataType} from 'node-opcua';
import {MockupServer} from '../../../../_utils';
import {ScaleSettingDAMockup} from './ScaleSettingDA.mockup';
import {ScaleSettingMockup} from './ScaleSetting.mockup';

chai.use(chaiAsPromised);
const expect = chai.expect;
Expand All @@ -41,25 +41,25 @@ describe('ScaleSettingDAMockup', () => {
});

it('should create ScaleSettingDAMockup, Double', async () => {
const mockup= new ScaleSettingDAMockup(mockupServer.nameSpace,
const mockup= new ScaleSettingMockup(mockupServer.nameSpace,
mockupServer.rootObject, 'Variable', DataType.Double);
expect(mockup).to.not.be.undefined;
});
it('should create ScaleSettingDAMockup', async () => {
const mockup= new ScaleSettingDAMockup(mockupServer.nameSpace,
const mockup= new ScaleSettingMockup(mockupServer.nameSpace,
mockupServer.rootObject, 'Variable', DataType.Int32);
expect(mockup).to.not.be.undefined;
});
it('getScaleSettingDAMockupReferenceJSON(), Double', () => {
const mockup = new ScaleSettingDAMockup(mockupServer.nameSpace,
const mockup = new ScaleSettingMockup(mockupServer.nameSpace,
mockupServer.rootObject, 'Variable', DataType.Double);
const json = mockup.getScaleSettingDAInstanceMockupJSON() as {VSclMin: {} ; VSclMax: {}};
expect(Object.keys(json).length).to.equal(2);
expect(json.VSclMax).to.not.be.undefined;
expect(json.VSclMin).to.not.be.undefined;
});
it('getScaleSettingDAMockupReferenceJSON()', () => {
const mockup = new ScaleSettingDAMockup(mockupServer.nameSpace,
const mockup = new ScaleSettingMockup(mockupServer.nameSpace,
mockupServer.rootObject, 'Variable', DataType.Int32);
const json = mockup.getScaleSettingDAInstanceMockupJSON() as {VSclMin: {} ; VSclMax: {}};
expect(Object.keys(json).length).to.equal(2);
Expand Down
2 changes: 1 addition & 1 deletion .../scaleSettingsDA/ScaleSettingDA.mockup.ts → ...ions/scaleSettings/ScaleSetting.mockup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export function getScaleSettingDAMockupReferenceJSON<T extends 'Float' | 'Int32'
});
}

export class ScaleSettingDAMockup<T extends DataType.Double | DataType.Int32> {
export class ScaleSettingMockup<T extends DataType.Double | DataType.Int32> {
public vSclMin = 0;
public vSclMax = 0;
private readonly type: DataType;
Expand Down
4 changes: 2 additions & 2 deletions ...nsions/scaleSettingsDA/ScaleSettings.puml → ...tensions/scaleSettings/ScaleSettings.puml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class ScaleSettings{
}

ScaleSettingsRuntime <-- ScaleSettings
ScaleSettingsDASpec --> ScaleSettings : <<uses>>
ScaleSettingsDASpec --> ScaleSettingsDAMockup : <<uses>>
ScaleSettingsSpec --> ScaleSettings : <<uses>>
ScaleSettingsSpec --> ScaleSettingsMockup : <<uses>>

@enduml
4 changes: 2 additions & 2 deletions ...ons/scaleSettingsDA/ScaleSettings.spec.ts → ...sions/scaleSettings/ScaleSettings.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import {DataAssemblyController} from '../../DataAssemblyController';
import {ScaleSettings} from './ScaleSettings';
import {MockupServer} from '../../../../_utils';
import {DataType} from 'node-opcua';
import {ScaleSettingDAMockup} from './ScaleSettingDA.mockup';
import {ScaleSettingMockup} from './ScaleSetting.mockup';

chai.use(chaiAsPromised);
const expect = chai.expect;
Expand Down Expand Up @@ -64,7 +64,7 @@ describe('ScaleSettings', () => {
this.timeout(4000);
mockupServer = new MockupServer();
await mockupServer.initialize();
new ScaleSettingDAMockup(mockupServer.nameSpace, mockupServer.rootObject, 'Variable', DataType.Double);
new ScaleSettingMockup(mockupServer.nameSpace, mockupServer.rootObject, 'Variable', DataType.Double);
await mockupServer.start();
connection = new OpcUaConnection();
connection.initialize({endpoint: mockupServer.endpoint});
Expand Down
0 ...tensions/scaleSettingsDA/ScaleSettings.ts → ...extensions/scaleSettings/ScaleSettings.ts
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions src/modularPlantManager/pea/dataAssembly/indicatorElement/AnaView/AnaMon/AnaMon.mockup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import {DataType, Namespace, UAObject, Variant} from 'node-opcua';
import {getWQCDAMockupReferenceJSON} from '../../../_extensions/wqcDA/WQCDA.mockup';
import {
getScaleSettingDAMockupReferenceJSON,
ScaleSettingDAMockup
} from '../../../_extensions/scaleSettingsDA/ScaleSettingDA.mockup';
ScaleSettingMockup
} from '../../../_extensions/scaleSettings/ScaleSetting.mockup';
import {getUnitDAMockupReferenceJSON, UnitDAMockup} from '../../../_extensions/unitDA/UnitDA.mockup';
import {getOSLevelMockupReferenceJSON, OSLevelMockup} from '../../../_extensions/osLevel/OSLevel.mockup';
import {
Expand Down Expand Up @@ -59,7 +59,7 @@ export function getAnaMonMockupReferenceJSON(
export class AnaMonMockup extends IndicatorElementMockup{

protected v = 0;
public scaleSettings: ScaleSettingDAMockup<DataType.Double>;
public scaleSettings: ScaleSettingMockup<DataType.Double>;
public unit: UnitDAMockup;
public osLevel: OSLevelMockup;
public limitMonitoring: LimitMonitoringMockup<DataType.Double | DataType.Int32>;
Expand All @@ -68,7 +68,7 @@ export class AnaMonMockup extends IndicatorElementMockup{

super(namespace, rootNode, variableName);

this.scaleSettings = new ScaleSettingDAMockup<DataType.Double>(namespace, this.mockupNode, this.name, DataType.Double);
this.scaleSettings = new ScaleSettingMockup<DataType.Double>(namespace, this.mockupNode, this.name, DataType.Double);
this.unit = new UnitDAMockup(namespace, this.mockupNode, this.name);
this.osLevel = new OSLevelMockup(namespace, this.mockupNode, this.name);
this.limitMonitoring = new LimitMonitoringMockup(namespace, this.mockupNode, this.name, DataType.Double);
Expand Down
8 changes: 4 additions & 4 deletions src/modularPlantManager/pea/dataAssembly/indicatorElement/AnaView/AnaView.mockup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import {DataType, Namespace, UAObject, Variant} from 'node-opcua';
import {getWQCDAMockupReferenceJSON, WQCDAMockup} from '../../_extensions/wqcDA/WQCDA.mockup';
import {
getScaleSettingDAMockupReferenceJSON,
ScaleSettingDAMockup
} from '../../_extensions/scaleSettingsDA/ScaleSettingDA.mockup';
ScaleSettingMockup
} from '../../_extensions/scaleSettings/ScaleSetting.mockup';
import {getUnitDAMockupReferenceJSON, UnitDAMockup} from '../../_extensions/unitDA/UnitDA.mockup';

export function getAnaViewMockupReferenceJSON(
Expand All @@ -53,7 +53,7 @@ export class AnaViewMockup {
public readonly name: string;
protected v = 0;
public wqc: WQCDAMockup;
public scaleSettings: ScaleSettingDAMockup<DataType.Double>;
public scaleSettings: ScaleSettingMockup<DataType.Double>;
public unit: UnitDAMockup;
protected mockupNode: UAObject;

Expand All @@ -65,7 +65,7 @@ export class AnaViewMockup {
browseName: variableName
});
this.wqc = new WQCDAMockup(namespace, this.mockupNode, this.name);
this.scaleSettings = new ScaleSettingDAMockup<DataType.Double>(namespace, this.mockupNode, this.name, DataType.Double);
this.scaleSettings = new ScaleSettingMockup<DataType.Double>(namespace, this.mockupNode, this.name, DataType.Double);
this.unit = new UnitDAMockup(namespace, this.mockupNode, this.name);
if(removeVariable == undefined || removeVariable){
namespace.addVariable({
Expand Down
8 changes: 4 additions & 4 deletions src/modularPlantManager/pea/dataAssembly/indicatorElement/DIntView/DIntMon/DIntMon.mockup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import {DataType, Namespace, UAObject, Variant} from 'node-opcua';
import {getWQCDAMockupReferenceJSON, WQCDAMockup} from '../../../_extensions/wqcDA/WQCDA.mockup';
import {
getScaleSettingDAMockupReferenceJSON,
ScaleSettingDAMockup
} from '../../../_extensions/scaleSettingsDA/ScaleSettingDA.mockup';
ScaleSettingMockup
} from '../../../_extensions/scaleSettings/ScaleSetting.mockup';
import {getUnitDAMockupReferenceJSON, UnitDAMockup} from '../../../_extensions/unitDA/UnitDA.mockup';
import {getOSLevelMockupReferenceJSON, OSLevelMockup} from '../../../_extensions/osLevel/OSLevel.mockup';
import {
Expand Down Expand Up @@ -60,7 +60,7 @@ export class DIntMonMockup {
public readonly name: string;
protected v = 0;
public wqc: WQCDAMockup;
public scaleSettings: ScaleSettingDAMockup<DataType.Int32>;
public scaleSettings: ScaleSettingMockup<DataType.Int32>;
public unit: UnitDAMockup;
public osLevel: OSLevelMockup;
public limitMonitoring: LimitMonitoringMockup<DataType.Double | DataType.Int32>;
Expand All @@ -75,7 +75,7 @@ export class DIntMonMockup {
browseName: variableName
});
this.wqc = new WQCDAMockup(namespace, this.mockupNode, this.name);
this.scaleSettings = new ScaleSettingDAMockup<DataType.Int32>(namespace, this.mockupNode, this.name, DataType.Int32);
this.scaleSettings = new ScaleSettingMockup<DataType.Int32>(namespace, this.mockupNode, this.name, DataType.Int32);
this.unit = new UnitDAMockup(namespace, this.mockupNode, this.name);
this.osLevel = new OSLevelMockup(namespace, this.mockupNode, this.name);
this.limitMonitoring = new LimitMonitoringMockup(namespace, this.mockupNode, this.name, DataType.Int32);
Expand Down
8 changes: 4 additions & 4 deletions src/modularPlantManager/pea/dataAssembly/indicatorElement/DIntView/DIntView.mockup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import {DataType, Namespace, UAObject, Variant} from 'node-opcua';
import {getWQCDAMockupReferenceJSON, WQCDAMockup} from '../../_extensions/wqcDA/WQCDA.mockup';
import {
getScaleSettingDAMockupReferenceJSON,
ScaleSettingDAMockup
} from '../../_extensions/scaleSettingsDA/ScaleSettingDA.mockup';
ScaleSettingMockup
} from '../../_extensions/scaleSettings/ScaleSetting.mockup';
import {getUnitDAMockupReferenceJSON, UnitDAMockup} from '../../_extensions/unitDA/UnitDA.mockup';

export function getDIntViewMockupReferenceJSON(
Expand All @@ -53,7 +53,7 @@ export class DIntViewMockup {
public readonly name: string;
protected v = 0;
public wqc: WQCDAMockup;
public scaleSettings: ScaleSettingDAMockup<DataType.Int32>;
public scaleSettings: ScaleSettingMockup<DataType.Int32>;
public unit: UnitDAMockup;
protected mockupNode: UAObject;

Expand All @@ -66,7 +66,7 @@ export class DIntViewMockup {
browseName: variableName
});
this.wqc = new WQCDAMockup(namespace, this.mockupNode, this.name);
this.scaleSettings = new ScaleSettingDAMockup<DataType.Int32>(namespace, this.mockupNode, this.name, DataType.Int32);
this.scaleSettings = new ScaleSettingMockup<DataType.Int32>(namespace, this.mockupNode, this.name, DataType.Int32);
this.unit = new UnitDAMockup(namespace, this.mockupNode, this.name);

namespace.addVariable({
Expand Down
6 changes: 3 additions & 3 deletions ...ea/dataAssembly/inputElement/processValueIn/AnaProcessValueIn/AnaProcessValueIn.mockup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/

import {DataType, Namespace, StatusCodes, UAObject, Variant} from 'node-opcua';
import {getScaleSettingDAMockupReferenceJSON, ScaleSettingDAMockup} from '../../../_extensions/scaleSettingsDA/ScaleSettingDA.mockup';
import {getScaleSettingDAMockupReferenceJSON, ScaleSettingMockup} from '../../../_extensions/scaleSettings/ScaleSetting.mockup';
import {getUnitDAMockupReferenceJSON, UnitDAMockup} from '../../../_extensions/unitDA/UnitDA.mockup';
import {getInputElementMockupReferenceJSON, InputElementMockup} from '../../InputElement.mockup';

Expand All @@ -46,14 +46,14 @@ export function getAnaProcessValueInMockupReferenceJSON(
}

export class AnaProcessValueInMockup extends InputElementMockup{
public scaleSettings: ScaleSettingDAMockup<DataType.Double>;
public scaleSettings: ScaleSettingMockup<DataType.Double>;
public unit: UnitDAMockup;
public vExt = 0;

constructor(namespace: Namespace, rootNode: UAObject, variableName: string) {
super(namespace, rootNode, variableName);

this.scaleSettings = new ScaleSettingDAMockup<DataType.Double>(namespace, this.mockupNode, this.name, DataType.Double);
this.scaleSettings = new ScaleSettingMockup<DataType.Double>(namespace, this.mockupNode, this.name, DataType.Double);
this.unit = new UnitDAMockup(namespace, this.mockupNode, this.name);

namespace.addVariable({
Expand Down
6 changes: 3 additions & 3 deletions .../dataAssembly/inputElement/processValueIn/DIntProcessValueIn/DIntProcessValueIn.mockup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/

import {DataType, Namespace, StatusCodes, UAObject, Variant} from 'node-opcua';
import {getScaleSettingDAMockupReferenceJSON, ScaleSettingDAMockup} from '../../../_extensions/scaleSettingsDA/ScaleSettingDA.mockup';
import {getScaleSettingDAMockupReferenceJSON, ScaleSettingMockup} from '../../../_extensions/scaleSettings/ScaleSetting.mockup';
import {getUnitDAMockupReferenceJSON, UnitDAMockup} from '../../../_extensions/unitDA/UnitDA.mockup';
import {getInputElementMockupReferenceJSON, InputElementMockup} from '../../InputElement.mockup';

Expand All @@ -47,13 +47,13 @@ export function getDIntProcessValueInMockupReferenceJSON(

export class DIntProcessValueInMockup extends InputElementMockup{

public scaleSettings: ScaleSettingDAMockup<DataType.Int32>;
public scaleSettings: ScaleSettingMockup<DataType.Int32>;
public unit: UnitDAMockup;
public vExt = 0;

constructor(namespace: Namespace, rootNode: UAObject, variableName: string) {
super(namespace, rootNode, variableName);
this.scaleSettings = new ScaleSettingDAMockup<DataType.Int32>(namespace, this.mockupNode, this.name, DataType.Int32);
this.scaleSettings = new ScaleSettingMockup<DataType.Int32>(namespace, this.mockupNode, this.name, DataType.Int32);
this.unit = new UnitDAMockup(namespace, this.mockupNode, this.name);

namespace.addVariable({
Expand Down
8 changes: 4 additions & 4 deletions src/modularPlantManager/pea/dataAssembly/operationElement/man/anaMan/AnaMan.mockup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import {getOSLevelMockupReferenceJSON, OSLevelMockup} from '../../../_extensions
import {getUnitDAMockupReferenceJSON, UnitDAMockup} from '../../../_extensions/unitDA/UnitDA.mockup';
import {
getScaleSettingDAMockupReferenceJSON,
ScaleSettingDAMockup
} from '../../../_extensions/scaleSettingsDA/ScaleSettingDA.mockup';
ScaleSettingMockup
} from '../../../_extensions/scaleSettings/ScaleSetting.mockup';
import {
getValueLimitationDAMockupReferenceJSON,
ValueLimitationDAMockup
Expand Down Expand Up @@ -81,7 +81,7 @@ export class AnaManMockup {
protected vFbk = 0;

public readonly osLevel: OSLevelMockup;
public readonly scaleSettings: ScaleSettingDAMockup<DataType.Double>;
public readonly scaleSettings: ScaleSettingMockup<DataType.Double>;
public readonly valueLimitation: ValueLimitationDAMockup<DataType.Double>;
public readonly unit: UnitDAMockup;
protected interval: Timeout | undefined;
Expand All @@ -97,7 +97,7 @@ export class AnaManMockup {
});

this.osLevel = new OSLevelMockup(namespace, this.mockupNode, this.name);
this.scaleSettings = new ScaleSettingDAMockup(namespace, this.mockupNode, this.name, DataType.Double);
this.scaleSettings = new ScaleSettingMockup(namespace, this.mockupNode, this.name, DataType.Double);
this.valueLimitation = new ValueLimitationDAMockup(namespace, this.mockupNode, this.name,DataType.Double);
this.unit = new UnitDAMockup(namespace, this.mockupNode, this.name);
namespace.addVariable({
Expand Down
8 changes: 4 additions & 4 deletions src/modularPlantManager/pea/dataAssembly/operationElement/man/dintMan/DIntMan.mockup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import {getOSLevelMockupReferenceJSON, OSLevelMockup} from '../../../_extensions
import {getUnitDAMockupReferenceJSON, UnitDAMockup} from '../../../_extensions/unitDA/UnitDA.mockup';
import {
getScaleSettingDAMockupReferenceJSON,
ScaleSettingDAMockup
} from '../../../_extensions/scaleSettingsDA/ScaleSettingDA.mockup';
ScaleSettingMockup
} from '../../../_extensions/scaleSettings/ScaleSetting.mockup';
import {
getValueLimitationDAMockupReferenceJSON,
ValueLimitationDAMockup
Expand Down Expand Up @@ -80,7 +80,7 @@ export class DIntManMockup {
protected vFbk = 0;

public readonly osLevel: OSLevelMockup;
public readonly scaleSettings: ScaleSettingDAMockup<DataType.Int32>;
public readonly scaleSettings: ScaleSettingMockup<DataType.Int32>;
public readonly valueLimitation: ValueLimitationDAMockup<DataType.Int32>;
public readonly unit: UnitDAMockup;
protected interval: Timeout | undefined;
Expand All @@ -96,7 +96,7 @@ export class DIntManMockup {
});

this.osLevel = new OSLevelMockup(namespace, this.mockupNode, this.name);
this.scaleSettings = new ScaleSettingDAMockup(namespace, this.mockupNode, this.name, DataType.Int32);
this.scaleSettings = new ScaleSettingMockup(namespace, this.mockupNode, this.name, DataType.Int32);
this.valueLimitation = new ValueLimitationDAMockup(namespace, this.mockupNode, this.name,DataType.Int32);
this.unit = new UnitDAMockup(namespace, this.mockupNode, this.name);

Expand Down
8 changes: 4 additions & 4 deletions ...ntManager/pea/dataAssembly/operationElement/servParam/anaServParam/AnaServParam.mockup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import {DataType, Namespace, StatusCodes, UAObject, Variant} from 'node-opcua';
import {getUnitDAMockupReferenceJSON, UnitDAMockup} from '../../../_extensions/unitDA/UnitDA.mockup';
import {
getScaleSettingDAMockupReferenceJSON,
ScaleSettingDAMockup
} from '../../../_extensions/scaleSettingsDA/ScaleSettingDA.mockup';
ScaleSettingMockup
} from '../../../_extensions/scaleSettings/ScaleSetting.mockup';
import {
getValueLimitationDAMockupReferenceJSON,
ValueLimitationDAMockup
Expand Down Expand Up @@ -90,15 +90,15 @@ export class AnaServParamMockup extends ServParamMockup{
protected vFbk = 0;

public readonly unit: UnitDAMockup;
public readonly scaleSettings: ScaleSettingDAMockup<DataType.Double>;
public readonly scaleSettings: ScaleSettingMockup<DataType.Double>;
public readonly valueLimitation: ValueLimitationDAMockup<DataType.Double>;
protected interval: Timeout | undefined;

constructor(namespace: Namespace, rootNode: UAObject, variableName: string) {
super(namespace, rootNode, variableName);

this.unit = new UnitDAMockup(namespace, this.mockupNode, this.name);
this.scaleSettings = new ScaleSettingDAMockup(namespace, this.mockupNode, this.name, DataType.Double);
this.scaleSettings = new ScaleSettingMockup(namespace, this.mockupNode, this.name, DataType.Double);
this.valueLimitation = new ValueLimitationDAMockup(namespace, this.mockupNode, this.name,DataType.Double);

namespace.addVariable({
Expand Down
8 changes: 4 additions & 4 deletions ...Manager/pea/dataAssembly/operationElement/servParam/dIntServParam/DIntServParam.mockup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import {DataType, Namespace, StatusCodes, UAObject, Variant} from 'node-opcua';
import {getUnitDAMockupReferenceJSON, UnitDAMockup} from '../../../_extensions/unitDA/UnitDA.mockup';
import {
getScaleSettingDAMockupReferenceJSON,
ScaleSettingDAMockup
} from '../../../_extensions/scaleSettingsDA/ScaleSettingDA.mockup';
ScaleSettingMockup
} from '../../../_extensions/scaleSettings/ScaleSetting.mockup';
import {
getValueLimitationDAMockupReferenceJSON,
ValueLimitationDAMockup
Expand Down Expand Up @@ -96,15 +96,15 @@ export class DIntServParamMockup extends ServParamMockup {
protected vFbk = 0;

public readonly unit: UnitDAMockup;
public readonly scaleSettings: ScaleSettingDAMockup<DataType.Int32>;
public readonly scaleSettings: ScaleSettingMockup<DataType.Int32>;
public readonly valueLimitation: ValueLimitationDAMockup<DataType.Int32>;
protected interval: Timeout | undefined;

constructor(namespace: Namespace, rootNode: UAObject, variableName: string) {
super(namespace, rootNode, variableName);

this.unit = new UnitDAMockup(namespace, this.mockupNode, this.name);
this.scaleSettings = new ScaleSettingDAMockup(namespace, this.mockupNode, this.name, DataType.Int32);
this.scaleSettings = new ScaleSettingMockup(namespace, this.mockupNode, this.name, DataType.Int32);
this.valueLimitation = new ValueLimitationDAMockup(namespace, this.mockupNode, this.name,DataType.Int32);

namespace.addVariable({
Expand Down