fix 3D layer toggles and support demo pin readings

gabrielburnworth · gabrielburnworth · commit 4b0d8063dfda · 2025-11-12T14:49:46.000-08:00
diff --git a/frontend/demo/lua_runner/__tests__/index_test.ts b/frontend/demo/lua_runner/__tests__/index_test.ts
@@ -1410,6 +1410,15 @@ describe("runDemoLuaCode()", () => {
     expect(error).not.toHaveBeenCalled();
     expect(console.log).toHaveBeenCalledWith("0");
     expect(info).not.toHaveBeenCalled();
+    expect(initSave).toHaveBeenCalledWith("SensorReading", {
+      pin: 5,
+      mode: 1,
+      x: 1,
+      y: 2,
+      z: 0,
+      value: 0,
+      read_at: expect.any(String),
+    });
   });
 
   it("runs move_relative", () => {
diff --git a/frontend/demo/lua_runner/actions.ts b/frontend/demo/lua_runner/actions.ts
@@ -235,6 +235,18 @@ export const expandActions = (
           setCurrent(homeTarget);
         });
         break;
+      case "read_pin":
+        const pin = action.args[0] as number;
+        expanded.push({
+          type: "sensor_reading",
+          args: [
+            pin,
+            current.x,
+            current.y,
+            current.z,
+          ],
+        });
+        break;
       default:
         expanded.push(action);
         break;
@@ -361,6 +373,18 @@ export const runActions = (
               payload: action.args[0] as number,
             });
           };
+        case "sensor_reading":
+          return () => {
+            store.dispatch(initSave("SensorReading", {
+              pin: action.args[0] as number,
+              mode: 1,
+              x: action.args[1] as number,
+              y: action.args[2] as number,
+              z: action.args[3] as number,
+              value: random(0, 1024),
+              read_at: (new Date()).toISOString(),
+            }) as unknown as UnknownAction);
+          };
         case "write_pin":
           const pin = action.args[0] as number;
           const mode = action.args[1] as string;
diff --git a/frontend/demo/lua_runner/interfaces.ts b/frontend/demo/lua_runner/interfaces.ts
@@ -8,6 +8,8 @@ export interface Action {
     | "move"
     | "_move"
     | "toggle_pin"
+    | "read_pin"
+    | "sensor_reading"
     | "emergency_lock"
     | "emergency_unlock"
     | "find_home"
diff --git a/frontend/demo/lua_runner/run.ts b/frontend/demo/lua_runner/run.ts
@@ -536,6 +536,7 @@ export const runLua =
         jsToLua(L, toolMounted ? 0 : 1);
         return 1;
       }
+      actions.push({ type: "read_pin", args: [pin] });
       jsToLua(L, 0);
       return 1;
     });
