Skip to content

Commit

Permalink
Updating constants
Browse files Browse the repository at this point in the history
  • Loading branch information
@akadlec
akadlec committed Oct 6, 2021
1 parent 9aa9cfb commit 5b945e0
Show file tree
Hide file tree
Showing 14 changed files with 45 additions and 45 deletions.
6 changes: 3 additions & 3 deletions devices_module/items.py
View file
Expand Up @@ -416,19 +416,19 @@ def get_format(self) -> Tuple[int, int] or Tuple[float, float] or Set[str]:
return None

if self.__data_type is not None:
if self.__data_type == DataType.DATA_TYPE_INT:
if self.__data_type == DataType.INT:
min_value, max_value, *rest = self.__format.split(":") + [None, None] # pylint: disable=unused-variable

if min_value is not None and max_value is not None and int(min_value) <= int(max_value):
return int(min_value), int(max_value)

elif self.__data_type == DataType.DATA_TYPE_FLOAT:
elif self.__data_type == DataType.FLOAT:
min_value, max_value, *rest = self.__format.split(":") + [None, None]

if min_value is not None and max_value is not None and float(min_value) <= float(max_value):
return float(min_value), float(max_value)

elif self.__data_type == DataType.DATA_TYPE_ENUM:
elif self.__data_type == DataType.ENUM:
return {x.strip() for x in self.__format.split(",")}

return None
Expand Down
60 changes: 30 additions & 30 deletions devices_module/models.py
View file
Expand Up @@ -631,17 +631,17 @@ def get_value(self) -> float or int or str or None:
if isinstance(self.data_type, DataType):
if (
self.data_type in [
DataType.DATA_TYPE_CHAR,
DataType.DATA_TYPE_UCHAR,
DataType.DATA_TYPE_SHORT,
DataType.DATA_TYPE_USHORT,
DataType.DATA_TYPE_INT,
DataType.DATA_TYPE_UINT,
DataType.CHAR,
DataType.UCHAR,
DataType.SHORT,
DataType.USHORT,
DataType.INT,
DataType.UINT,
]
):
return int(self.value)

if self.data_type == DataType.DATA_TYPE_FLOAT:
if self.data_type == DataType.FLOAT:
return float(self.value)

