mkarkowski/nope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fixing Namespace

Browse Source
This commit is contained in:
Martin Karkowski 2021-06-14 18:14:50 +02:00
parent 205a27ffd3
commit e834064e98
6 changed files with 43 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/wamo/cli/generateConfig.ts
View File

@ -2,7 +2,7 @@
* @author Martin Karkowski
* @email m.karkowski@zema.de
* @create date 2021-02-09 10:12:37
* @modify date 2021-02-26 08:53:56
* @modify date 2021-06-14 18:13:23
* @desc [description]
*/
@ -44,7 +44,7 @@ const config = {
defaultInstances: [
{
options: {
identifier: name,
identifier: ("wamo-" + name + "-beckhoff-connector").toLowerCase(),
params: [
{
port: 48898,

17
modules/wamo/src/wamo.agv.module.ts
View File

@ -2,7 +2,7 @@
* @author Martin Karkowski
* @email m.karkowski@zema.de
* @create date 2020-03-02 11:37:50
* @modify date 2021-01-14 12:12:15
* @modify date 2021-06-14 18:14:12
* @desc [description]
*/
@ -35,11 +35,11 @@ import {
IWaMOProcessModuleDescription
} from "../types/interfaces";
export interface XETICS extends IGenericNopeModule, IXeticsInterfaceClient {}
export interface MQTT extends IGenericNopeModule, IMQTTClientModule {}
export interface XETICS extends IGenericNopeModule, IXeticsInterfaceClient { }
export interface MQTT extends IGenericNopeModule, IMQTTClientModule { }
export interface IPROCESSMODULE
extends IGenericNopeModule,
IWaMOProcessModule {}
IWaMOProcessModule { }
const sleep = promisify(setTimeout);
@ -195,7 +195,7 @@ export class WaMoAGVModule extends InjectableNopeBaseModule {
// create a PLC Connector:
this._xetics = await _this._dispatcher.generateInstance<XETICS>({
identifier: _this.identifier + "_XETICS_CLIENT",
identifier: ("wamo-" + _this.identifier + "-xetics-client").toLowerCase(),
params: xeticsParams,
type: "XeticsInterfaceClient"
});
@ -221,7 +221,7 @@ export class WaMoAGVModule extends InjectableNopeBaseModule {
// create a MQTT-Connector:
this._mqtt = await _this._dispatcher.generateInstance<MQTT>({
identifier: this.identifier + "MQTT_CLIENT_" + options.mqttUri,
identifier: ("wamo-" + options.mqttUri + "-mqtt-client").toLowerCase(),
params: mqttParams,
type: "MQTTClientModule"
});
@ -243,7 +243,7 @@ export class WaMoAGVModule extends InjectableNopeBaseModule {
// Create the Connector of the AVG-Module.
_this._processModule = await _this._dispatcher.generateInstance<IPROCESSMODULE>(
{
identifier: _this.identifier + "_PROCESS_MODULE_CONNECTOR",
identifier: ("wamo-" + _this.identifier + "-processmodule-connector").toLowerCase(),
params: processModuleParams,
type: "WaMOProcessModule"
}
@ -291,8 +291,7 @@ export class WaMoAGVModule extends InjectableNopeBaseModule {
// Publish on MQTT.
_this._mqtt
.publish(
`${
this.config.getContent().plcName
`${this.config.getContent().plcName
}/baseModule/connectorReplica/${key}`,
value[key],
{

23
modules/wamo/src/wamo.basemodule.module.ts
View File

@ -2,7 +2,7 @@
* @author Martin Karkowski
* @email m.karkowski@zema.de
* @create date 2020-03-02 11:37:50
* @modify date 2021-01-14 12:12:15
* @modify date 2021-06-14 18:14:27
* @desc [description]
*/
@ -49,12 +49,12 @@ import {
IWaMOStateType
} from "../types/interfaces";
export interface PLC extends IGenericNopeModule, IPLCModule {}
export interface MQTT extends IGenericNopeModule, IMQTTClientModule {}
export interface XETICS extends IGenericNopeModule, IXeticsInterfaceClient {}
export interface PLC extends IGenericNopeModule, IPLCModule { }
export interface MQTT extends IGenericNopeModule, IMQTTClientModule { }
export interface XETICS extends IGenericNopeModule, IXeticsInterfaceClient { }
export interface IPROCESSMODULE
extends IGenericNopeModule,
IWaMOProcessModule {}
IWaMOProcessModule { }
const sleep = promisify(setTimeout);
@ -229,9 +229,9 @@ export class WaMOBaseModule
// Define the Parameters for the Xetics Modules.
const xeticsParams = [options.name, 1];
// create a PLC Connector:
// create a Xetics Connector:
_this._xetics = await _this._dispatcher.generateInstance<XETICS>({
identifier: _this.identifier + "_XETICS_CLIENT",
identifier: ("wamo-" + _this.identifier + "-xetics-client").toLowerCase(),
params: xeticsParams,
type: "XeticsInterfaceClient"
});
@ -257,7 +257,7 @@ export class WaMOBaseModule
// create a MQTT-Connector:
_this._mqtt = await _this._dispatcher.generateInstance<MQTT>({
identifier: "MQTT_CLIENT_" + options.mqttUri,
identifier: ("wamo-" + options.mqttUri + "-mqtt-client").toLowerCase(),
params: mqttParams,
type: "MQTTClientModule"
});
@ -291,7 +291,7 @@ export class WaMOBaseModule
// create a PLC Connector:
_this._plc = await _this._dispatcher.generateInstance<PLC>({
identifier: _this.identifier + "_BECKHOFF_PLC_CLIENT",
identifier: ("wamo-" + _this.identifier + "-beckhoff-connector").toLowerCase(),
params: beckhoffParams,
type: "BeckhoffPlc"
});
@ -432,7 +432,7 @@ export class WaMOBaseModule
// Create the Connector of the Process-Module.
this._processModule = await _this._dispatcher.generateInstance<IPROCESSMODULE>(
{
identifier: _this.identifier + "_BECKHOFF_PROCESSMODULE_CLIENT",
identifier: ("wamo-" + _this.identifier + "-processmodule-connector").toLowerCase(),
params: processModuleParams,
type: "WaMOProcessModule"
}
@ -489,8 +489,7 @@ export class WaMOBaseModule
// Publish on MQTT.
_this._mqtt
.publish(
`${
this.config.getContent().plcName
`${this.config.getContent().plcName
}/baseModule/connectorReplica/${key}`,
value[key],
{

12
modules/wamo/src/wamo.converter.module.ts
View File

@ -2,7 +2,7 @@
* @author Martin Karkowski
* @email m.karkowski@zema.de
* @create date 2020-03-02 11:37:50
* @modify date 2021-01-05 16:51:30
* @modify date 2021-06-14 18:14:31
* @desc [description]
*/
@ -37,9 +37,9 @@ import {
IWaMOConverterModuleDescription
} from "../types/interfaces";
export interface PLC extends IGenericNopeModule, IPLCModule {}
export interface MQTT extends IGenericNopeModule, IMQTTClientModule {}
export interface XETICS extends IGenericNopeModule, IXeticsInterfaceClient {}
export interface PLC extends IGenericNopeModule, IPLCModule { }
export interface MQTT extends IGenericNopeModule, IMQTTClientModule { }
export interface XETICS extends IGenericNopeModule, IXeticsInterfaceClient { }
const sleep = promisify(setTimeout);
@ -162,7 +162,7 @@ export class WaMOConverterModule
// create a PLC Connector:
this._plc = await _this._dispatcher.generateInstance<PLC>({
identifier: "BECKHOFF_PLC-" + options.name,
identifier: ("wamo-" + options.plcName + "-beckhoff-connector").toLowerCase(),
params: beckhoffParams,
type: "BeckhoffPlc"
});
@ -205,7 +205,7 @@ export class WaMOConverterModule
// create a MQTT-Connector:
_this._mqtt = await _this._dispatcher.generateInstance<MQTT>({
identifier: "MQTT_CLIENT_" + options.mqttUri,
identifier: ("wamo-" + options.mqttUri + "-mqtt-client").toLowerCase(),
params: mqttParams,
type: "MQTTClientModule"
});

22
modules/wamo/src/wamo.lineManager.module.ts
View File

@ -2,7 +2,7 @@
* @author Martin Karkowski
* @email m.karkowski@zema.de
* @create date 2020-03-02 11:37:50
* @modify date 2021-01-06 08:34:11
* @modify date 2021-06-14 18:13:29
* @desc [description]
*/
@ -33,10 +33,10 @@ import {
IWaMOTransportManagerConfig
} from "../types/interfaces";
export interface CONVERTER extends INopeModule, IWaMOConverter {}
export interface BASEMODULE extends INopeModule, IWaMOBaseModule {}
export interface LINECONNECTOR extends INopeModule, IWaMOSimpleLineConnector {}
export interface CARRIERMAPPER extends INopeModule, IWaMOCarrierMapper {}
export interface CONVERTER extends INopeModule, IWaMOConverter { }
export interface BASEMODULE extends INopeModule, IWaMOBaseModule { }
export interface LINECONNECTOR extends INopeModule, IWaMOSimpleLineConnector { }
export interface CARRIERMAPPER extends INopeModule, IWaMOCarrierMapper { }
// Custom Sleep Function
const sleep = promisify(setTimeout);
@ -109,14 +109,12 @@ export class WaMOLineManager extends InjectableNopeBaseModule {
* The Logger of the Module.
*
* @private
* @memberof BeckhoffPlc
*/
private _logger = getNopeLogger("wamo-line-manager");
/**
* Flag showing, if the Element has been connected or not.
*
* @memberof BeckhoffPlc
*/
@exportProperty({
mode: "publish",
@ -181,7 +179,7 @@ export class WaMOLineManager extends InjectableNopeBaseModule {
// Define the Carrier:
_this.carrierMapper = await _this._dispatcher.generateInstance<CARRIERMAPPER>(
{
identifier: _this.identifier + "_WAMO_CARRIERMAPPER",
identifier: ("wamo-" + _this.identifier + "-carrier-mapper").toLowerCase(),
params: [],
type: "WaMOCarrierMapper"
}
@ -248,7 +246,7 @@ export class WaMOLineManager extends InjectableNopeBaseModule {
options.checkedInWorkpieceCarrier
);
if (element != lastStation && product === undefined){
if (element != lastStation && product === undefined) {
// This is our special usecase, where we have unregistered carriers,
// which will receive a new task from the MES. Therefore we perform
// the Linking, as at station 01.
@ -287,14 +285,14 @@ export class WaMOLineManager extends InjectableNopeBaseModule {
// Subscribe to Changes of the Base-Modules:
mod.baseInformation.subscribe((description) => {
// If Workpiece Carrier has checked in, register the Carrier:
if (description.physical.checkedInWorkpieceCarrier){
if (description.physical.checkedInWorkpieceCarrier) {
_this.carrierMapper.registerCarrier(
description.physical.checkedInWorkpieceCarrier
);
}
});
// create a PLC Connector:
// Store the Interface of the baseInformation
_this.baseModules.push(mod);
});
@ -342,7 +340,7 @@ export class WaMOLineManager extends InjectableNopeBaseModule {
// Define the Connector:
_this.transportManager = await _this._dispatcher.generateInstance<LINECONNECTOR>(
{
identifier: _this.identifier + "_WAMO_TRANSPORT_MANAGER",
identifier: ("wamo-" + _this.identifier + "-transport-manager").toLowerCase(),
params: [transportManagerParams],
type: "WaMOSimpleTransportManager"
}

12
modules/wamo/src/wamo.transportManager.simple.module.ts
View File

@ -2,7 +2,7 @@
* @author Martin Karkowski
* @email m.karkowski@zema.de
* @create date 2020-03-02 11:37:50
* @modify date 2021-01-14 12:08:07
* @modify date 2021-06-14 18:13:33
* @desc [description]
*/
@ -29,9 +29,9 @@ import {
IWaMOTransportManagerConfig
} from "../types/interfaces";
export interface CONVERTER extends INopeModule, IWaMOConverter {}
export interface BASEMODULE extends INopeModule, IWaMOBaseModule {}
export interface CARRIERMAPPER extends INopeModule, IWaMOCarrierMapper {}
export interface CONVERTER extends INopeModule, IWaMOConverter { }
export interface BASEMODULE extends INopeModule, IWaMOBaseModule { }
export interface CARRIERMAPPER extends INopeModule, IWaMOCarrierMapper { }
const sleep = promisify(setTimeout);
@ -166,7 +166,7 @@ export class WaMOSimpleTransportManager
// Define the Carrier:
_this.carrierMapper = await _this._dispatcher.generateInstance<CARRIERMAPPER>(
{
identifier: _this.identifier + "_WAMO_CARRIERMAPPER",
identifier: ("wamo-" + _this.identifier + "-carrier-mapper").toLowerCase(),
params: [],
type: "WaMOCarrierMapper"
}
@ -175,7 +175,7 @@ export class WaMOSimpleTransportManager
// Test if the Last and First element are converters.
if (
_this._orderAsArray[_this._orderAsArray.length - 1].type !==
"converter" ||
"converter" ||
_this._orderAsArray[0].type !== "converter"
) {
_this._logger.error(