From a7d06e9fca155a1363cc9fbed050b93fa229d6c2 Mon Sep 17 00:00:00 2001
From: unknown
Date: Tue, 9 Apr 2024 14:30:58 +0200
Subject: [PATCH] Fix #299
---
CHANGELOG.txt | 3 +-
app/js/grbl-settings-templates.js | 49 -------------------------------
grblStrings.js | 7 -----
3 files changed, 2 insertions(+), 57 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e677f8a..c5daed4 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -16,7 +16,8 @@ v1.0.371: (Unreleased):
- Fixed Issue #348 Merged fix for Dark Mode CSS Improvement
- Removed BlackBox X32 advertisement from Splash Screen
- Changed DROs to use 3 decimal places per grblHAL standards
- - updated Grbl Settings Descriptions for newer firmware builds
+ - Updated Grbl Settings Descriptions for newer firmware builds
+ - Reworded 'firmware not found' error messages to clarify
v1.0.370: Fixed typo in an error message, Updated SSL Certificates
v1.0.369: Fixed bug in firmware flashing tool
v1.0.368: Updated grblHAL firmware images to 20230501, updated grblHAL Settings templates, added 3-Axes with Door firmware, Fixed bug in Firmware flashing tool for Interface > Firmware Version when offline, Updated included Interface firmware version
diff --git a/app/js/grbl-settings-templates.js b/app/js/grbl-settings-templates.js
index 05f951a..6b2a63c 100644
--- a/app/js/grbl-settings-templates.js
+++ b/app/js/grbl-settings-templates.js
@@ -639,55 +639,6 @@ var grblSettingsTemplate2 = {
template: ``,
utils: ``
},
- 300: {
- key: `$300`,
- title: `Hostname`,
- description: ``,
- template: ``,
- utils: ``
- },
- 302: {
- key: `$302`,
- title: `IP Address`,
- description: ``,
- template: ``,
- utils: ``
- },
- 303: {
- key: `$303`,
- title: `Gateway`,
- description: ``,
- template: ``,
- utils: ``
- },
- 304: {
- key: `$304`,
- title: `Netmask`,
- description: ``,
- template: ``,
- utils: ``
- },
- 305: {
- key: `$305`,
- title: `Telnet Port`,
- description: ``,
- template: ``,
- utils: ``
- },
- 306: {
- key: `$306`,
- title: `HTTP Port`,
- description: ``,
- template: ``,
- utils: ``
- },
- 307: {
- key: `$307`,
- title: `Websocket Port`,
- description: ``,
- template: ``,
- utils: ``
- },
73: {
key: `$73`,
title: `Wifi Mode`,
diff --git a/grblStrings.js b/grblStrings.js
index 632ee52..e7b5799 100644
--- a/grblStrings.js
+++ b/grblStrings.js
@@ -133,13 +133,6 @@ var grblSettingCodes = {
370: "Invert I/O Port Inputs (mask)",
384: "Disable G92 Persistence",
70: "Network Services",
- 300: "Hostname",
- 302: "IP Address",
- 303: "Gateway",
- 304: "Netmask",
- 305: "Telnet Port",
- 306: "HTTP Port",
- 307: "Websocket Port",
73: "Wifi Mode", // Off/Station
74: "SSID",
75: "PSK",