do not use default values for rendering servo; rely on min/max angle

microsoft · Oct 18, 2023 · 279473a · 279473a
1 parent 749f29b
commit 279473a
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 9 deletions.
diff --git a/jacdac-dotnet b/jacdac-dotnet
diff --git a/jacdac-python b/jacdac-python
diff --git a/jacdac-ts b/jacdac-ts
diff --git a/pxt-jacdac b/pxt-jacdac
diff --git a/src/components/dashboard/DashboardServo.tsx b/src/components/dashboard/DashboardServo.tsx
@@ -13,10 +13,11 @@ import { ServoServer } from "../../../jacdac-ts/src/servers/servoserver"
 import { JDService } from "../../../jacdac-ts/src/jdom/service"
 import ServoWidget from "../widgets/ServoWidget"
 import useRegister from "../hooks/useRegister"
+import DashboardRegisterValueFallback from "./DashboardRegisterValueFallback"
 
 function useActualAngle(service: JDService, visible: boolean) {
     const angleRegister = useRegister(service, ServoReg.Angle)
-    const [angle = 90] = useRegisterUnpackedValue<[number]>(angleRegister, {
+    const [angle] = useRegisterUnpackedValue<[number]>(angleRegister, {
         visible,
     })
     const actualAngleRegister = useRegister(service, ServoReg.ActualAngle)
@@ -52,25 +53,33 @@ export default function DashboardServo(props: DashboardServiceProps) {
         props
     )
     const minAngleRegister = useRegister(service, ServoReg.MinAngle)
-    const [minAngle = -90] = useRegisterUnpackedValue<[number]>(
+    const [minAngle] = useRegisterUnpackedValue<[number]>(
         minAngleRegister,
         props
     )
     const maxAngleRegister = useRegister(service, ServoReg.MaxAngle)
-    const [maxAngle = 90] = useRegisterUnpackedValue<[number]>(
+    const [maxAngle] = useRegisterUnpackedValue<[number]>(
         maxAngleRegister,
         props
     )
     const responseSpeedRegister = useRegister(service, ServoReg.ResponseSpeed)
     const [responseSpeed = SG90_RESPONSE_SPEED] = useRegisterUnpackedValue<
         [number]
     >(responseSpeedRegister, { visible })
+    const server = useServiceServer<ServoServer>(service)
+
+    if (angle === undefined)
+        return <DashboardRegisterValueFallback register={angleRegister} />
+    if (minAngle === undefined)
+        return <DashboardRegisterValueFallback register={minAngleRegister} />
+    if (maxAngle === undefined)
+        return <DashboardRegisterValueFallback register={maxAngleRegister} />
+
     const rotationalSpeed = 60 / responseSpeed
 
     const continuous = /cont=1/.test(clientVariant)
     const throttle = ((angle - minAngle) / (maxAngle - minAngle)) * 200 - 100
 
-    const server = useServiceServer<ServoServer>(service)
     const color = server ? "secondary" : "primary"
 
     const toggleOff = () => enabledRegister.sendSetBoolAsync(!enabled, true)
@@ -104,7 +113,11 @@ export default function DashboardServo(props: DashboardServiceProps) {
                     enabled={enabled}
                     toggleOff={toggleOff}
                     widgetSize={widgetSize}
-                    rotationRate={continuous ? (throttle * rotationalSpeed) / 100 : undefined}
+                    rotationRate={
+                        continuous
+                            ? (throttle * rotationalSpeed) / 100
+                            : undefined
+                    }
                     visible={visible}
                 />
             </Grid>

diff --git a/src/components/hooks/useThrottledValue.ts b/src/components/hooks/useThrottledValue.ts
@@ -17,6 +17,11 @@ export default function useThrottledValue(
                 return false
             }
 
+            // not a value yet
+            if (isNaN(value)) {
+                return false
+            }
+
             // increment towards value
             const dt = time / 1000 // s
             const error = value - animated
+2 −2		Jacdac/Clients/RealTimeClockClient.g.cs
+2 −2		Jacdac/Clients/ServoClient.g.cs
+1 −1		Jacdac/Constants/RealtimeclockConstants.g.cs
+2 −2		Jacdac/Constants/ServoConstants.g.cs
+2 −2		jacdac/real_time_clock/client.py
+2 −2		jacdac/servo/client.py
+14 −14		real-time-clock/client.g.ts
+1 −1		real-time-clock/constants.ts
+2 −2		servo/constants.ts