Skip to content

Commit

Permalink
remove firmware log toggles
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielburnworth committed May 18, 2021
1 parent c136fe1 commit 48e7d02
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 76 deletions.
19 changes: 0 additions & 19 deletions frontend/constants.ts
Expand Up @@ -584,19 +584,6 @@ export namespace ToolTips {

export const SEQUENCE_LOG_END =
trim(`Send a log message upon the end of sequence execution.`);

export const FIRMWARE_LOG_SENT =
trim(`Log all commands sent to firmware. Messages will disappear upon
refresh. Automatically disabled after 5 minutes.`);

export const FIRMWARE_LOG_RECEIVED =
trim(`Log all responses received from firmware. Warning: extremely
verbose. Messages will disappear upon refresh. Automatically disabled
after 5 minutes.`);

export const FIRMWARE_DEBUG_MESSAGES =
trim(`Log all debug messages received from firmware. Messages will
disappear upon refresh.`);
}

export namespace Content {
Expand Down Expand Up @@ -1644,12 +1631,6 @@ export enum DeviceSetting {
enableSequenceStepLogs = `Enable sequence step logs`,
sequenceCompleteLogs = `Complete`,
enableSequenceCompleteLogs = `Enable sequence complete logs`,
firmwareSentLogs = `Sent`,
enableFirmwareSentLogs = `Enable firmware sent logs`,
firmwareReceivedLogs = `Received`,
enableFirmwareReceivedLogs = `Enable firmware received logs`,
firmwareDebugLogs = `Debug`,
enableFirmwareDebugLogs = `Enable firmware debug logs`,

// App
internationalizeWebApp = `Internationalize Web App`,
Expand Down
10 changes: 0 additions & 10 deletions frontend/logs/components/__tests__/settings_menu_test.tsx
Expand Up @@ -47,12 +47,6 @@ describe("<LogsSettingsMenu />", () => {
expect(wrapper.text().toLowerCase()).not.toContain("firmware");
});

it("displays firmware log settings", () => {
mockDev = true;
const wrapper = mount(<LogsSettingsMenu {...fakeProps()} />);
expect(wrapper.text().toLowerCase()).toContain("firmware");
});

it("doesn't update", () => {
const p = fakeProps();
p.sourceFbosConfig = () => ({ value: false, consistent: true });
Expand All @@ -69,7 +63,6 @@ describe("<LogsSettingsMenu />", () => {

function testSettingToggle(setting: ConfigurationName, position: number) {
it(`toggles ${setting} setting`, () => {
mockDev = true;
const p = fakeProps();
p.sourceFbosConfig = () => ({ value: false, consistent: true });
const wrapper = mount(<LogsSettingsMenu {...p} />);
Expand All @@ -81,9 +74,6 @@ describe("<LogsSettingsMenu />", () => {
testSettingToggle("sequence_init_log", 0);
testSettingToggle("sequence_body_log", 1);
testSettingToggle("sequence_complete_log", 2);
testSettingToggle("firmware_output_log", 3);
testSettingToggle("firmware_input_log", 4);
testSettingToggle("arduino_debug_messages", 5);

it("conditionally increases filter level", () => {
const p = fakeProps();
Expand Down
30 changes: 1 addition & 29 deletions frontend/logs/components/settings_menu.tsx
Expand Up @@ -35,26 +35,7 @@ const SEQUENCE_LOG_SETTINGS = (): LogSettingRecord[] => [
},
];

const FIRMWARE_LOG_SETTINGS = (): LogSettingRecord[] => [
{
label: DeviceSetting.firmwareSentLogs,
setting: "firmware_output_log",
tooltip: ToolTips.FIRMWARE_LOG_SENT
},
{
label: DeviceSetting.firmwareReceivedLogs,
setting: "firmware_input_log",
tooltip: ToolTips.FIRMWARE_LOG_RECEIVED
},
{
label: DeviceSetting.firmwareDebugLogs,
setting: "arduino_debug_messages",
tooltip: ToolTips.FIRMWARE_DEBUG_MESSAGES
},
];

const LOG_SETTING_NAMES = SEQUENCE_LOG_SETTINGS().map(s => s.setting)
.concat(FIRMWARE_LOG_SETTINGS().map(s => s.setting));
const LOG_SETTING_NAMES = SEQUENCE_LOG_SETTINGS().map(s => s.setting);

const LogSetting = (props: LogSettingProps) => {
const { label, setting, toolTip, setFilterLevel, sourceFbosConfig } = props;
Expand All @@ -78,11 +59,6 @@ const LogSetting = (props: LogSettingProps) => {
props.dispatch(updateConfig({ [setting]: !config.value }));
if (!config.value === true) {
switch (setting) {
case "firmware_output_log":
case "firmware_input_log":
case "arduino_debug_messages":
updateMinFilterLevel(MessageType.debug, 3);
break;
case "sequence_init_log":
updateMinFilterLevel(MessageType.busy, 2);
break;
Expand Down Expand Up @@ -120,13 +96,9 @@ export class LogsSettingsMenu extends React.Component<LogsSettingsMenuProps> {
getConfigValue={getConfigValue} />;
};
const { private_ip } = this.props.bot.hardware.informational_settings;
const firmwareLogs = DevSettings.futureFeaturesEnabled();
return <div className={"logs-settings-menu"}>
{t("Sequence logs:")}
{SEQUENCE_LOG_SETTINGS().map(p => <LogSettingRow key={p.setting} {...p} />)}
{firmwareLogs && t("Firmware logs:")}
{firmwareLogs && FIRMWARE_LOG_SETTINGS()
.map(p => <LogSettingRow key={p.setting} {...p} />)}
{DevSettings.futureFeaturesEnabled() && private_ip &&
<div className={"log-stream-link"}>
<a href={`http://${private_ip}/logger`}
Expand Down
3 changes: 0 additions & 3 deletions frontend/settings/maybe_highlight.tsx
Expand Up @@ -178,9 +178,6 @@ const LOG_SETTINGS = [
DeviceSetting.enableSequenceBeginLogs,
DeviceSetting.enableSequenceStepLogs,
DeviceSetting.enableSequenceCompleteLogs,
DeviceSetting.enableFirmwareSentLogs,
DeviceSetting.enableFirmwareReceivedLogs,
DeviceSetting.enableFirmwareDebugLogs,
];
const APP_SETTINGS = [
DeviceSetting.internationalizeWebApp,
Expand Down
15 changes: 0 additions & 15 deletions frontend/settings/other_settings.tsx
Expand Up @@ -282,19 +282,4 @@ const LOG_ENABLE_SETTINGS = (): LogEnableSettingDescriptionProps[] => ([
description: ToolTips.SEQUENCE_LOG_END,
setting: "sequence_complete_log",
},
{
title: DeviceSetting.enableFirmwareSentLogs,
description: ToolTips.FIRMWARE_LOG_SENT,
setting: "firmware_output_log",
},
{
title: DeviceSetting.enableFirmwareReceivedLogs,
description: ToolTips.FIRMWARE_LOG_RECEIVED,
setting: "firmware_input_log",
},
{
title: DeviceSetting.enableFirmwareDebugLogs,
description: ToolTips.FIRMWARE_DEBUG_MESSAGES,
setting: "arduino_debug_messages",
},
]);

0 comments on commit 48e7d02

Please sign in to comment.