From a580563be5119d95ca837e5a82a0d535f8a7d10e Mon Sep 17 00:00:00 2001
From: legop3 <minecratfd8@gmail.com>
Date: Mon, 17 Nov 2025 19:13:02 -0500
Subject: [PATCH] guh

---
 dist/servoverifier                  | Bin 1769656 -> 1769656 bytes
 pi/roverd/command.go                |   2 +-
 pi/roverd/wsclient.go               |   1 +
 server/src/services/roverManager.js |  23 ++++++++++-------------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/dist/servoverifier b/dist/servoverifier
index aa571436eb614203190d103c9a3b0ba10b2612b6..a4519f285931b7bef2da66468bea406227b4bb07 100755
GIT binary patch
delta 369
zcmdndn6slXXF~_SX0ds0j!#CUXGyVVs*{sprfEq@m3~2JV0LD5VVR#ruye6_MUii|
zY1QP7{9=}tRV4+1S;pZW$x#u`h2_~E?xm>=EDQ_`B0$Ux#O{8f3@hG>Y<HU7v6z4T
zhxYB4>b9}%<5O=EXcJ&;6JTl+U~Us&X%k>=6JTo-U~d!PXcORU6X0qS;BFJ(X%paW
z6X0tT;BONU*d`z-@8NA}nw*wuVrpuhY-Ev=W|5YZVrgz<k!YNhY?7LoW@%(-kY-?F
zVPVOYRGOKS!daGFtXGnmn`&!hU}UOmXsByw5n^CqWngAyY}%d`Aqd1mKr9TzB0ww(
f#9}}!4#X1MvmzveS5ni)=|CIxwwp0YHT?qsdcbbU

delta 369
zcmdndn6slXXF~_SW~7%{fU{eEK}1SwWnhk1X-I}=g}z6AX_CLIi*9O2d~RW~MWlCB
zdgSDd{9=}op&n&{VId{%nU%&)#V*d4VZ}KNEDQ_`B0$Ux#O{8f3@I-;0y3(jH~T)g
z`SP{M9f^;&@zqTNZ32vK0!(cJ%xwZJZ33)q0&Hyp>}>)ZZ33Ka0$gnZ+-(9pZ34V)
z0(@-({A~gP+XMvVJ-iJp4bsxmQjJZ`%#w{#jZ7_)l1x*Ll8w?#jZKrx%*~UN6D^WV
z4HCJMN;7j(ILnfY^-3~xQ*Dh5j7)V64RsC8LyU~AOf0Mn4BN9J1c6uxh=qYz1c*g}
eSPY28fmmXDR)l2mN^06T9cZK8b~7farhfplpKfIU

diff --git a/pi/roverd/command.go b/pi/roverd/command.go
index 1306e98b..c29f2eca 100644
--- a/pi/roverd/command.go
+++ b/pi/roverd/command.go
@@ -6,7 +6,7 @@ type helloMessage struct {
 	Battery       BatteryConfig     `json:"battery"`
 	MaxWheelSpeed int               `json:"maxWheelSpeed"`
 	Media         MediaConfig       `json:"media"`
-	CameraServo   CameraServoConfig `json:"cameraServo,omitempty"`
+	CameraServo   CameraServoConfig `json:"cameraServo"`
 }
 
 type sensorMessage struct {
diff --git a/pi/roverd/wsclient.go b/pi/roverd/wsclient.go
index c161d527..b50bfcdc 100644
--- a/pi/roverd/wsclient.go
+++ b/pi/roverd/wsclient.go
@@ -72,6 +72,7 @@ func (c *WSClient) sendHello(ctx context.Context, conn *websocket.Conn) error {
 		Media:         c.cfg.Media,
 		CameraServo:   c.cfg.CameraServo,
 	}
+	c.log.Printf("sending hello (camera servo enabled=%v pin=%d)", msg.CameraServo.Enabled, msg.CameraServo.Pin)
 	return writeJSON(ctx, conn, msg)
 }
 
diff --git a/server/src/services/roverManager.js b/server/src/services/roverManager.js
index 40b14562..8e723d0d 100644
--- a/server/src/services/roverManager.js
+++ b/server/src/services/roverManager.js
@@ -80,19 +80,16 @@ function lockRover(id, locked, actorSocket) {
 }
 
 function getRoster() {
-  return Array.from(rovers.values()).map((record) => {
-    const cameraServo = record.meta?.cameraServo ?? record.meta?.CameraServo ?? null;
-    return {
-      id: record.id,
-      name: record.meta?.name || record.id,
-      battery: record.meta?.battery,
-      maxWheelSpeed: record.meta?.maxWheelSpeed,
-      media: record.meta?.media,
-      cameraServo,
-      locked: record.locked,
-      lastSeen: record.lastSeen,
-    };
-  });
+  return Array.from(rovers.values()).map((record) => ({
+    id: record.id,
+    name: record.meta?.name || record.id,
+    battery: record.meta?.battery,
+    maxWheelSpeed: record.meta?.maxWheelSpeed,
+    media: record.meta?.media,
+    cameraServo: record.meta?.cameraServo,
+    locked: record.locked,
+    lastSeen: record.lastSeen,
+  }));
 }
 
 function broadcastRoster() {