Upgrade FBJS, add "none" firmware option

pull/1267/head
Rick Carlino 2019-07-12 08:42:34 -05:00
parent 8f99ec3d1f
commit faa4888dec
4 changed files with 17 additions and 7 deletions

View File

@ -272,7 +272,7 @@ export function fakeWebAppConfig(): TaggedWebAppConfig {
updated_at: "2018-01-22T15:32:41.970Z",
confirm_plant_deletion: true,
confirm_step_deletion: false,
// confirm_sequence_deletion: true,
confirm_sequence_deletion: true,
disable_animations: false,
disable_i18n: false,
display_trail: false,

View File

@ -17,17 +17,19 @@ const FARMDUINO_K14 = {
const EXPRESS_K10 = {
label: "Farmduino (Express v1.0)", value: "express_k10"
};
const NONE = { label: "None", value: "none" };
export const FIRMWARE_CHOICES_DDI = {
[ARDUINO.value]: ARDUINO,
[FARMDUINO.value]: FARMDUINO,
[FARMDUINO_K14.value]: FARMDUINO_K14,
[EXPRESS_K10.value]: EXPRESS_K10,
[NONE.value]: NONE
};
export const isFwHardwareValue = (x?: unknown): x is FirmwareHardware => {
const values: FirmwareHardware[] = [
"arduino", "farmduino", "farmduino_k14", "express_k10"];
const values: FirmwareHardware[] =
["arduino", "farmduino", "farmduino_k14", "express_k10", "none"];
return !!values.includes(x as FirmwareHardware);
};
@ -77,8 +79,14 @@ export class BoardType extends React.Component<BoardTypeProps, BoardTypeState> {
get firmwareChoices() {
const { shouldDisplay } = this.props;
return [ARDUINO, FARMDUINO, FARMDUINO_K14,
...(shouldDisplay(Feature.express_k10) ? [EXPRESS_K10] : [])];
const others = shouldDisplay(Feature.express_k10) ? [EXPRESS_K10] : [];
return [
ARDUINO,
FARMDUINO_K14,
FARMDUINO,
NONE,
...others
];
}
get firmwareVersion() {
@ -97,6 +105,8 @@ export class BoardType extends React.Component<BoardTypeProps, BoardTypeState> {
return FIRMWARE_CHOICES_DDI["farmduino_k14"];
case "express_k10":
return FIRMWARE_CHOICES_DDI["express_k10"];
case "none":
return FIRMWARE_CHOICES_DDI["none"];
case "unknown":
// If unknown/disconnected, display API FirmwareHardware value if valid
return (this.sending && this.apiValue)

View File

@ -31,7 +31,7 @@ export const BooleanSetting: Record<BooleanConfigKey, BooleanConfigKey> = {
/** Sequence settings */
confirm_step_deletion: "confirm_step_deletion",
// confirm_sequence_deletion: "confirm_sequence_deletion",
confirm_sequence_deletion: "confirm_sequence_deletion",
show_pins: "show_pins",
expand_step_options: "expand_step_options",
discard_unsaved_sequences: "discard_unsaved_sequences",

View File

@ -44,7 +44,7 @@
"coveralls": "3.0.4",
"enzyme": "3.10.0",
"enzyme-adapter-react-16": "1.14.0",
"farmbot": "8.0.1-rc8",
"farmbot": "8.0.1-rc9",
"i18next": "17.0.6",
"jest": "24.8.0",
"jest-cli": "24.8.0",