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

Fix naming

Browse Source
This commit is contained in:
Максим Колпаков 2024-12-19 03:40:24 +03:00
parent 7cde308114
commit e9e2c7b8d8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@ import kotlinx.coroutines.sync.withLock
import kotlinx.coroutines.withTimeout import kotlinx.coroutines.withTimeout
import space.kscience.controls.api.DeviceHub import space.kscience.controls.api.DeviceHub
import space.kscience.controls.api.PropertyDescriptor import space.kscience.controls.api.PropertyDescriptor
import space.kscience.controls.api.PropertyDescriptorBuilder
import space.kscience.controls.misc.asMeta import space.kscience.controls.misc.asMeta
import space.kscience.controls.misc.duration import space.kscience.controls.misc.duration
import space.kscience.controls.ports.AsynchronousPort import space.kscience.controls.ports.AsynchronousPort
@ -235,7 +236,7 @@ class PiMotionMasterDevice(
private fun axisBooleanProperty( private fun axisBooleanProperty(
command: String, command: String,
descriptorBuilder: PropertyDescriptor.() -> Unit = {}, descriptorBuilder: PropertyDescriptorBuilder.() -> Unit = {},
) = mutableBooleanProperty( ) = mutableBooleanProperty(
read = { read = {
readAxisBoolean("$command?") readAxisBoolean("$command?")
@ -248,7 +249,7 @@ class PiMotionMasterDevice(
private fun axisNumberProperty( private fun axisNumberProperty(
command: String, command: String,
descriptorBuilder: PropertyDescriptor.() -> Unit = {}, descriptorBuilder: PropertyDescriptorBuilder.() -> Unit = {},
) = mutableDoubleProperty( ) = mutableDoubleProperty(
read = { read = {
mm.requestAndParse("$command?", axisId)[axisId]?.toDoubleOrNull() mm.requestAndParse("$command?", axisId)[axisId]?.toDoubleOrNull()