diff --git a/frontend/devices/__tests__/actions_test.ts b/frontend/devices/__tests__/actions_test.ts
@@ -610,13 +610,24 @@ describe("pinToggle()", () => {
 });
 
 describe("readPin()", () => {
+  afterEach(() => {
+    localStorage.removeItem("myBotIs");
+  });
+
   it("calls readPin", async () => {
     await actions.readPin(1, "label", 0);
     expect(mockDevice.current.readPin).toHaveBeenCalledWith({
       pin_number: 1, label: "label", pin_mode: 0,
     });
     expect(success).not.toHaveBeenCalled();
   });
+
+  it("reads demo account pin", async () => {
+    localStorage.setItem("myBotIs", "online");
+    await actions.readPin(1, "label", 0);
+    expect(mockDevice.current.readPin).not.toHaveBeenCalled();
+    expect(runDemoLuaCode).toHaveBeenCalledWith("read_pin(1)");
+  });
 });
 
 describe("writePin()", () => {
diff --git a/frontend/devices/actions.ts b/frontend/devices/actions.ts
@@ -447,7 +447,10 @@ export function readPin(
   pin_number: number, label: string, pin_mode: ALLOWED_PIN_MODES,
 ) {
   const noun = t("Read pin");
-  maybeNoop();
+  if (forceOnline()) {
+    runDemoLuaCode(`read_pin(${pin_number})`);
+    return;
+  }
   return getDevice()
     .readPin({ pin_number, label, pin_mode })
     .then(maybeNoop, commandErr(noun));
diff --git a/frontend/farm_designer/map/legend/garden_map_legend.tsx b/frontend/farm_designer/map/legend/garden_map_legend.tsx
@@ -129,8 +129,8 @@ interface LayerTogglesProps extends GardenMapLegendProps { }
 const LayerToggles = (props: LayerTogglesProps) => {
   const { toggle, getConfigValue, dispatch, firmwareConfig } = props;
   const subMenuProps = { dispatch, getConfigValue, firmwareConfig };
-  const only2DClass =
-    getConfigValue(BooleanSetting.three_d_garden) ? "disabled" : "";
+  const is3D = getConfigValue(BooleanSetting.three_d_garden);
+  const only2DClass = is3D ? "disabled" : "";
   return <div className="toggle-buttons">
     <LayerToggle
       settingName={BooleanSetting.show_plants}
@@ -144,12 +144,12 @@ const LayerToggles = (props: LayerTogglesProps) => {
       value={props.showPoints}
       label={DeviceSetting.showPoints}
       onClick={toggle(BooleanSetting.show_points)} />
-    <LayerToggle
-      className={only2DClass}
-      settingName={BooleanSetting.show_soil_interpolation_map}
-      value={props.showSoilInterpolationMap}
-      label={DeviceSetting.showSoil}
-      onClick={toggle(BooleanSetting.show_soil_interpolation_map)} />
+    {!is3D &&
+      <LayerToggle
+        settingName={BooleanSetting.show_soil_interpolation_map}
+        value={props.showSoilInterpolationMap}
+        label={DeviceSetting.showSoil}
+        onClick={toggle(BooleanSetting.show_soil_interpolation_map)} />}
     <LayerToggle
       settingName={BooleanSetting.show_weeds}
       value={props.showWeeds}
@@ -205,7 +205,6 @@ const LayerToggles = (props: LayerTogglesProps) => {
       onClick={toggle(BooleanSetting.show_zones)} />
     {props.hasSensorReadings &&
       <LayerToggle
-        className={only2DClass}
         settingName={BooleanSetting.show_sensor_readings}
         value={props.showSensorReadings}
         label={DeviceSetting.showReadings}
diff --git a/frontend/three_d_garden/bed/__tests__/bed_test.tsx b/frontend/three_d_garden/bed/__tests__/bed_test.tsx
@@ -104,6 +104,7 @@ describe("<Bed />", () => {
     getZ: () => 0,
     showMoistureMap: true,
     sensorReadings: [],
+    showMoistureReadings: true,
   });
 
   it("renders bed", () => {
diff --git a/frontend/three_d_garden/bed/bed.tsx b/frontend/three_d_garden/bed/bed.tsx
@@ -110,6 +110,7 @@ export interface BedProps {
   soilSurfaceGeometry: BufferGeometry;
   moistureSurfaceGeometry: BufferGeometry;
   showMoistureMap: boolean;
+  showMoistureReadings: boolean;
   sensorReadings: TaggedSensorReading[];
 }
 
@@ -249,9 +250,11 @@ export const Bed = (props: BedProps) => {
     <MoistureTexture
       config={props.config}
       sensorReadings={props.sensorReadings}
+      showMoistureReadings={props.showMoistureReadings}
       geometry={props.moistureSurfaceGeometry} />, [
     props.config,
     props.sensorReadings,
+    props.showMoistureReadings,
     props.moistureSurfaceGeometry,
   ]);
 
@@ -393,6 +396,7 @@ export const Bed = (props: BedProps) => {
       <MoistureSurface
         geometry={props.moistureSurfaceGeometry}
         sensorReadings={props.sensorReadings}
+        showMoistureReadings={true}
         config={props.config}
         color={"black"}
         radius={50}
diff --git a/frontend/three_d_garden/garden/__tests__/moisture_texture_test.tsx b/frontend/three_d_garden/garden/__tests__/moisture_texture_test.tsx
@@ -10,10 +10,18 @@ describe("<MoistureTexture />", () => {
     config: clone(INITIAL),
     geometry: new BufferGeometry(),
     sensorReadings: [],
+    showMoistureReadings: true,
   });
 
   it("renders", () => {
     const { container } = render(<MoistureTexture {...fakeProps()} />);
     expect(container).toContainHTML("render-texture");
   });
+
+  it("renders without readings", () => {
+    const p = fakeProps();
+    p.showMoistureReadings = false;
+    const { container } = render(<MoistureTexture {...p} />);
+    expect(container).toContainHTML("render-texture");
+  });
 });
diff --git a/frontend/three_d_garden/garden/moisture_texture.tsx b/frontend/three_d_garden/garden/moisture_texture.tsx
@@ -12,6 +12,7 @@ export interface MoistureTextureProps {
   config: Config;
   geometry: BufferGeometry;
   sensorReadings: TaggedSensorReading[];
+  showMoistureReadings: boolean;
 }
 
 export const MoistureTexture = (props: MoistureTextureProps) => {
@@ -36,6 +37,7 @@ export const MoistureTexture = (props: MoistureTextureProps) => {
       color={"black"}
       radius={10}
       sensorReadings={props.sensorReadings}
+      showMoistureReadings={props.showMoistureReadings}
       position={[
         props.config.bedXOffset,
         props.config.bedYOffset,
@@ -53,16 +55,18 @@ export interface MoistureSurfaceProps {
   color: string;
   radius: number;
   readingZOverride?: number;
+  showMoistureReadings: boolean;
 }
 
 export const MoistureSurface = (props: MoistureSurfaceProps) =>
   <Group position={props.position}>
-    <MoistureReadings
-      config={props.config}
-      color={props.color}
-      radius={props.radius}
-      readingZOverride={props.readingZOverride}
-      readings={props.sensorReadings} />
+    {props.showMoistureReadings &&
+      <MoistureReadings
+        config={props.config}
+        color={props.color}
+        radius={props.radius}
+        readingZOverride={props.readingZOverride}
+        readings={props.sensorReadings} />}
     <Mesh geometry={props.geometry} position={[0, 0, -zZero(props.config)]}>
       <HeightMaterial
         min={0}
diff --git a/frontend/three_d_garden/garden_model.tsx b/frontend/three_d_garden/garden_model.tsx
@@ -125,6 +125,8 @@ export const GardenModel = (props: GardenModelProps) => {
 
   const showMoistureMap = !!props.addPlantProps?.getConfigValue(
     BooleanSetting.show_moisture_interpolation_map);
+  const showMoistureReadings = !!props.addPlantProps?.getConfigValue(
+    BooleanSetting.show_sensor_readings);
 
   // eslint-disable-next-line no-null/no-null
   const skyRef = React.useRef<ThreeMeshBasicMaterial>(null);
@@ -182,6 +184,7 @@ export const GardenModel = (props: GardenModelProps) => {
       mapPoints={props.mapPoints || []}
       moistureSurfaceGeometry={moistureSurface.geometry}
       showMoistureMap={showMoistureMap}
+      showMoistureReadings={showMoistureReadings}
       sensorReadings={props.sensorReadings || []}
       addPlantProps={addPlantProps} />
     {showMoistureMap && props.config.moistureDebug &&

Original file line number	Diff line number	Diff line change
`@@ -536,6 +536,7 @@ export const runLua =`
`536`	`536`	`jsToLua(L, toolMounted ? 0 : 1);`
`537`	`537`	`return 1;`
`538`	`538`	`}`
	`539`	`+ actions.push({ type: "read_pin", args: [pin] });`
`539`	`540`	`jsToLua(L, 0);`
`540`	`541`	`return 1;`
`541`	`542`	`});`