From e9e2c7b8d89c005332ff5d816f521736b28ce6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=BE=D0=BB=D0=BF=D0=B0=D0=BA=D0=BE=D0=B2=20=D0=9C?= =?UTF-8?q?=D0=B0=D0=BA=D1=81=D0=B8=D0=BC?= Date: Thu, 19 Dec 2024 03:40:24 +0300 Subject: [PATCH] Fix naming --- .../mipt/npm/devices/pimotionmaster/PiMotionMasterDevice.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterDevice.kt b/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterDevice.kt index 4324b9b..4108e7d 100644 --- a/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterDevice.kt +++ b/demo/motors/src/main/kotlin/ru/mipt/npm/devices/pimotionmaster/PiMotionMasterDevice.kt @@ -12,6 +12,7 @@ import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withTimeout import space.kscience.controls.api.DeviceHub import space.kscience.controls.api.PropertyDescriptor +import space.kscience.controls.api.PropertyDescriptorBuilder import space.kscience.controls.misc.asMeta import space.kscience.controls.misc.duration import space.kscience.controls.ports.AsynchronousPort @@ -235,7 +236,7 @@ class PiMotionMasterDevice( private fun axisBooleanProperty( command: String, - descriptorBuilder: PropertyDescriptor.() -> Unit = {}, + descriptorBuilder: PropertyDescriptorBuilder.() -> Unit = {}, ) = mutableBooleanProperty( read = { readAxisBoolean("$command?") @@ -248,7 +249,7 @@ class PiMotionMasterDevice( private fun axisNumberProperty( command: String, - descriptorBuilder: PropertyDescriptor.() -> Unit = {}, + descriptorBuilder: PropertyDescriptorBuilder.() -> Unit = {}, ) = mutableDoubleProperty( read = { mm.requestAndParse("$command?", axisId)[axisId]?.toDoubleOrNull()