@@ -215,8 +219,9 @@ const LayerToggles = (props: LayerTogglesProps) => {
;
};
-export const MapSettingsContent = (props: SettingsSubMenuProps) =>
-
+export const MapSettingsContent = (props: SettingsSubMenuProps) => {
+ const is3D = props.getConfigValue(BooleanSetting.three_d_garden);
+ return
helpText={Content.MAP_SIZE}>
-
+ }
+ {is3D && ;
+};
const MapSettings = (props: SettingsSubMenuProps) =>
));
});
afterEach(() => {
@@ -64,7 +64,7 @@ describe("
+
+
}
@@ -270,6 +281,7 @@ export function GardenMapLegend(props: GardenMapLegendProps) {
(initialState)
s.threeDTopDownView = payload;
return s;
})
+ .add(Actions.TOGGLE_3D_CAMERA_SELECTION, (s) => {
+ s.threeDCameraSelection = !s.threeDCameraSelection;
+ return s;
+ })
.add(Actions.TOGGLE_3D_EXAGGERATED_Z, (s, { payload }) => {
s.threeDExaggeratedZ = payload;
return s;
diff --git a/frontend/farm_designer/three_d_garden_map.tsx b/frontend/farm_designer/three_d_garden_map.tsx
index 60950c908a..43fee1869d 100644
--- a/frontend/farm_designer/three_d_garden_map.tsx
+++ b/frontend/farm_designer/three_d_garden_map.tsx
@@ -13,7 +13,7 @@ import {
} from "farmbot";
import { CameraCalibrationData, DesignerState } from "./interfaces";
import { GetWebAppConfigValue } from "../config_storage/actions";
-import { BooleanSetting } from "../session_keys";
+import { BooleanSetting, NumericSetting } from "../session_keys";
import { SlotWithTool } from "../resources/interfaces";
import { calcSunCoordinate, ThreeDGardenPlant } from "../three_d_garden/garden";
import { findCrop, findIcon } from "../crops/find";
@@ -25,6 +25,7 @@ import { get3DTime, latLng } from "../three_d_garden/time_travel";
import { parseCalibrationData } from "./map/layers/images/map_image";
import { fetchInterpolationOptions } from "./map/layers/points/interpolation_map";
import { unpackUUID } from "../util";
+import { isTopDown } from "../three_d_garden/helpers";
export interface ThreeDGardenMapProps {
botSize: BotSize;
@@ -76,10 +77,19 @@ export const ThreeDGardenMap = (props: ThreeDGardenMapProps) => {
config.negativeZ = props.negativeZ;
config.exaggeratedZ = props.designer.threeDExaggeratedZ;
+ const getValue = props.get3DConfigValue;
+ config.mirrorX = !!getValue("mirrorX");
+ config.mirrorY = !!getValue("mirrorY");
+ config.bedXOffset = getValue("bedXOffset");
+ config.bedYOffset = getValue("bedYOffset");
+ config.bedZOffset = getValue("bedZOffset");
+
const position = clone(INITIAL_POSITION);
position.x = props.botPosition.x || 0;
position.y = props.botPosition.y || 0;
position.z = props.botPosition.z || 0;
+ if (config.mirrorY) { position.y = gridSize.y - position.y; }
+ if (config.mirrorX) { position.x = gridSize.x - position.x; }
const { designer } = props;
config.distanceIndicator = designer.distanceIndicator;
@@ -89,16 +99,12 @@ export const ThreeDGardenMap = (props: ThreeDGardenMapProps) => {
config.zGantryOffset = fbosConfig("gantry_height");
config.soilHeight = Math.abs(fbosConfig("soil_height"));
- const getValue = props.get3DConfigValue;
config.bedWallThickness = getValue("bedWallThickness");
config.bedHeight = getValue("bedHeight");
config.ccSupportSize = getValue("ccSupportSize");
config.beamLength = getValue("beamLength");
config.columnLength = getValue("columnLength");
config.zAxisLength = getValue("zAxisLength");
- config.bedXOffset = getValue("bedXOffset");
- config.bedYOffset = getValue("bedYOffset");
- config.bedZOffset = getValue("bedZOffset");
config.legSize = getValue("legSize");
config.legsFlush = !!getValue("legsFlush");
config.extraLegsX = getValue("extraLegsX");
@@ -175,10 +181,14 @@ export const ThreeDGardenMap = (props: ThreeDGardenMapProps) => {
config.interpolationUseNearest = options.useNearest;
config.interpolationPower = options.power;
+ config.topDown = isTopDown(props.designer, props.getWebAppConfigValue);
config.zoom = true;
config.pan = true;
- config.rotate = !props.designer.threeDTopDownView;
- config.perspective = !props.designer.threeDTopDownView;
+ config.rotate = !config.topDown;
+ config.perspective = !config.topDown;
+ config.viewpointHeading =
+ parseInt("" + props.getWebAppConfigValue(NumericSetting.viewpoint_heading));
+ config.cameraSelectionView = props.designer.threeDCameraSelection;
const lastCaptureTime = React.useMemo(() => {
const localIds = props.logs
@@ -214,15 +224,15 @@ export const ThreeDGardenMap = (props: ThreeDGardenMapProps) => {
};
export const convertPlants =
- (config: Config, plants: TaggedPlant[]): ThreeDGardenPlant[] =>
+ (_config: Config, plants: TaggedPlant[]): ThreeDGardenPlant[] =>
plants.map(plant => ({
id: plant.body.id,
label: plant.body.name,
icon: findIcon(plant.body.openfarm_slug),
size: plant.body.radius * 2,
spread: findCrop(plant.body.openfarm_slug).spread,
- x: plant.body.x + config.bedXOffset,
- y: plant.body.y + config.bedYOffset,
+ x: plant.body.x,
+ y: plant.body.y,
key: "",
seed: 0,
}));
diff --git a/frontend/farm_events/__tests__/add_farm_event_test.tsx b/frontend/farm_events/__tests__/add_farm_event_test.tsx
index 7535703f4c..56f78e4b13 100644
--- a/frontend/farm_events/__tests__/add_farm_event_test.tsx
+++ b/frontend/farm_events/__tests__/add_farm_event_test.tsx
@@ -198,10 +198,9 @@ describe(");
+ .mockReturnValue(formRef);
const { container } = render();
+ .mockReturnValue(formRef);
const { container } = render();
+ ReturnType);
destroySpy = jest.spyOn(crudModule, "destroy").mockImplementation(jest.fn());
editSpy = jest.spyOn(crudModule, "edit").mockImplementation(jest.fn());
initSpy = jest.spyOn(crudModule, "init").mockImplementation(jest.fn());
@@ -340,7 +340,7 @@ describe("moveSequence", () => {
index: {
references: { [sequence.uuid]: sequence },
}
- } as Everything["resources"],
+ },
};
(store as unknown as { getState: () => DeepPartial }).getState =
() => localState;
diff --git a/frontend/folders/__tests__/component_test.tsx b/frontend/folders/__tests__/component_test.tsx
index 1d71a40cdc..558ba73c65 100644
--- a/frontend/folders/__tests__/component_test.tsx
+++ b/frontend/folders/__tests__/component_test.tsx
@@ -157,7 +157,7 @@ const setStateSync = ),
};
callback?.();
- }) as T["setState"];
+ });
return instance;
};
@@ -836,14 +836,14 @@ describe(") => {
instance.state = { ...instance.state, ...state };
- }) as FrontPage["setState"];
+ });
return instance;
};
@@ -65,9 +65,9 @@ describe("
) => {
instance.state = { ...instance.state, ...state };
- }) as Logs["setState"];
+ });
return instance;
};
diff --git a/frontend/logs/components/__tests__/settings_menu_test.tsx b/frontend/logs/components/__tests__/settings_menu_test.tsx
index d7b9424f8d..7f7fd52bac 100644
--- a/frontend/logs/components/__tests__/settings_menu_test.tsx
+++ b/frontend/logs/components/__tests__/settings_menu_test.tsx
@@ -95,7 +95,7 @@ describe("),
};
callback?.();
- }) as Photos["setState"];
+ });
return instance;
};
diff --git a/frontend/photos/photo_filter_settings/__tests__/image_filter_menu_test.tsx b/frontend/photos/photo_filter_settings/__tests__/image_filter_menu_test.tsx
index 63d6261c46..19e435b9c9 100644
--- a/frontend/photos/photo_filter_settings/__tests__/image_filter_menu_test.tsx
+++ b/frontend/photos/photo_filter_settings/__tests__/image_filter_menu_test.tsx
@@ -44,7 +44,7 @@ beforeEach(() => {
{ length: props.max - props.min + 1 },
(_, index) => props.min + index,
).map(day => {props.labelRenderer(day)})}
-
) as never);
+ {props.children}
) as never);
+ {props.children}
));
designerPanelTopSpy = jest.spyOn(designerPanel, "DesignerPanelTop")
.mockImplementation(((props: React.PropsWithChildren) =>
- {props.children}
) as never);
+ {props.children}
));
designerPanelContentSpy = jest.spyOn(designerPanel, "DesignerPanelContent")
.mockImplementation(((props: React.PropsWithChildren) =>
- {props.children}
) as never);
+ {props.children}
));
activeFarmwareSpy = jest.spyOn(activeFarmware, "setActiveFarmwareByName")
.mockImplementation(jest.fn());
});
diff --git a/frontend/folders/__tests__/actions_test.ts b/frontend/folders/__tests__/actions_test.ts
index 0100643238..9db641704f 100644
--- a/frontend/folders/__tests__/actions_test.ts
+++ b/frontend/folders/__tests__/actions_test.ts
@@ -60,7 +60,7 @@ beforeEach(() => {
stepGetSpy = jest.spyOn(draggableActions, "stepGet")
.mockImplementation(() =>
(() => mockStepGetResult) as unknown as
- ReturnType{target}{content}
) as never);
+ ) => {target}{content}
));
});
afterEach(() => {
diff --git a/frontend/promo/__tests__/plants_test.ts b/frontend/promo/__tests__/plants_test.ts
index 035576743e..d3033d9c60 100644
--- a/frontend/promo/__tests__/plants_test.ts
+++ b/frontend/promo/__tests__/plants_test.ts
@@ -22,7 +22,7 @@ describe("calculatePlantPositions()", () => {
seed: expect.any(Number),
size: 150,
spread: 17.5,
- x: 350,
+ x: 200,
y: 680,
});
expect(positions.length).toEqual(65);
diff --git a/frontend/promo/plants.ts b/frontend/promo/plants.ts
index 21ef640187..a94fb9d187 100644
--- a/frontend/promo/plants.ts
+++ b/frontend/promo/plants.ts
@@ -7,11 +7,11 @@ import { Season, SEASON_DURATIONS } from "./constants";
export const calculatePlantPositions = (config: Config): ThreeDGardenPlant[] => {
const gardenPlants = GARDENS[config.plants] || [];
const positions: ThreeDGardenPlant[] = [];
- const startX = 350;
+ const startX = 200;
let nextX = startX;
let index = 0;
let nextId = 1;
- while (nextX <= config.bedLengthOuter - 100) {
+ while (nextX <= config.bedLengthOuter - 250) {
const plantKey = gardenPlants[index];
const plant = PLANTS[plantKey];
if (!plant) { return []; }
diff --git a/frontend/promo/promo.tsx b/frontend/promo/promo.tsx
index 3f204fbbf3..487a256432 100644
--- a/frontend/promo/promo.tsx
+++ b/frontend/promo/promo.tsx
@@ -16,6 +16,7 @@ import { ThreeDGardenPlant } from "../three_d_garden/garden";
import { TaggedGenericPointer } from "farmbot";
import { calculatePointPositions } from "./points";
import { SEASON_TIMINGS, SEASONS } from "./constants";
+import { isMobile } from "../screen_size";
const PROMO_BED_SIZES = [
{
@@ -29,6 +30,7 @@ const PROMO_BED_SIZES = [
];
type ThreeDPlantsCache = Record
@@ -140,7 +154,7 @@ export const Promo = () => {
) =>
- ) =>
- ) =>
- mockDesignerPanelTop(props)) as never);
+ mockDesignerPanelTop(props)));
mockDesignerPanelTop.mockClear();
});
diff --git a/frontend/resources/reducer_support.ts b/frontend/resources/reducer_support.ts
index ed40a37878..9b5196e744 100644
--- a/frontend/resources/reducer_support.ts
+++ b/frontend/resources/reducer_support.ts
@@ -423,7 +423,7 @@ export function beforeEach(state: RestResources,
const { warning } = require("../toast/toast");
warning(`(${place}) Can't modify account data when in read-only mode.`);
};
- const { kind } = unpackUUID(get(action, "payload.uuid", "x.y.z") as string);
+ const { kind } = unpackUUID(get(action, "payload.uuid", "x.y.z"));
switch (action.type) {
case Actions.EDIT_RESOURCE:
diff --git a/frontend/resources/selectors_by_id.ts b/frontend/resources/selectors_by_id.ts
index 15e1f93f0d..843220e957 100644
--- a/frontend/resources/selectors_by_id.ts
+++ b/frontend/resources/selectors_by_id.ts
@@ -30,7 +30,7 @@ const byId =
const resources = findAll(index, kind);
const f = (x: TaggedResource) => (x.kind === kind) && (x.body.id === id);
// Maybe we should add a throw here?
- return resources.filter(f)[0] as T | undefined;
+ return resources.filter(f)[0];
};
export const findFarmEventById = (ri: ResourceIndex, fe_id: number) => {
diff --git a/frontend/resources/sequence_meta.ts b/frontend/resources/sequence_meta.ts
index e0e054beaa..9500d6bf0e 100644
--- a/frontend/resources/sequence_meta.ts
+++ b/frontend/resources/sequence_meta.ts
@@ -170,7 +170,7 @@ export const determineDropdown =
label: get({
"SavedGarden": t("Garden"),
"PointGroup": t("Group"),
- }, resourceType, resourceType) as string,
+ }, resourceType, resourceType),
value: data_value.args.resource_type,
headingId: "Resource",
};
diff --git a/frontend/saved_gardens/__tests__/garden_snapshot_test.tsx b/frontend/saved_gardens/__tests__/garden_snapshot_test.tsx
index 3bab78fe87..2f7a0509ae 100644
--- a/frontend/saved_gardens/__tests__/garden_snapshot_test.tsx
+++ b/frontend/saved_gardens/__tests__/garden_snapshot_test.tsx
@@ -14,7 +14,7 @@ let axiosPostSpy: jest.SpyInstance;
beforeEach(() => {
axiosPostSpy = jest.spyOn(axios, "post")
- .mockImplementation(() => Promise.resolve({}) as never);
+ .mockImplementation(() => Promise.resolve({}));
snapshotGardenSpy = jest.spyOn(savedGardenActions, "snapshotGarden")
.mockImplementation(jest.fn());
newSavedGardenSpy = jest.spyOn(savedGardenActions, "newSavedGarden")
@@ -82,7 +82,7 @@ describe("
;
- }) as never);
+ }));
});
afterEach(() => {
diff --git a/frontend/sequences/locals_list/__tests__/variable_form_test.tsx b/frontend/sequences/locals_list/__tests__/variable_form_test.tsx
index e3f588e5fa..f72023d545 100644
--- a/frontend/sequences/locals_list/__tests__/variable_form_test.tsx
+++ b/frontend/sequences/locals_list/__tests__/variable_form_test.tsx
@@ -54,7 +54,7 @@ beforeEach(() => {
...e, currentTarget: {
...e.currentTarget, value
}
- } as React.SyntheticEvent{children}
) as never);
+ {children}
));
designerPanelContentSpy = jest.spyOn(designerPanel, "DesignerPanelContent")
.mockImplementation(((
{ children }: React.ComponentProps{children}
) as never);
+ {children}
));
designerPanelTopSpy = jest.spyOn(designerPanel, "DesignerPanelTop")
.mockImplementation(((
props: React.ComponentProps setHovered(true)}
+ onMouseLeave={() => setHovered(false)}
+ hidden={props.hidden}>
+ {props.settingName &&
+ {
+ navigate(linkToSetting(props.settingName, props.pathPrefix));
+ }} />}
+ {props.children}
+
;
+};
+
+/** Wrap highlight-able settings. */
+export const Highlight = (props: HighlightProps) => {
+ const { settingName } = props;
const location = useLocation();
const highlightName = new URLSearchParams(location.search).get("highlight");
const highlightMatch = highlightName &&
compareValues(settingName).includes(highlightName.toLowerCase());
- React.useEffect(() => {
- if (highlightMatch) {
- setHighlightTimestamp(Date.now());
- }
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [location]);
-
- React.useEffect(() => {
- if (!highlightMatch) {
- setHighlightClass("");
- return;
- }
- setHighlightClass("highlight");
- setTimeout(() => setHighlightClass("unhighlight"), 200);
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [highlightTimestamp]);
-
const searchTerm = store.getState().app.settingsSearchTerm;
const isSectionHeader = props.className?.includes("section");
@@ -501,27 +522,16 @@ export const Highlight = (props: HighlightProps) => {
return props.hidden ? !highlightInSection : notHighlighted;
};
- return setHovered(true)}
- onMouseLeave={() => setHovered(false)}
- hidden={searchTerm ? !searchMatch() : hidden()}>
- {settingName &&
- {
- navigate(linkToSetting(settingName, props.pathPrefix));
- }} />}
- {props.children}
-
;
+ const highlightKey = highlightMatch
+ ? `${location.pathname}:${location.search}:${location.hash}`
+ : "no-highlight";
+
+ return
-
,
- position: [
- 0,
- config.bedWidthOuter * .8,
- 300,
- ],
- scale: config.sizePreset == "Genesis XL" ? 6000 : 3000,
- },
- position: [
- threeSpace(config.bedLengthOuter / 2, config.bedLengthOuter),
- threeSpace(config.bedWidthOuter / 2, config.bedWidthOuter),
- 150,
- ],
- camera: {
- narrow: {
+
,
position: [
0,
- -1000,
- config.sizePreset == "Genesis XL" ? 16000 : 8000,
- ],
- target: [
- 0,
- -1000,
- 0,
+ config.bedWidthOuter * .8,
+ 300,
],
+ scale: config.sizePreset == "Genesis XL" ? 6000 : 3000,
},
- wide: {
- position: [
- 0,
- 0,
- config.sizePreset == "Genesis XL" ? 10000 : 5000,
- ],
- target: [
- 0,
- 0,
- 0,
- ],
+ position: [
+ threeSpace(config.bedLengthOuter / 2, config.bedLengthOuter),
+ threeSpace(config.bedWidthOuter / 2, config.bedWidthOuter),
+ 150,
+ ],
+ camera: {
+ narrow: {
+ position: [
+ 0,
+ -1000,
+ config.sizePreset == "Genesis XL" ? 16000 : 8000,
+ ],
+ target: [
+ 0,
+ -1000,
+ 0,
+ ],
+ },
+ wide: {
+ position: [
+ 0,
+ 0,
+ config.sizePreset == "Genesis XL" ? 10000 : 5000,
+ ],
+ target: [
+ 0,
+ 0,
+ 0,
+ ],
+ },
},
},
- },
- {
- label: "Included tools",
- info: {
- description: - FarmBot is well suited to growing a polycrop of many common - garden veggies at the same time. Crops we've had success with include - Bok Choy, Lettuces, Radish, Beets, Chard, Arugula, Broccoli, and much - more. +export const FOCI = (config: Config, configPosition: PositionConfig): Focus[] => { + const get3DPosition = get3DPositionNoMirrorFunc(config); + const utmPosition = get3DPosition({ + x: configPosition.x, + y: configPosition.y + 150, + }); + const electronicsPosition = get3DPosition({ + x: configPosition.x - 50, + y: -200 - config.bedYOffset, + }); + return [ + { + label: "What you can grow", + info: { + description:
+ FarmBot is well suited to growing a polycrop of many common + garden veggies at the same time. Crops we've had success with include + Bok Choy, Lettuces, Radish, Beets, Chard, Arugula, Broccoli, and much + more. +
+
+ By placing vining and other indeterminate crops near the ends + of the bed and training them outwards, you can easily double or + triple the area your plants can utilize while still being maintained + by the FarmBot. - By placing vining and other indeterminate crops near the ends - of the bed and training them outwards, you can easily double or - triple the area your plants can utilize while still being maintained - by the FarmBot. - -
-
,
- position: [
- 0,
- -300,
- 175,
- ],
- scale: 550,
- },
- position: [
- threeSpace(0, config.bedLengthOuter),
- threeSpace(config.bedWidthOuter / 2, config.bedWidthOuter),
- 100,
- ],
- camera: {
- narrow: {
+ referrerPolicy="strict-origin-when-cross-origin"
+ allowFullScreen>
+
+ ,
position: [
- 1100,
- -1150,
- 500,
- ],
- target: [
- 0,
0,
- -325,
+ -300,
+ 175,
],
+ scale: 550,
},
- wide: {
- position: [
- 850,
- -650,
- 350,
- ],
- target: [
- 0,
- 0,
- 0,
- ],
+ position: [
+ threeSpace(0, config.bedLengthOuter),
+ threeSpace(config.bedWidthOuter / 2, config.bedWidthOuter),
+ 100,
+ ],
+ camera: {
+ narrow: {
+ position: [
+ 1100,
+ -1150,
+ 500,
+ ],
+ target: [
+ 0,
+ 0,
+ -325,
+ ],
+ },
+ wide: {
+ position: [
+ 850,
+ -650,
+ 350,
+ ],
+ target: [
+ 0,
+ 0,
+ 0,
+ ],
+ },
},
},
- },
- {
- label: "Universal Tool Mounting",
- info: {
- description: - FarmBot comes with four tools to cover the basics of food production: - the Seed Injector, Watering Nozzle, Soil Sensor, and Rotary Tool. -
-- Also included are the Seed Bin, Seed Tray, Seed Troughs, and the Camera - which remains permanently mounted to the Z-axis. -
- -
-
,
position: [
- 500,
- -300,
- 225,
- ],
- target: [
0,
- -150,
- -100,
- ],
- },
- wide: {
- position: [
- 500,
- -300,
- 225,
- ],
- target: [
+ 75,
0,
- -75,
- -25,
],
+ scale: 400,
},
- },
- },
- {
- label: "Electronics",
- info: {
- description: The Universal Tool Mount (UTM) allows FarmBot to automatically - switch between a variety of lightweight - tools — whichever one is appropriate for the task at hand (seeding, - watering, weeding, etc). Using three neodymium ring magnets, tools - are magnetically held in place during operation, but can be - automatically dismounted in a toolbay when not in use.
+ { + label: "Universal Tool Mounting", + info: { + description:
+
,
- position: [
- 0,
- 75,
- 0,
- ],
- scale: 400,
- },
- position: [
- threeSpace(configPosition.x, config.bedLengthOuter) + config.bedXOffset,
- threeSpace(configPosition.y + 150, config.bedWidthOuter) + config.bedYOffset,
- zZero(config) - zDir(config) * configPosition.z,
- ],
- camera: {
- narrow: {
+ The Universal Tool Mount (UTM) allows FarmBot to automatically + switch between a variety of lightweight + tools — whichever one is appropriate for the task at hand (seeding, + watering, weeding, etc). Using three neodymium ring magnets, tools + are magnetically held in place during operation, but can be + automatically dismounted in a toolbay when not in use.
-Once a tool has been mounted, FarmBot can power it up and communicate - with it using the 12 gold-plated pogo pins inside the UTM. The stock - connections include ground, 5v, 24v, as well as analog and digital I/O. - Meanwhile, the remaining electrical connections are available for - custom tooling such as specialized sensors or low power motorized - implements. Additionally, the three liquid/gas ports provide water, - vacuum air, and an expansion port for custom applications.
+Once a tool has been mounted, FarmBot can power it up and communicate + with it using the 12 gold-plated pogo pins inside the UTM. The stock + connections include ground, 5v, 24v, as well as analog and digital I/O. + Meanwhile, the remaining electrical connections are available for + custom tooling such as specialized sensors or low power motorized + implements. Additionally, the three liquid/gas ports provide water, + vacuum air, and an expansion port for custom applications.
-Because FarmBot is 100% open-source, you can download our - CAD models to start designing your own compatible creations. - Tools can be 3D printed and wired up with common electrical hardware in - just an afternoon.
-Because FarmBot is 100% open-source, you can download our + CAD models to start designing your own compatible creations. + Tools can be 3D printed and wired up with common electrical hardware in + just an afternoon.
+
-
,
position: [
- 0,
- 200,
- 200,
+ utmPosition.x,
+ utmPosition.y,
+ zZero(config) - zDir(config) * configPosition.z,
],
- scale: 550,
+ camera: {
+ narrow: {
+ position: [
+ 500,
+ -300,
+ 225,
+ ],
+ target: [
+ 0,
+ -150,
+ -100,
+ ],
+ },
+ wide: {
+ position: [
+ 500,
+ -300,
+ 225,
+ ],
+ target: [
+ 0,
+ -75,
+ -25,
+ ],
+ },
+ },
},
- position: [
- threeSpace(configPosition.x, config.bedLengthOuter) + config.bedXOffset - 50,
- threeSpace(-200, config.bedWidthOuter),
- config.columnLength - 150,
- ],
- camera: {
- narrow: {
+ {
+ label: "Electronics",
+ info: {
+ description: - FarmBot is powered by the workhorses of the DIY movement: - the Raspberry Pi and a custom designed Arduino we call the - Farmduino. -
-- This custom circuit board includes Trinamic TMC2130 stepper drivers - with built-in quiet mode, an STM32 co-processor for monitoring the - rotary encoders, five 24v peripheral outputs, and an H-bridge for - reversible DC motor control at the UTM. -
-
+
,
position: [
- -200,
- -550,
- 400,
- ],
- target: [
0,
- 100,
- -150,
+ 200,
+ 200,
],
+ scale: 550,
},
- wide: {
- position: [
- -200,
- -550,
- 400,
- ],
- target: [
- 0,
- 100,
- 100,
- ],
+ position: [electronicsPosition.x, electronicsPosition.y, config.columnLength - 150],
+ camera: {
+ narrow: {
+ position: [
+ -200,
+ -550,
+ 400,
+ ],
+ target: [
+ 0,
+ 100,
+ -150,
+ ],
+ },
+ wide: {
+ position: [
+ -200,
+ -550,
+ 400,
+ ],
+ target: [
+ 0,
+ 100,
+ 100,
+ ],
+ },
},
},
- },
- {
- label: "What you need to provide",
- info: {
- description: + FarmBot is powered by the workhorses of the DIY movement: + the Raspberry Pi and a custom designed Arduino we call the + Farmduino. +
++ This custom circuit board includes Trinamic TMC2130 stepper drivers + with built-in quiet mode, an STM32 co-processor for monitoring the + rotary encoders, five 24v peripheral outputs, and an H-bridge for + reversible DC motor control at the UTM. +
+
-
,
- position: [
- 300,
- -300,
- 0,
- ],
- scale: 1000,
- },
- position: [
- threeSpace(config.bedLengthOuter + 700, config.bedLengthOuter),
- threeSpace(config.legSize / 2, config.bedWidthOuter),
- 250 - config.bedZOffset - config.bedHeight,
- ],
- camera: {
- narrow: {
- position: [
- -1200,
- -1000,
- 450,
- ],
- target: [
- -150,
- -150,
- -150,
- ],
- },
- wide: {
+ {
+ label: "What you need to provide",
+ info: {
+ description: - FarmBot must be plugged into a standard 100-265V AC outlet. - The power cable comes with a standard US 3-prong plug (NEMA 5-15P), which - can be used with a plug adapter for installations outside the US. -
-- FarmBot can optionally be powered by - a solar - system with the appropriate battery and inverter. These - components may be purchased from a 3rd party. -
-- FarmBot's water system has a 3/4″ female Garden Hose Thread (GHT) - connection, meaning you can take a standard US garden hose and - screw it into your FarmBot. You will need to provide a hose of - the appropriate length. -
-- FarmBot requires an internet connection and supports both WiFi - and Ethernet. You may need to reposition your WiFi router or - install a repeater to ensure a reliable connection. -
-
+
,
position: [
- -1000,
- -800,
- 600,
- ],
- target: [
- 0,
- -150,
+ 300,
+ -300,
0,
],
+ scale: 1000,
},
- },
- },
- {
- label: "Planter bed",
- info: {
- description: + FarmBot must be plugged into a standard 100-265V AC outlet. + The power cable comes with a standard US 3-prong plug (NEMA 5-15P), which + can be used with a plug adapter for installations outside the US. +
++ FarmBot can optionally be powered by + a solar + system with the appropriate battery and inverter. These + components may be purchased from a 3rd party. +
++ FarmBot's water system has a 3/4″ female Garden Hose Thread (GHT) + connection, meaning you can take a standard US garden hose and + screw it into your FarmBot. You will need to provide a hose of + the appropriate length. +
++ FarmBot requires an internet connection and supports both WiFi + and Ethernet. You may need to reposition your WiFi router or + install a repeater to ensure a reliable connection. +
+
-
,
position: [
- 0,
- -config.bedWidthOuter / 2,
- config.sizePreset == "Genesis XL" ? 1000 : 800,
+ threeSpace(config.bedLengthOuter + 700, config.bedLengthOuter),
+ threeSpace(config.legSize / 2, config.bedWidthOuter),
+ 250 - config.bedZOffset - config.bedHeight,
],
- scale: 1500,
+ camera: {
+ narrow: {
+ position: [
+ -1200,
+ -1000,
+ 450,
+ ],
+ target: [
+ -150,
+ -150,
+ -150,
+ ],
+ },
+ wide: {
+ position: [
+ -1000,
+ -800,
+ 600,
+ ],
+ target: [
+ 0,
+ -150,
+ 0,
+ ],
+ },
+ },
},
- position: [
- threeSpace(config.bedLengthOuter + 50, config.bedLengthOuter),
- 0,
- -config.bedHeight / 2,
- ],
- camera: {
- narrow: {
+ {
+ label: "Planter bed",
+ info: {
+ description: - All FarmBots must be mounted to a raised - bed or similar infrastructure. Neither materials for the bed nor - soil are included with the kits because every installation will be - different, and shipping lumber and soil would be prohibitively expensive. -
-
+
,
position: [
- config.sizePreset == "Genesis XL" ? 9000 : 4500,
- config.sizePreset == "Genesis XL"
- ? -7000
- : -2500 - config.bedWidthOuter / 2,
- 1500,
- ],
- target: [
0,
-config.bedWidthOuter / 2,
- 0,
+ config.sizePreset == "Genesis XL" ? 1000 : 800,
],
+ scale: 1500,
},
- wide: {
- position: [
- 2000,
- config.sizePreset == "Genesis XL" ? -3000 : -2000,
- 800,
- ],
- target: [
- 0,
- -config.bedWidthOuter / 2,
- 500 - config.bedZOffset / 2,
- ],
+ position: [
+ threeSpace(config.bedLengthOuter + 50, config.bedLengthOuter),
+ 0,
+ -config.bedHeight / 2,
+ ],
+ camera: {
+ narrow: {
+ position: [
+ config.sizePreset == "Genesis XL" ? 9000 : 4500,
+ config.sizePreset == "Genesis XL"
+ ? -7000
+ : -2500 - config.bedWidthOuter / 2,
+ 1500,
+ ],
+ target: [
+ 0,
+ -config.bedWidthOuter / 2,
+ 0,
+ ],
+ },
+ wide: {
+ position: [
+ 2000,
+ config.sizePreset == "Genesis XL" ? -3000 : -2000,
+ 800,
+ ],
+ target: [
+ 0,
+ -config.bedWidthOuter / 2,
+ 500 - config.bedZOffset / 2,
+ ],
+ },
},
},
- },
-];
+ ];
+};
export const getFocus = (
config: Config,
diff --git a/frontend/tools/__tests__/tool_slot_edit_components_test.tsx b/frontend/tools/__tests__/tool_slot_edit_components_test.tsx
index 93a009ddd6..556b5fcba7 100644
--- a/frontend/tools/__tests__/tool_slot_edit_components_test.tsx
+++ b/frontend/tools/__tests__/tool_slot_edit_components_test.tsx
@@ -319,7 +319,7 @@ describe("+ All FarmBots must be mounted to a raised + bed or similar infrastructure. Neither materials for the bed nor + soil are included with the kits because every installation will be + different, and shipping lumber and soil would be prohibitively expensive. +
+
-
+ {!is3D &&
;
+};
export const PeripheralsCheck = (props: WizardStepComponentProps) => {
const peripherals = uniq(selectAllPeripherals(props.resources));
diff --git a/frontend/wizard/data.ts b/frontend/wizard/data.ts
index 9ce087a278..45777e1f52 100644
--- a/frontend/wizard/data.ts
+++ b/frontend/wizard/data.ts
@@ -190,6 +190,7 @@ export enum WizardStepSlug {
// eslint-disable-next-line complexity
export const WIZARD_STEPS = (props: WizardStepDataProps): WizardSteps => {
const { firmwareHardware } = props;
+ const is3D = !!props.getConfigValue?.(BooleanSetting.three_d_garden);
const xySwap = !!props.getConfigValue?.(BooleanSetting.xy_swap);
const positiveMovementInstruction = (swap: boolean) =>
swap
@@ -511,18 +512,30 @@ export const WIZARD_STEPS = (props: WizardStepDataProps): WizardSteps => {
component: MapOrientation,
question: t("Does the virtual FarmBot match your real life FarmBot?"),
outcomes: [
- {
- slug: "rotated",
- description: t("The map is rotated incorrectly"),
- tips: "",
- component: RotateMapToggle,
- },
- {
- slug: "incorrectOrigin",
- description: t("The map origin is in a different corner"),
- tips: t("Select the correct map origin."),
- component: SelectMapOrigin,
- },
+ ...(is3D
+ ? []
+ : [{
+ slug: "rotated",
+ description: t("The map is rotated incorrectly"),
+ tips: "",
+ component: RotateMapToggle,
+ }]),
+ ...(is3D
+ ? []
+ : [{
+ slug: "incorrectOrigin",
+ description: t("The map origin is in a different corner"),
+ tips: t("Select the correct map origin."),
+ component: SelectMapOrigin,
+ }]),
+ ...(is3D
+ ? [{
+ slug: "cameraSelection",
+ description: t("The camera location is incorrect"),
+ tips: SetupWizardContent.SET_CAMERA_LOCATION,
+ component: MapOrientation,
+ }]
+ : []),
],
},
{
diff --git a/package.json b/package.json
index 928e547381..88ed025076 100644
--- a/package.json
+++ b/package.json
@@ -38,27 +38,27 @@
"mqtt": "mqtt/dist/mqtt.esm.js"
},
"dependencies": {
- "@blueprintjs/core": "6.11.3",
- "@blueprintjs/select": "6.1.8",
+ "@blueprintjs/core": "6.12.0",
+ "@blueprintjs/select": "6.1.9",
"@monaco-editor/react": "4.7.0",
"@react-spring/three": "10.0.3",
"@react-three/drei": "10.7.7",
- "@react-three/fiber": "9.5.0",
+ "@react-three/fiber": "9.6.0",
"@rollbar/react": "1.0.0",
- "@types/bun": "^1.3.11",
+ "@types/bun": "1.3.13",
"@types/lodash": "4.17.24",
"@types/markdown-it": "14.1.2",
- "@types/markdown-it-emoji": "^3.0.1",
+ "@types/markdown-it-emoji": "3.0.1",
"@types/promise-timeout": "1.3.3",
"@types/react": "19.2.14",
"@types/react-color": "3.0.13",
"@types/react-dom": "19.2.3",
- "@types/react-test-renderer": "^19.1.0",
- "@types/redux-immutable-state-invariant": "^2.1.4",
- "@types/three": "0.183.1",
+ "@types/react-test-renderer": "19.1.0",
+ "@types/redux-immutable-state-invariant": "2.1.4",
+ "@types/three": "0.184.0",
"@types/ws": "8.18.1",
"@xterm/xterm": "6.0.0",
- "axios": "1.14.0",
+ "axios": "1.15.2",
"bowser": "2.14.1",
"browser-speech": "1.1.1",
"delaunator": "5.1.0",
@@ -66,7 +66,7 @@
"farmbot": "15.9.3",
"fengari": "0.1.5",
"fengari-web": "0.1.4",
- "i18next": "26.0.3",
+ "i18next": "26.0.6",
"lodash": "4.18.1",
"markdown-it": "14.1.1",
"markdown-it-emoji": "3.0.0",
@@ -77,24 +77,24 @@
"promise-timeout": "1.3.0",
"punycode": "2.3.1",
"querystring-es3": "0.2.1",
- "react": "19.2.4",
+ "react": "19.2.5",
"react-color": "2.19.3",
- "react-dom": "19.2.4",
+ "react-dom": "19.2.5",
"react-redux": "9.2.0",
- "react-router": "7.14.0",
+ "react-router": "7.14.2",
"redux": "5.0.1",
"redux-immutable-state-invariant": "2.1.0",
"redux-thunk": "3.1.0",
"rollbar": "3.1.0",
"suncalc": "1.9.0",
"takeme": "0.12.0",
- "three": "0.183.2",
- "typescript": "6.0.2",
+ "three": "0.184.0",
+ "typescript": "6.0.3",
"url": "0.11.4"
},
"devDependencies": {
"@eslint/js": "10.0.1",
- "@happy-dom/global-registrator": "20.8.9",
+ "@happy-dom/global-registrator": "20.9.0",
"@react-three/eslint-plugin": "0.1.2",
"@testing-library/dom": "10.4.1",
"@testing-library/jest-dom": "6.9.1",
@@ -104,17 +104,17 @@
"@types/jest": "30.0.0",
"@types/readable-stream": "4.0.23",
"@types/suncalc": "1.9.2",
- "@typescript-eslint/eslint-plugin": "8.58.0",
- "@typescript-eslint/parser": "8.58.0",
- "eslint": "10.2.0",
+ "@typescript-eslint/eslint-plugin": "8.59.0",
+ "@typescript-eslint/parser": "8.59.0",
+ "eslint": "10.2.1",
"eslint-plugin-eslint-comments": "3.2.0",
"eslint-plugin-import": "2.32.0",
- "eslint-plugin-jest": "29.15.1",
+ "eslint-plugin-jest": "29.15.2",
"eslint-plugin-no-null": "1.0.2",
"eslint-plugin-promise": "7.2.1",
"eslint-plugin-react": "7.37.5",
- "eslint-plugin-react-hooks": "7.0.1",
- "happy-dom": "20.8.9",
+ "eslint-plugin-react-hooks": "7.1.1",
+ "happy-dom": "20.9.0",
"jest": "30.3.0",
"jest-canvas-mock": "2.5.2",
"jest-cli": "30.3.0",
@@ -125,14 +125,14 @@
"madge": "8.0.0",
"path-browserify": "1.0.1",
"playwright": "1.59.1",
- "postcss": "^8.5.9",
- "postcss-scss": "^4.0.9",
+ "postcss": "8.5.10",
+ "postcss-scss": "4.0.9",
"raf": "3.4.1",
- "react-test-renderer": "19.2.4",
+ "react-test-renderer": "19.2.5",
"sass": "1.99.0",
"sass-lint": "1.13.1",
- "stylelint": "^17.6.0",
- "stylelint-config-standard-scss": "^17.0.0",
+ "stylelint": "17.8.0",
+ "stylelint-config-standard-scss": "17.0.0",
"ts-jest": "29.4.9",
"tslint": "6.1.3"
}
diff --git a/spec/AGENTS.md b/spec/AGENTS.md
index ab556ccaae..ee1f362fcf 100644
--- a/spec/AGENTS.md
+++ b/spec/AGENTS.md
@@ -5,6 +5,10 @@ For changes to files in the `app/` or `spec/` directories.
- Do not terminate test commands before they are completed.
### For the files you change
+- Make sure all checks and linters pass:
+ ```
+ bun run ruby-check
+ ```
- Run tests via `rspec FILES`
where `FILES` is a space-separated list of spec files for the app files you changed.
For example, `rspec spec/file_0_spec.rb spec/file_1_spec.rb`.
+
+
}