From 2ea0fc2e3021583aeeaf9f32de851b848d6796e4 Mon Sep 17 00:00:00 2001
From: gabrielburnworth
Date: Fri, 14 Sep 2018 11:32:31 -0700
Subject: [PATCH 1/3] updates to constants
---
webpack/constants.ts | 37 ++++++++++++-------
.../farm_designer/plants/select_plants.tsx | 5 +--
webpack/front_page/create_account.tsx | 2 +-
webpack/sequences/step_tiles/mark_as.tsx | 2 +-
webpack/tos_update/component.tsx | 6 +--
5 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/webpack/constants.ts b/webpack/constants.ts
index 19ca30c30..a6fe7646c 100644
--- a/webpack/constants.ts
+++ b/webpack/constants.ts
@@ -37,7 +37,8 @@ export namespace ToolTips {
few sequences to verify that everything works as expected.`);
export const PIN_BINDINGS =
- trim(`Assign a sequence to execute when a Raspberry Pi GPIO pin is activated.`);
+ trim(`Assign a sequence to execute when a Raspberry Pi GPIO pin is
+ activated.`);
export const PIN_BINDING_WARNING =
trim(`Warning: Binding to a pin without a physical button and
@@ -49,10 +50,10 @@ export namespace ToolTips {
// Hardware Settings: Homing and Calibration
export const HOMING =
- trim(`(Alpha) If encoders or end-stops are enabled, home axis (find zero).`);
+ trim(`If encoders or end-stops are enabled, home axis (find zero).`);
export const CALIBRATION =
- trim(`(Alpha) If encoders or end-stops are enabled, home axis and determine
+ trim(`If encoders or end-stops are enabled, home axis and determine
maximum.`);
export const SET_ZERO_POSITION =
@@ -107,8 +108,8 @@ export namespace ToolTips {
trim(`The number of motor steps required to move the axis one millimeter.`);
export const ALWAYS_POWER_MOTORS =
- trim(`Keep power applied to motors. Prevents slipping from gravity in certain
- situations.`);
+ trim(`Keep power applied to motors. Prevents slipping from gravity in
+ certain situations.`);
export const INVERT_MOTORS =
trim(`Invert direction of motor during calibration.`);
@@ -118,23 +119,23 @@ export namespace ToolTips {
// Hardware Settings: Encoders and Endstops
export const ENABLE_ENCODERS =
- trim(`(Alpha) Enable use of rotary encoders during calibration and homing.`);
+ trim(`Enable use of rotary encoders during calibration and homing.`);
export const ENCODER_POSITIONING =
- trim(`[EXPERIMENTAL] Use encoders for positioning.`);
+ trim(`Use encoders for positioning.`);
export const INVERT_ENCODERS =
- trim(`(Alpha) Reverse the direction of encoder position reading.`);
+ trim(`Reverse the direction of encoder position reading.`);
export const MAX_MISSED_STEPS =
- trim(`(Alpha) Number of steps missed (determined by encoder) before motor is
+ trim(`Number of steps missed (determined by encoder) before motor is
considered to have stalled.`);
export const ENCODER_MISSED_STEP_DECAY =
- trim(`(Alpha) Reduction to missed step total for every good step.`);
+ trim(`Reduction to missed step total for every good step.`);
export const ENCODER_SCALING =
- trim(`(Alpha) encoder scaling factor = 10000 * (motor resolution * microsteps)
+ trim(`encoder scaling factor = 10000 * (motor resolution * microsteps)
/ (encoder resolution).`);
export const ENABLE_ENDSTOPS =
@@ -254,6 +255,12 @@ export namespace ToolTips {
trim(`Snaps a photo using the device camera. Select the camera type on the
Device page.`);
+ export const MARK_AS =
+ trim(`The Mark As step allows FarmBot to programmatically edit the
+ properties of the UTM, plants, and weeds from within a sequence.
+ For example, you can mark a plant as "planted" during a seeding
+ sequence or delete a weed after removing it.`);
+
// Regimens
export const BULK_SCHEDULER =
trim(`Add sequences to your regimen by selecting a sequence from the
@@ -522,8 +529,8 @@ export namespace Content {
click "+" in the Regimens panel to create a new one.`);
export const NO_PARAMETERS = trim(`Can't directly use this sequence in a
- regimen. Consider wrapping it in a parent sequence that calls it via "execute"
- instead."`);
+ regimen. Consider wrapping it in a parent sequence that calls it via
+ "execute" instead.`);
// Farm Designer
export const OUTSIDE_PLANTING_AREA =
@@ -538,6 +545,10 @@ export namespace Content {
trim(`Click and drag to draw a point or use the inputs and press
update. Press CREATE POINT to save, or the back arrow to exit.`);
+ export const BOX_SELECT_DESCRIPTION =
+ trim(`Drag a box around the plants you would like to select.
+ Press the back arrow to exit.`);
+
// Farm Events
export const REGIMEN_TODAY_SKIPPED_ITEM_RISK =
trim(`You are scheduling a regimen to run today. Be aware that
diff --git a/webpack/farm_designer/plants/select_plants.tsx b/webpack/farm_designer/plants/select_plants.tsx
index 05150dca3..69593e671 100644
--- a/webpack/farm_designer/plants/select_plants.tsx
+++ b/webpack/farm_designer/plants/select_plants.tsx
@@ -7,7 +7,7 @@ import { PlantInventoryItem } from "./plant_inventory_item";
import { destroy } from "../../api/crud";
import { BackArrow } from "../../ui/index";
import { unselectPlant } from "../actions";
-import { Actions } from "../../constants";
+import { Actions, Content } from "../../constants";
import { TaggedPlant } from "../map/interfaces";
import { getPlants } from "../state_to_props";
@@ -113,8 +113,7 @@ export class SelectPlants
- {t("Drag a box around the plants you would like to select. " +
- "Press the back arrow to exit.")}
+ {t(Content.BOX_SELECT_DESCRIPTION)}