guh

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 {

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)
 }
 

server/src/services/roverManager.js

@@ -80,19 +80,16 @@ function lockRover(id, locked, actorSocket) {
 }
 
 function getRoster() {
-  return Array.from(rovers.values()).map((record) => {
+  return Array.from(rovers.values()).map((record) => ({
-    const cameraServo = record.meta?.cameraServo ?? record.meta?.CameraServo ?? null;
+    id: record.id,
-    return {
+    name: record.meta?.name || record.id,
-      id: record.id,
+    battery: record.meta?.battery,
-      name: record.meta?.name || record.id,
+    maxWheelSpeed: record.meta?.maxWheelSpeed,
-      battery: record.meta?.battery,
+    media: record.meta?.media,
-      maxWheelSpeed: record.meta?.maxWheelSpeed,
+    cameraServo: record.meta?.cameraServo,
-      media: record.meta?.media,
+    locked: record.locked,
-      cameraServo,
+    lastSeen: record.lastSeen,
-      locked: record.locked,
+  }));
-      lastSeen: record.lastSeen,
-    };
-  });
 }
 
 function broadcastRoster() {