kscience/controls-kt
8
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases 1 Wiki Activity

Change package name to space.kscience

Browse Source
This commit is contained in:
Alexander Nozik 2022-08-02 09:10:02 +03:00
parent 20345f846b
commit bd29789545
No known key found for this signature in database
GPG Key ID: F7FCF2DD25C71357
62 changed files with 156 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle.kts
View File

@ -7,13 +7,13 @@ val ktorVersion: String by extra(ru.mipt.npm.gradle.KScienceVersions.ktorVersion
val rsocketVersion by extra("0.15.4") val rsocketVersion by extra("0.15.4")
allprojects { allprojects {
group = "ru.mipt.npm" group = "space.kscience"
version = "0.1.1" version = "0.1.1-SNAPSHOT"
} }
ksciencePublish { ksciencePublish {
github("controls.kt") github("controls.kt")
space() space("https://maven.pkg.jetbrains.space/mipt-npm/p/controls/maven")
} }
apiValidation { apiValidation {

4
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/Device.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/api/Device.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.api package space.kscience.controls.api
import io.ktor.utils.io.core.Closeable import io.ktor.utils.io.core.Closeable
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.filterIsInstance
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
import ru.mipt.npm.controls.api.Device.Companion.DEVICE_TARGET import space.kscience.controls.api.Device.Companion.DEVICE_TARGET
import space.kscience.dataforge.context.ContextAware import space.kscience.dataforge.context.ContextAware
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.misc.Type import space.kscience.dataforge.misc.Type

2
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/DeviceHub.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/api/DeviceHub.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.api package space.kscience.controls.api
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.names.* import space.kscience.dataforge.names.*

2
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/DeviceMessage.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/api/DeviceMessage.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.api package space.kscience.controls.api
import kotlinx.datetime.Clock import kotlinx.datetime.Clock
import kotlinx.datetime.Instant import kotlinx.datetime.Instant

3
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/Socket.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/api/Socket.kt
View File

@ -1,10 +1,9 @@
package ru.mipt.npm.controls.api package space.kscience.controls.api
import io.ktor.utils.io.core.Closeable import io.ktor.utils.io.core.Closeable
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
/** /**

2
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/api/descriptors.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/api/descriptors.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.api package space.kscience.controls.api
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import space.kscience.dataforge.meta.descriptors.MetaDescriptor import space.kscience.dataforge.meta.descriptors.MetaDescriptor

6
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/manager/DeviceManager.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/manager/DeviceManager.kt
View File

@ -1,8 +1,8 @@
package ru.mipt.npm.controls.manager package space.kscience.controls.manager
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import ru.mipt.npm.controls.api.Device import space.kscience.controls.api.Device
import ru.mipt.npm.controls.api.DeviceHub import space.kscience.controls.api.DeviceHub
import space.kscience.dataforge.context.* import space.kscience.dataforge.context.*
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.meta.MutableMeta import space.kscience.dataforge.meta.MutableMeta

4
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/manager/deviceMessages.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/manager/deviceMessages.kt
View File

@ -1,11 +1,11 @@
package ru.mipt.npm.controls.manager package space.kscience.controls.manager
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
import ru.mipt.npm.controls.api.* import space.kscience.controls.api.*
import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.Name
import space.kscience.dataforge.names.plus import space.kscience.dataforge.names.plus

4
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/ports/Port.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/ports/Port.kt
View File

@ -1,10 +1,10 @@
package ru.mipt.npm.controls.ports package space.kscience.controls.ports
import kotlinx.coroutines.* import kotlinx.coroutines.*
import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.flow.receiveAsFlow
import ru.mipt.npm.controls.api.Socket import space.kscience.controls.api.Socket
import space.kscience.dataforge.context.* import space.kscience.dataforge.context.*
import kotlin.coroutines.CoroutineContext import kotlin.coroutines.CoroutineContext

3
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/ports/PortProxy.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/ports/PortProxy.kt
View File

@ -1,8 +1,7 @@
package ru.mipt.npm.controls.ports package space.kscience.controls.ports
import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.Mutex

2
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/ports/SynchronousPortHandler.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/ports/SynchronousPortHandler.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.ports package space.kscience.controls.ports
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.first

2
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/ports/phrases.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/ports/phrases.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.ports package space.kscience.controls.ports
import io.ktor.utils.io.core.BytePacketBuilder import io.ktor.utils.io.core.BytePacketBuilder
import io.ktor.utils.io.core.readBytes import io.ktor.utils.io.core.readBytes

4
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/DeviceBase.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/spec/DeviceBase.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.spec package space.kscience.controls.spec
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.SupervisorJob
@ -7,7 +7,7 @@ import kotlinx.coroutines.flow.SharedFlow
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.sync.withLock
import ru.mipt.npm.controls.api.* import space.kscience.controls.api.*
import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Context
import space.kscience.dataforge.context.Global import space.kscience.dataforge.context.Global
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta

6
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/DeviceMetaPropertySpec.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/spec/DeviceMetaPropertySpec.kt
View File

@ -1,7 +1,7 @@
package ru.mipt.npm.controls.spec package space.kscience.controls.spec
import ru.mipt.npm.controls.api.Device import space.kscience.controls.api.Device
import ru.mipt.npm.controls.api.PropertyDescriptor import space.kscience.controls.api.PropertyDescriptor
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.meta.transformations.MetaConverter import space.kscience.dataforge.meta.transformations.MetaConverter

10
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/DevicePropertySpec.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/spec/DevicePropertySpec.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.spec package space.kscience.controls.spec
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.filter
@ -6,10 +6,10 @@ import kotlinx.coroutines.flow.filterIsInstance
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import ru.mipt.npm.controls.api.ActionDescriptor import space.kscience.controls.api.ActionDescriptor
import ru.mipt.npm.controls.api.Device import space.kscience.controls.api.Device
import ru.mipt.npm.controls.api.PropertyChangedMessage import space.kscience.controls.api.PropertyChangedMessage
import ru.mipt.npm.controls.api.PropertyDescriptor import space.kscience.controls.api.PropertyDescriptor
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.meta.transformations.MetaConverter import space.kscience.dataforge.meta.transformations.MetaConverter

8
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/DeviceSpec.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/spec/DeviceSpec.kt
View File

@ -1,9 +1,9 @@
package ru.mipt.npm.controls.spec package space.kscience.controls.spec
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import ru.mipt.npm.controls.api.ActionDescriptor import space.kscience.controls.api.ActionDescriptor
import ru.mipt.npm.controls.api.Device import space.kscience.controls.api.Device
import ru.mipt.npm.controls.api.PropertyDescriptor import space.kscience.controls.api.PropertyDescriptor
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.meta.transformations.MetaConverter import space.kscience.dataforge.meta.transformations.MetaConverter
import kotlin.properties.PropertyDelegateProvider import kotlin.properties.PropertyDelegateProvider

2
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/deviceExtensions.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/spec/deviceExtensions.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.spec package space.kscience.controls.spec
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow

2
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/misc.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/spec/misc.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.spec package space.kscience.controls.spec
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.meta.double import space.kscience.dataforge.meta.double

6
controls-core/src/commonMain/kotlin/ru/mipt/npm/controls/spec/propertySpecDelegates.kt → controls-core/src/commonMain/kotlin/space/kscience/controls/spec/propertySpecDelegates.kt
View File

@ -1,7 +1,7 @@
package ru.mipt.npm.controls.spec package space.kscience.controls.spec
import ru.mipt.npm.controls.api.PropertyDescriptor import space.kscience.controls.api.PropertyDescriptor
import ru.mipt.npm.controls.api.metaDescriptor import space.kscience.controls.api.metaDescriptor
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.meta.transformations.MetaConverter import space.kscience.dataforge.meta.transformations.MetaConverter
import space.kscience.dataforge.values.ValueType import space.kscience.dataforge.values.ValueType

2
controls-core/src/jvmMain/kotlin/ru/mipt/npm/controls/misc/javaTimeMeta.kt → controls-core/src/jvmMain/kotlin/space/kscience/controls/misc/javaTimeMeta.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.misc package space.kscience.controls.misc
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.meta.get import space.kscience.dataforge.meta.get

2
controls-core/src/jvmMain/kotlin/ru/mipt/npm/controls/ports/TcpPort.kt → controls-core/src/jvmMain/kotlin/space/kscience/controls/ports/TcpPort.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.ports package space.kscience.controls.ports
import kotlinx.coroutines.* import kotlinx.coroutines.*
import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Context

2
controls-core/src/jvmMain/kotlin/ru/mipt/npm/controls/spec/getDeviceProperty.kt → controls-core/src/jvmMain/kotlin/space/kscience/controls/spec/getDeviceProperty.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.spec package space.kscience.controls.spec
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking

2
controls-core/src/jvmTest/kotlin/ru/mipt/npm/controls/ports/PortIOTest.kt → controls-core/src/jvmTest/kotlin/space/kscience/controls/ports/PortIOTest.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.ports package space.kscience.controls.ports
import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map

10
controls-magix-client/src/commonMain/kotlin/ru/mipt/npm/controls/client/controlsMagix.kt → controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/controlsMagix.kt
View File

@ -1,15 +1,15 @@
package ru.mipt.npm.controls.client package space.kscience.controls.client
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import ru.mipt.npm.controls.api.DeviceMessage
import ru.mipt.npm.controls.manager.DeviceManager
import ru.mipt.npm.controls.manager.hubMessageFlow
import ru.mipt.npm.controls.manager.respondHubMessage
import ru.mipt.npm.magix.api.* import ru.mipt.npm.magix.api.*
import space.kscience.controls.api.DeviceMessage
import space.kscience.controls.manager.DeviceManager
import space.kscience.controls.manager.hubMessageFlow
import space.kscience.controls.manager.respondHubMessage
import space.kscience.dataforge.context.error import space.kscience.dataforge.context.error
import space.kscience.dataforge.context.logger import space.kscience.dataforge.context.logger

2
controls-magix-client/src/commonMain/kotlin/ru/mipt/npm/controls/client/doocsMagix.kt → controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/doocsMagix.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.client package space.kscience.controls.client
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable

8
controls-magix-client/src/commonMain/kotlin/ru/mipt/npm/controls/client/tangoMagix.kt → controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/tangoMagix.kt
View File

@ -1,14 +1,14 @@
package ru.mipt.npm.controls.client package space.kscience.controls.client
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import ru.mipt.npm.controls.api.get
import ru.mipt.npm.controls.api.getOrReadProperty
import ru.mipt.npm.controls.manager.DeviceManager
import ru.mipt.npm.magix.api.* import ru.mipt.npm.magix.api.*
import space.kscience.controls.api.get
import space.kscience.controls.api.getOrReadProperty
import space.kscience.controls.manager.DeviceManager
import space.kscience.dataforge.context.error import space.kscience.dataforge.context.error
import space.kscience.dataforge.context.logger import space.kscience.dataforge.context.logger
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta

6
controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/client/MetaBsdParser.kt → controls-opcua/src/main/kotlin/space/kscience/controls/opcua/client/MetaBsdParser.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.opcua.client package space.kscience.controls.opcua.client
import org.eclipse.milo.opcua.binaryschema.AbstractCodec import org.eclipse.milo.opcua.binaryschema.AbstractCodec
import org.eclipse.milo.opcua.binaryschema.parser.BsdParser import org.eclipse.milo.opcua.binaryschema.parser.BsdParser
@ -11,8 +11,8 @@ import org.eclipse.milo.opcua.stack.core.types.builtin.*
import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.* import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.*
import org.opcfoundation.opcua.binaryschema.EnumeratedType import org.opcfoundation.opcua.binaryschema.EnumeratedType
import org.opcfoundation.opcua.binaryschema.StructuredType import org.opcfoundation.opcua.binaryschema.StructuredType
import ru.mipt.npm.controls.misc.instant import space.kscience.controls.misc.instant
import ru.mipt.npm.controls.misc.toMeta import space.kscience.controls.misc.toMeta
import space.kscience.dataforge.meta.* import space.kscience.dataforge.meta.*
import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.Name
import space.kscience.dataforge.names.asName import space.kscience.dataforge.names.asName

4
controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/client/MiloDevice.kt → controls-opcua/src/main/kotlin/space/kscience/controls/opcua/client/MiloDevice.kt
View File

@ -1,11 +1,11 @@
package ru.mipt.npm.controls.opcua.client package space.kscience.controls.opcua.client
import kotlinx.coroutines.future.await import kotlinx.coroutines.future.await
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import org.eclipse.milo.opcua.sdk.client.OpcUaClient import org.eclipse.milo.opcua.sdk.client.OpcUaClient
import org.eclipse.milo.opcua.stack.core.types.builtin.* import org.eclipse.milo.opcua.stack.core.types.builtin.*
import org.eclipse.milo.opcua.stack.core.types.enumerated.TimestampsToReturn import org.eclipse.milo.opcua.stack.core.types.enumerated.TimestampsToReturn
import ru.mipt.npm.controls.api.Device import space.kscience.controls.api.Device
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.meta.MetaSerializer import space.kscience.dataforge.meta.MetaSerializer
import space.kscience.dataforge.meta.transformations.MetaConverter import space.kscience.dataforge.meta.transformations.MetaConverter

6
controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/client/MiloDeviceBySpec.kt → controls-opcua/src/main/kotlin/space/kscience/controls/opcua/client/MiloDeviceBySpec.kt
View File

@ -1,11 +1,11 @@
package ru.mipt.npm.controls.opcua.client package space.kscience.controls.opcua.client
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import org.eclipse.milo.opcua.sdk.client.OpcUaClient import org.eclipse.milo.opcua.sdk.client.OpcUaClient
import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId
import ru.mipt.npm.controls.spec.DeviceBySpec import space.kscience.controls.spec.DeviceBySpec
import ru.mipt.npm.controls.spec.DeviceSpec import space.kscience.controls.spec.DeviceSpec
import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Context
import space.kscience.dataforge.context.Global import space.kscience.dataforge.context.Global
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta

2
controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/client/miloClient.kt → controls-opcua/src/main/kotlin/space/kscience/controls/opcua/client/miloClient.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.opcua.client package space.kscience.controls.opcua.client
import org.eclipse.milo.opcua.sdk.client.OpcUaClient import org.eclipse.milo.opcua.sdk.client.OpcUaClient
import org.eclipse.milo.opcua.sdk.client.api.config.OpcUaClientConfigBuilder import org.eclipse.milo.opcua.sdk.client.api.config.OpcUaClientConfigBuilder

12
controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/server/DeviceNameSpace.kt → controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/DeviceNameSpace.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.opcua.server package space.kscience.controls.opcua.server
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.datetime.toJavaInstant import kotlinx.datetime.toJavaInstant
@ -18,11 +18,11 @@ import org.eclipse.milo.opcua.stack.core.AttributeId
import org.eclipse.milo.opcua.stack.core.Identifiers import org.eclipse.milo.opcua.stack.core.Identifiers
import org.eclipse.milo.opcua.stack.core.types.builtin.DateTime import org.eclipse.milo.opcua.stack.core.types.builtin.DateTime
import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText
import ru.mipt.npm.controls.api.Device import space.kscience.controls.api.Device
import ru.mipt.npm.controls.api.DeviceHub import space.kscience.controls.api.DeviceHub
import ru.mipt.npm.controls.api.PropertyDescriptor import space.kscience.controls.api.PropertyDescriptor
import ru.mipt.npm.controls.api.onPropertyChange import space.kscience.controls.api.onPropertyChange
import ru.mipt.npm.controls.manager.DeviceManager import space.kscience.controls.manager.DeviceManager
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.meta.MetaSerializer import space.kscience.dataforge.meta.MetaSerializer
import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.Name

2
controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/server/metaToOpc.kt → controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/metaToOpc.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.opcua.server package space.kscience.controls.opcua.server
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue

2
controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/server/nodeUtils.kt → controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/nodeUtils.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.opcua.server package space.kscience.controls.opcua.server
import org.eclipse.milo.opcua.sdk.core.AccessLevel import org.eclipse.milo.opcua.sdk.core.AccessLevel
import org.eclipse.milo.opcua.sdk.core.Reference import org.eclipse.milo.opcua.sdk.core.Reference

2
controls-opcua/src/main/kotlin/ru/mipt/npm/controls/opcua/server/serverUtils.kt → controls-opcua/src/main/kotlin/space/kscience/controls/opcua/server/serverUtils.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.opcua.server package space.kscience.controls.opcua.server
import org.eclipse.milo.opcua.sdk.server.OpcUaServer import org.eclipse.milo.opcua.sdk.server.OpcUaServer
import org.eclipse.milo.opcua.sdk.server.api.config.OpcUaServerConfig import org.eclipse.milo.opcua.sdk.server.api.config.OpcUaServerConfig

8
controls-serial/src/main/kotlin/ru/mipt/npm/controls/serial/SerialPort.kt → controls-serial/src/main/kotlin/space/kscience/controls/serial/SerialPort.kt
View File

@ -1,10 +1,10 @@
package ru.mipt.npm.controls.serial package space.kscience.controls.serial
import jssc.SerialPort.* import jssc.SerialPort.*
import jssc.SerialPortEventListener import jssc.SerialPortEventListener
import ru.mipt.npm.controls.ports.AbstractPort import space.kscience.controls.ports.AbstractPort
import ru.mipt.npm.controls.ports.Port import space.kscience.controls.ports.Port
import ru.mipt.npm.controls.ports.PortFactory import space.kscience.controls.ports.PortFactory
import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Context
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.meta.int import space.kscience.dataforge.meta.int

14
controls-server/src/main/kotlin/ru/mipt/npm/controls/server/deviceWebServer.kt → controls-server/src/main/kotlin/space/kscience/controls/server/deviceWebServer.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.server package space.kscience.controls.server
import io.ktor.http.HttpStatusCode import io.ktor.http.HttpStatusCode
@ -26,16 +26,16 @@ import kotlinx.serialization.json.Json
import kotlinx.serialization.json.buildJsonArray import kotlinx.serialization.json.buildJsonArray
import kotlinx.serialization.json.encodeToJsonElement import kotlinx.serialization.json.encodeToJsonElement
import kotlinx.serialization.json.put import kotlinx.serialization.json.put
import ru.mipt.npm.controls.api.DeviceMessage
import ru.mipt.npm.controls.api.PropertyGetMessage
import ru.mipt.npm.controls.api.PropertySetMessage
import ru.mipt.npm.controls.api.getOrNull
import ru.mipt.npm.controls.manager.DeviceManager
import ru.mipt.npm.controls.manager.respondHubMessage
import ru.mipt.npm.magix.api.MagixEndpoint import ru.mipt.npm.magix.api.MagixEndpoint
import ru.mipt.npm.magix.api.MagixMessage import ru.mipt.npm.magix.api.MagixMessage
import ru.mipt.npm.magix.server.launchMagixServerRawRSocket import ru.mipt.npm.magix.server.launchMagixServerRawRSocket
import ru.mipt.npm.magix.server.magixModule import ru.mipt.npm.magix.server.magixModule
import space.kscience.controls.api.DeviceMessage
import space.kscience.controls.api.PropertyGetMessage
import space.kscience.controls.api.PropertySetMessage
import space.kscience.controls.api.getOrNull
import space.kscience.controls.manager.DeviceManager
import space.kscience.controls.manager.respondHubMessage
import space.kscience.dataforge.meta.toMeta import space.kscience.dataforge.meta.toMeta
import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.Name
import space.kscience.dataforge.names.asName import space.kscience.dataforge.names.asName

4
controls-server/src/main/kotlin/ru/mipt/npm/controls/server/responses.kt → controls-server/src/main/kotlin/space/kscience/controls/server/responses.kt
View File

@ -1,12 +1,12 @@
package ru.mipt.npm.controls.server package space.kscience.controls.server
import io.ktor.http.ContentType import io.ktor.http.ContentType
import io.ktor.server.application.ApplicationCall import io.ktor.server.application.ApplicationCall
import io.ktor.server.response.respondText import io.ktor.server.response.respondText
import kotlinx.serialization.json.JsonObjectBuilder import kotlinx.serialization.json.JsonObjectBuilder
import kotlinx.serialization.json.buildJsonObject import kotlinx.serialization.json.buildJsonObject
import ru.mipt.npm.controls.api.DeviceMessage
import ru.mipt.npm.magix.api.MagixEndpoint import ru.mipt.npm.magix.api.MagixEndpoint
import space.kscience.controls.api.DeviceMessage
//internal fun Frame.toEnvelope(): Envelope { //internal fun Frame.toEnvelope(): Envelope {

8
controls-storage/controls-xodus/src/main/kotlin/ru/mipt/npm/controls/xodus/XodusDeviceMessageStorage.kt → controls-storage/controls-xodus/src/main/kotlin/space/kscience/controls/xodus/XodusDeviceMessageStorage.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.xodus package space.kscience.controls.xodus
import jetbrains.exodus.entitystore.Entity import jetbrains.exodus.entitystore.Entity
import jetbrains.exodus.entitystore.PersistentEntityStore import jetbrains.exodus.entitystore.PersistentEntityStore
@ -11,9 +11,9 @@ import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonObject
import kotlinx.serialization.json.jsonPrimitive import kotlinx.serialization.json.jsonPrimitive
import ru.mipt.npm.controls.api.DeviceMessage import space.kscience.controls.api.DeviceMessage
import ru.mipt.npm.controls.storage.DeviceMessageStorage import space.kscience.controls.storage.DeviceMessageStorage
import ru.mipt.npm.controls.storage.workDirectory import space.kscience.controls.storage.workDirectory
import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Context
import space.kscience.dataforge.context.Factory import space.kscience.dataforge.context.Factory
import space.kscience.dataforge.context.fetch import space.kscience.dataforge.context.fetch

8
controls-storage/controls-xodus/src/test/kotlin/PropertyHistoryTest.kt
View File

@ -6,10 +6,10 @@ import org.junit.jupiter.api.AfterAll
import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.BeforeAll
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import ru.mipt.npm.controls.api.PropertyChangedMessage import space.kscience.controls.api.PropertyChangedMessage
import ru.mipt.npm.controls.xodus.XodusDeviceMessageStorage import space.kscience.controls.xodus.XodusDeviceMessageStorage
import ru.mipt.npm.controls.xodus.query import space.kscience.controls.xodus.query
import ru.mipt.npm.controls.xodus.writeMessage import space.kscience.controls.xodus.writeMessage
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.Name
import space.kscience.dataforge.names.asName import space.kscience.dataforge.names.asName

4
controls-storage/src/commonMain/kotlin/ru/mipt/npm/controls/storage/DeviceMessageStorage.kt → controls-storage/src/commonMain/kotlin/space/kscience/controls/storage/DeviceMessageStorage.kt
View File

@ -1,7 +1,7 @@
package ru.mipt.npm.controls.storage package space.kscience.controls.storage
import kotlinx.datetime.Instant import kotlinx.datetime.Instant
import ru.mipt.npm.controls.api.DeviceMessage import space.kscience.controls.api.DeviceMessage
import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.Name
/** /**

8
controls-storage/src/commonMain/kotlin/ru/mipt/npm/controls/storage/storageCommon.kt → controls-storage/src/commonMain/kotlin/space/kscience/controls/storage/storageCommon.kt
View File

@ -1,13 +1,13 @@
package ru.mipt.npm.controls.storage package space.kscience.controls.storage
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onCompletion import kotlinx.coroutines.flow.onCompletion
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
import ru.mipt.npm.controls.api.DeviceMessage import space.kscience.controls.api.DeviceMessage
import ru.mipt.npm.controls.manager.DeviceManager import space.kscience.controls.manager.DeviceManager
import ru.mipt.npm.controls.manager.hubMessageFlow import space.kscience.controls.manager.hubMessageFlow
import space.kscience.dataforge.context.Factory import space.kscience.dataforge.context.Factory
import space.kscience.dataforge.context.debug import space.kscience.dataforge.context.debug
import space.kscience.dataforge.context.logger import space.kscience.dataforge.context.logger

2
controls-storage/src/jvmMain/kotlin/ru/mipt/npm/controls/storage/storageJvm.kt → controls-storage/src/jvmMain/kotlin/space/kscience/controls/storage/storageJvm.kt
View File

@ -1,4 +1,4 @@
//package ru.mipt.npm.controls.storage //package space.kscience.controls.storage
// //
//import io.ktor.server.application.Application //import io.ktor.server.application.Application
//import kotlinx.coroutines.InternalCoroutinesApi //import kotlinx.coroutines.InternalCoroutinesApi

2
controls-storage/src/jvmMain/kotlin/ru/mipt/npm/controls/storage/workDirectory.kt → controls-storage/src/jvmMain/kotlin/space/kscience/controls/storage/workDirectory.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.storage package space.kscience.controls.storage
import space.kscience.dataforge.context.ContextBuilder import space.kscience.dataforge.context.ContextBuilder
import space.kscience.dataforge.io.IOPlugin import space.kscience.dataforge.io.IOPlugin

2
controls-tcp/src/main/kotlin/ru/mipt/npm/controls/ports/KtorTcpPort.kt → controls-tcp/src/main/kotlin/space/kscience/controls/ports/KtorTcpPort.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.ports package space.kscience.controls.ports
import io.ktor.network.selector.ActorSelectorManager import io.ktor.network.selector.ActorSelectorManager
import io.ktor.network.sockets.aSocket import io.ktor.network.sockets.aSocket

2
demo/all-things/build.gradle.kts
View File

@ -42,5 +42,5 @@ javafx {
} }
application { application {
mainClass.set("ru.mipt.npm.controls.demo.DemoControllerViewKt") mainClass.set("space.kscience.controls.demo.DemoControllerViewKt")
} }

22
demo/all-things/src/main/kotlin/ru/mipt/npm/controls/demo/DemoControllerView.kt → demo/all-things/src/main/kotlin/space/kscience/controls/demo/DemoControllerView.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.demo package space.kscience.controls.demo
import io.ktor.server.engine.ApplicationEngine import io.ktor.server.engine.ApplicationEngine
import javafx.scene.Parent import javafx.scene.Parent
@ -8,19 +8,19 @@ import javafx.stage.Stage
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.eclipse.milo.opcua.sdk.server.OpcUaServer import org.eclipse.milo.opcua.sdk.server.OpcUaServer
import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText
import ru.mipt.npm.controls.client.connectToMagix
import ru.mipt.npm.controls.demo.DemoDevice.Companion.cosScale
import ru.mipt.npm.controls.demo.DemoDevice.Companion.sinScale
import ru.mipt.npm.controls.demo.DemoDevice.Companion.timeScale
import ru.mipt.npm.controls.manager.DeviceManager
import ru.mipt.npm.controls.manager.install
import ru.mipt.npm.controls.opcua.server.OpcUaServer
import ru.mipt.npm.controls.opcua.server.endpoint
import ru.mipt.npm.controls.opcua.server.serveDevices
import ru.mipt.npm.magix.api.MagixEndpoint import ru.mipt.npm.magix.api.MagixEndpoint
import ru.mipt.npm.magix.rsocket.rSocketWithTcp import ru.mipt.npm.magix.rsocket.rSocketWithTcp
import ru.mipt.npm.magix.rsocket.rSocketWithWebSockets import ru.mipt.npm.magix.rsocket.rSocketWithWebSockets
import ru.mipt.npm.magix.server.startMagixServer import ru.mipt.npm.magix.server.startMagixServer
import space.kscience.controls.client.connectToMagix
import space.kscience.controls.demo.DemoDevice.Companion.cosScale
import space.kscience.controls.demo.DemoDevice.Companion.sinScale
import space.kscience.controls.demo.DemoDevice.Companion.timeScale
import space.kscience.controls.manager.DeviceManager
import space.kscience.controls.manager.install
import space.kscience.controls.opcua.server.OpcUaServer
import space.kscience.controls.opcua.server.endpoint
import space.kscience.controls.opcua.server.serveDevices
import space.kscience.dataforge.context.* import space.kscience.dataforge.context.*
import tornadofx.* import tornadofx.*
import java.awt.Desktop import java.awt.Desktop
@ -32,7 +32,7 @@ class DemoController : Controller(), ContextAware {
var magixServer: ApplicationEngine? = null var magixServer: ApplicationEngine? = null
var visualizer: ApplicationEngine? = null var visualizer: ApplicationEngine? = null
var opcUaServer: OpcUaServer = OpcUaServer { var opcUaServer: OpcUaServer = OpcUaServer {
setApplicationName(LocalizedText.english("ru.mipt.npm.controls.opcua")) setApplicationName(LocalizedText.english("space.kscience.controls.opcua"))
endpoint { endpoint {
setBindPort(9999) setBindPort(9999)
//use default endpoint //use default endpoint

6
demo/all-things/src/main/kotlin/ru/mipt/npm/controls/demo/DemoDevice.kt → demo/all-things/src/main/kotlin/space/kscience/controls/demo/DemoDevice.kt
View File

@ -1,8 +1,8 @@
package ru.mipt.npm.controls.demo package space.kscience.controls.demo
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import ru.mipt.npm.controls.api.metaDescriptor import space.kscience.controls.api.metaDescriptor
import ru.mipt.npm.controls.spec.* import space.kscience.controls.spec.*
import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Context
import space.kscience.dataforge.context.Factory import space.kscience.dataforge.context.Factory
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta

6
demo/all-things/src/main/kotlin/ru/mipt/npm/controls/demo/demoDeviceServer.kt → demo/all-things/src/main/kotlin/space/kscience/controls/demo/demoDeviceServer.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.demo package space.kscience.controls.demo
import io.ktor.server.application.install import io.ktor.server.application.install
import io.ktor.server.cio.CIO import io.ktor.server.cio.CIO
@ -11,10 +11,10 @@ import kotlinx.coroutines.flow.*
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.html.div import kotlinx.html.div
import kotlinx.html.link import kotlinx.html.link
import ru.mipt.npm.controls.api.PropertyChangedMessage
import ru.mipt.npm.controls.client.controlsMagixFormat
import ru.mipt.npm.magix.api.MagixEndpoint import ru.mipt.npm.magix.api.MagixEndpoint
import ru.mipt.npm.magix.api.subscribe import ru.mipt.npm.magix.api.subscribe
import space.kscience.controls.api.PropertyChangedMessage
import space.kscience.controls.client.controlsMagixFormat
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.meta.double import space.kscience.dataforge.meta.double
import space.kscience.plotly.layout import space.kscience.plotly.layout

4
demo/all-things/src/main/kotlin/ru/mipt/npm/controls/demo/generateMessageSchema.kt → demo/all-things/src/main/kotlin/space/kscience/controls/demo/generateMessageSchema.kt
View File

@ -1,8 +1,8 @@
package ru.mipt.npm.controls.demo package space.kscience.controls.demo
//import com.github.ricky12awesome.jss.encodeToSchema //import com.github.ricky12awesome.jss.encodeToSchema
//import com.github.ricky12awesome.jss.globalJson //import com.github.ricky12awesome.jss.globalJson
//import ru.mipt.npm.controls.api.DeviceMessage //import space.kscience.controls.api.DeviceMessage
//fun main() { //fun main() {
// val schema = globalJson.encodeToSchema(DeviceMessage.serializer(), generateDefinitions = false) // val schema = globalJson.encodeToSchema(DeviceMessage.serializer(), generateDefinitions = false)

2
demo/car/build.gradle.kts
View File

@ -47,5 +47,5 @@ javafx {
} }
application { application {
mainClass.set("ru.mipt.npm.controls.demo.car.VirtualCarControllerKt") mainClass.set("space.kscience.controls.demo.car.VirtualCarControllerKt")
} }

6
demo/car/src/main/kotlin/ru/mipt/npm/controls/demo/car/IVirtualCar.kt → demo/car/src/main/kotlin/space/kscience/controls/demo/car/IVirtualCar.kt
View File

@ -1,7 +1,7 @@
package ru.mipt.npm.controls.demo.car package space.kscience.controls.demo.car
import ru.mipt.npm.controls.api.Device import space.kscience.controls.api.Device
import ru.mipt.npm.controls.spec.DeviceSpec import space.kscience.controls.spec.DeviceSpec
interface IVirtualCar : Device { interface IVirtualCar : Device {
var speedState: Vector2D var speedState: Vector2D

6
demo/car/src/main/kotlin/ru/mipt/npm/controls/demo/car/MagixVirtualCar.kt → demo/car/src/main/kotlin/space/kscience/controls/demo/car/MagixVirtualCar.kt
View File

@ -1,11 +1,11 @@
package ru.mipt.npm.controls.demo.car package space.kscience.controls.demo.car
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import ru.mipt.npm.controls.api.PropertyChangedMessage
import ru.mipt.npm.controls.client.controlsMagixFormat
import ru.mipt.npm.magix.api.MagixEndpoint import ru.mipt.npm.magix.api.MagixEndpoint
import ru.mipt.npm.magix.api.subscribe import ru.mipt.npm.magix.api.subscribe
import ru.mipt.npm.magix.rsocket.rSocketWithWebSockets import ru.mipt.npm.magix.rsocket.rSocketWithWebSockets
import space.kscience.controls.api.PropertyChangedMessage
import space.kscience.controls.client.controlsMagixFormat
import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Context
import space.kscience.dataforge.context.Factory import space.kscience.dataforge.context.Factory
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta

6
demo/car/src/main/kotlin/ru/mipt/npm/controls/demo/car/VirtualCar.kt → demo/car/src/main/kotlin/space/kscience/controls/demo/car/VirtualCar.kt
View File

@ -1,13 +1,13 @@
@file:OptIn(ExperimentalTime::class) @file:OptIn(ExperimentalTime::class)
package ru.mipt.npm.controls.demo.car package space.kscience.controls.demo.car
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.datetime.Clock import kotlinx.datetime.Clock
import kotlinx.datetime.Instant import kotlinx.datetime.Instant
import ru.mipt.npm.controls.spec.DeviceBySpec import space.kscience.controls.spec.DeviceBySpec
import ru.mipt.npm.controls.spec.doRecurring import space.kscience.controls.spec.doRecurring
import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Context
import space.kscience.dataforge.context.Factory import space.kscience.dataforge.context.Factory
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta

14
demo/car/src/main/kotlin/ru/mipt/npm/controls/demo/car/VirtualCarController.kt → demo/car/src/main/kotlin/space/kscience/controls/demo/car/VirtualCarController.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.demo.car package space.kscience.controls.demo.car
import io.ktor.server.engine.ApplicationEngine import io.ktor.server.engine.ApplicationEngine
import javafx.beans.property.DoubleProperty import javafx.beans.property.DoubleProperty
@ -8,16 +8,16 @@ import javafx.scene.layout.Priority
import javafx.stage.Stage import javafx.stage.Stage
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import ru.mipt.npm.controls.client.connectToMagix
import ru.mipt.npm.controls.demo.car.IVirtualCar.Companion.acceleration
import ru.mipt.npm.controls.manager.DeviceManager
import ru.mipt.npm.controls.manager.install
import ru.mipt.npm.controls.storage.storeMessages
import ru.mipt.npm.controls.xodus.XodusDeviceMessageStorage
import ru.mipt.npm.magix.api.MagixEndpoint import ru.mipt.npm.magix.api.MagixEndpoint
import ru.mipt.npm.magix.rsocket.rSocketWithTcp import ru.mipt.npm.magix.rsocket.rSocketWithTcp
import ru.mipt.npm.magix.server.startMagixServer import ru.mipt.npm.magix.server.startMagixServer
import ru.mipt.npm.magix.storage.xodus.storeInXodus import ru.mipt.npm.magix.storage.xodus.storeInXodus
import space.kscience.controls.client.connectToMagix
import space.kscience.controls.demo.car.IVirtualCar.Companion.acceleration
import space.kscience.controls.manager.DeviceManager
import space.kscience.controls.manager.install
import space.kscience.controls.storage.storeMessages
import space.kscience.controls.xodus.XodusDeviceMessageStorage
import space.kscience.dataforge.context.* import space.kscience.dataforge.context.*
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta
import tornadofx.* import tornadofx.*

2
demo/echo/build.gradle.kts
View File

@ -28,5 +28,5 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach
} }
application { application {
mainClass.set("ru.mipt.npm.controls.demo.echo.MainKt") mainClass.set("space.kscience.controls.demo.echo.MainKt")
} }

2
demo/echo/src/main/kotlin/ru/mipt/npm/controls/demo/echo/main.kt → demo/echo/src/main/kotlin/space/kscience/controls/demo/echo/main.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.demo.echo package space.kscience.controls.demo.echo
import io.ktor.server.application.log import io.ktor.server.application.log
import kotlinx.coroutines.* import kotlinx.coroutines.*

4
demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterApp.kt
View File

@ -11,11 +11,11 @@ import javafx.scene.layout.VBox
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import ru.mipt.npm.controls.manager.DeviceManager
import ru.mipt.npm.controls.manager.installing
import ru.mipt.npm.devices.pimotionmaster.PiMotionMasterDevice.Axis.Companion.maxPosition import ru.mipt.npm.devices.pimotionmaster.PiMotionMasterDevice.Axis.Companion.maxPosition
import ru.mipt.npm.devices.pimotionmaster.PiMotionMasterDevice.Axis.Companion.minPosition import ru.mipt.npm.devices.pimotionmaster.PiMotionMasterDevice.Axis.Companion.minPosition
import ru.mipt.npm.devices.pimotionmaster.PiMotionMasterDevice.Axis.Companion.position import ru.mipt.npm.devices.pimotionmaster.PiMotionMasterDevice.Axis.Companion.position
import space.kscience.controls.manager.DeviceManager
import space.kscience.controls.manager.installing
import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Context
import space.kscience.dataforge.context.fetch import space.kscience.dataforge.context.fetch
import tornadofx.* import tornadofx.*

8
demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterDevice.kt
View File

@ -11,10 +11,10 @@ import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.sync.withLock
import kotlinx.coroutines.withTimeout import kotlinx.coroutines.withTimeout
import ru.mipt.npm.controls.api.DeviceHub import space.kscience.controls.api.DeviceHub
import ru.mipt.npm.controls.api.PropertyDescriptor import space.kscience.controls.api.PropertyDescriptor
import ru.mipt.npm.controls.ports.* import space.kscience.controls.ports.*
import ru.mipt.npm.controls.spec.* import space.kscience.controls.spec.*
import space.kscience.dataforge.context.* import space.kscience.dataforge.context.*
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.meta.double import space.kscience.dataforge.meta.double

6
demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterVirtualDevice.kt
View File

@ -5,9 +5,9 @@ import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.flow.* import kotlinx.coroutines.flow.*
import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.sync.withLock
import ru.mipt.npm.controls.api.Socket import space.kscience.controls.api.Socket
import ru.mipt.npm.controls.ports.AbstractPort import space.kscience.controls.ports.AbstractPort
import ru.mipt.npm.controls.ports.withDelimiter import space.kscience.controls.ports.withDelimiter
import space.kscience.dataforge.context.* import space.kscience.dataforge.context.*
import kotlin.math.abs import kotlin.math.abs
import kotlin.time.Duration import kotlin.time.Duration

4
demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/fxDeviceProperties.kt
View File

@ -3,8 +3,8 @@ package ru.mipt.npm.devices.pimotionmaster
import javafx.beans.property.ObjectPropertyBase import javafx.beans.property.ObjectPropertyBase
import javafx.beans.property.Property import javafx.beans.property.Property
import javafx.beans.property.ReadOnlyProperty import javafx.beans.property.ReadOnlyProperty
import ru.mipt.npm.controls.api.Device import space.kscience.controls.api.Device
import ru.mipt.npm.controls.spec.* import space.kscience.controls.spec.*
import space.kscience.dataforge.context.info import space.kscience.dataforge.context.info
import space.kscience.dataforge.context.logger import space.kscience.dataforge.context.logger
import tornadofx.* import tornadofx.*

5
gradle.properties
View File

@ -1,11 +1,10 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.mpp.stability.nowarn=true kotlin.mpp.stability.nowarn=true
kotlin.native.ignoreDisabledTargets=true
kotlin.jupyter.add.scanner=false
org.gradle.parallel=true org.gradle.parallel=true
publishing.github=false publishing.github=false
publishing.sonatype=false publishing.sonatype=false
toolsVersion=0.11.5-kotlin-1.7.0-RC toolsVersion=0.11.7-kotlin-1.7.0

8
magix/magix-storage/magix-storage-mongo/src/main/kotlin/ru/mipt/npm/controls/mongo/MongoEventStorage.kt
View File

@ -1,4 +1,4 @@
package ru.mipt.npm.controls.mongo package space.kscience.controls.mongo
import kotlinx.serialization.KSerializer import kotlinx.serialization.KSerializer
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
@ -6,9 +6,9 @@ import org.litote.kmongo.coroutine.CoroutineClient
import org.litote.kmongo.coroutine.coroutine import org.litote.kmongo.coroutine.coroutine
import org.litote.kmongo.coroutine.insertOne import org.litote.kmongo.coroutine.insertOne
import org.litote.kmongo.reactivestreams.KMongo import org.litote.kmongo.reactivestreams.KMongo
import ru.mipt.npm.controls.api.DeviceMessage import space.kscience.controls.api.DeviceMessage
import ru.mipt.npm.controls.api.PropertyChangedMessage import space.kscience.controls.api.PropertyChangedMessage
import ru.mipt.npm.controls.storage.EventStorage import space.kscience.controls.storage.EventStorage
import ru.mipt.npm.magix.server.GenericMagixMessage import ru.mipt.npm.magix.server.GenericMagixMessage
import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Context
import space.kscience.dataforge.context.Factory import space.kscience.dataforge.context.Factory