return self.value
Expand Down Expand Up @@ -738,13 +738,13 @@ def to_dict(
if isinstance(self.data_type, DataType):
if (
self.data_type in [
DataType.DATA_TYPE_CHAR,
DataType.DATA_TYPE_UCHAR,
DataType.DATA_TYPE_SHORT,
DataType.DATA_TYPE_USHORT,
DataType.DATA_TYPE_INT,
DataType.DATA_TYPE_UINT,
DataType.DATA_TYPE_FLOAT,
DataType.CHAR,
DataType.UCHAR,
DataType.SHORT,
DataType.USHORT,
DataType.INT,
DataType.UINT,
DataType.FLOAT,
]
):
return {
Expand All @@ -756,7 +756,7 @@ def to_dict(
},
}

if self.data_type == DataType.DATA_TYPE_ENUM:
if self.data_type == DataType.ENUM:
return {
**structure,
**{
Expand Down Expand Up @@ -1168,17 +1168,17 @@ def get_value(self) -> float or int or str or None:
if isinstance(self.data_type, DataType):
if (
self.data_type in [
DataType.DATA_TYPE_CHAR,
DataType.DATA_TYPE_UCHAR,
DataType.DATA_TYPE_SHORT,
DataType.DATA_TYPE_USHORT,
DataType.DATA_TYPE_INT,
DataType.DATA_TYPE_UINT,
DataType.CHAR,
DataType.UCHAR,
DataType.SHORT,
DataType.USHORT,
DataType.INT,
DataType.UINT,
]
):
return int(self.value)

if self.data_type == DataType.DATA_TYPE_FLOAT:
if self.data_type == DataType.FLOAT:
return float(self.value)

return self.value
Expand Down Expand Up @@ -1275,13 +1275,13 @@ def to_dict(
if isinstance(self.data_type, DataType):
if (
self.data_type in [
DataType.DATA_TYPE_CHAR,
DataType.DATA_TYPE_UCHAR,
DataType.DATA_TYPE_SHORT,
DataType.DATA_TYPE_USHORT,
DataType.DATA_TYPE_INT,
DataType.DATA_TYPE_UINT,
DataType.DATA_TYPE_FLOAT,
DataType.CHAR,
DataType.UCHAR,
DataType.SHORT,
DataType.USHORT,
DataType.INT,
DataType.UINT,
DataType.FLOAT,
]
):
return {
Expand All @@ -1293,7 +1293,7 @@ def to_dict(
},
}

if self.data_type == DataType.DATA_TYPE_ENUM:
if self.data_type == DataType.ENUM:
return {
**structure,
**{
Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/channel-configuration/index.ts
View file
Expand Up @@ -311,7 +311,7 @@ const moduleActions: ActionTree<ChannelConfigurationState, unknown> = {
},

async socketData({ state, commit }, payload: { origin: string, routingKey: string, data: string }): Promise<boolean> {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES_ORIGIN) {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES) {
return false
}

Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/channel-controls/index.ts
View file
Expand Up @@ -189,7 +189,7 @@ const moduleActions: ActionTree<ChannelControlState, unknown> = {
},

async socketData({ state, commit }, payload: { origin: string, routingKey: string, data: string }): Promise<boolean> {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES_ORIGIN) {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES) {
return false
}

Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/channel-properties/index.ts
View file
Expand Up @@ -311,7 +311,7 @@ const moduleActions: ActionTree<ChannelPropertyState, unknown> = {
},

async socketData({ state, commit }, payload: { origin: string, routingKey: string, data: string }): Promise<boolean> {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES_ORIGIN) {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES) {
return false
}

Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/channels/index.ts
View file
Expand Up @@ -262,7 +262,7 @@ const moduleActions: ActionTree<ChannelState, unknown> = {
},

async socketData({ state, commit }, payload: { origin: string, routingKey: string, data: string }): Promise<boolean> {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES_ORIGIN) {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES) {
return false
}

Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/connector-controls/index.ts
View file
Expand Up @@ -181,7 +181,7 @@ const moduleActions: ActionTree<ConnectorControlState, unknown> = {
},

async socketData({ state, commit }, payload: { origin: string, routingKey: string, data: string }): Promise<boolean> {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES_ORIGIN) {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES) {
return false
}

Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/connectors/index.ts
View file
Expand Up @@ -238,7 +238,7 @@ const moduleActions: ActionTree<ConnectorState, unknown> = {
},

async socketData({ state, commit }, payload: { origin: string, routingKey: string, data: string }): Promise<boolean> {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES_ORIGIN) {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES) {
return false
}

Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/device-configuration/index.ts
View file
Expand Up @@ -303,7 +303,7 @@ const moduleActions: ActionTree<DeviceConfigurationState, unknown> = {
},

async socketData({ state, commit }, payload: { origin: string, routingKey: string, data: string }): Promise<boolean> {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES_ORIGIN) {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES) {
return false
}

Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/device-connector/index.ts
View file
Expand Up @@ -336,7 +336,7 @@ const moduleActions: ActionTree<DeviceConnectorState, unknown> = {
},

async socketData({ state, commit }, payload: { origin: string, routingKey: string, data: string }): Promise<boolean> {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES_ORIGIN) {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES) {
return false
}

Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/device-controls/index.ts
View file
Expand Up @@ -181,7 +181,7 @@ const moduleActions: ActionTree<DeviceControlState, unknown> = {
},

async socketData({ state, commit }, payload: { origin: string, routingKey: string, data: string }): Promise<boolean> {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES_ORIGIN) {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES) {
return false
}

Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/device-properties/index.ts
View file
Expand Up @@ -303,7 +303,7 @@ const moduleActions: ActionTree<DevicePropertyState, unknown> = {
},

async socketData({ state, commit }, payload: { origin: string, routingKey: string, data: string }): Promise<boolean> {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES_ORIGIN) {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES) {
return false
}

Expand Down
2 changes: 1 addition & 1 deletion public/lib/models/devices/index.ts
View file
Expand Up @@ -469,7 +469,7 @@ const moduleActions: ActionTree<DeviceState, unknown> = {
},

async socketData({ state, commit }, payload: { origin: string, routingKey: string, data: string }): Promise<boolean> {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES_ORIGIN) {
if (payload.origin !== ModuleOrigin.MODULE_DEVICES) {
return false
}

Expand Down
2 changes: 1 addition & 1 deletion public/lib/types.ts
View file
Expand Up @@ -74,7 +74,7 @@ export interface RelationInterface extends TJsonaModel {
type: DeviceEntityTypes | ChannelEntityTypes | DevicePropertyEntityTypes | DeviceConfigurationEntityTypes | DeviceControlEntityTypes | DeviceConnectorEntityTypes | ChannelPropertyEntityTypes | ChannelConfigurationEntityTypes | ChannelControlEntityTypes | ConnectorEntityTypes | ConnectorControlEntityTypes
}

export const ModuleApiPrefix = `/${ModulePrefix.MODULE_DEVICES_PREFIX}`
export const ModuleApiPrefix = `/${ModulePrefix.MODULE_DEVICES}`

// STORE
// =====
Expand Down

0 comments on commit 5b945e0

Please sign in to comment.