From 5608816240227fa3f067e053a44d230367aa55aa Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Fri, 29 Sep 2023 19:00:01 -0700 Subject: [PATCH 1/4] update channel and bump version --- package.json | 2 +- src/components/PageComponents/Channel.tsx | 22 +++++----------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 0f21fe8c..bada717b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshtastic-web", - "version": "2.2.5-0", + "version": "2.2.9-0", "type": "module", "description": "Meshtastic web client", "license": "GPL-3.0-only", diff --git a/src/components/PageComponents/Channel.tsx b/src/components/PageComponents/Channel.tsx index ec1b1e72..57bf5aa0 100644 --- a/src/components/PageComponents/Channel.tsx +++ b/src/components/PageComponents/Channel.tsx @@ -52,7 +52,7 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => { type: "select", name: "role", label: "Role", - description: "Description", + description: "Device telemetry is sent over PRIMARY. Only one PRIMARY allowed", properties: { enumValue: Protobuf.Channel_Role, }, @@ -61,40 +61,28 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => { type: "password", name: "settings.psk", label: "pre-Shared Key", - description: "Description", + description: "0, 16, or 32 bytes, \"0\"= no crypto, \"1\" = default key", properties: { // act }, }, - { - type: "number", - name: "settings.channelNum", - label: "Channel Number", - description: "Description", - }, { type: "text", name: "settings.name", label: "Name", - description: "Description", - }, - { - type: "number", - name: "settings.id", - label: "ID", - description: "Description", + description: "A unique name for the channel <12 bytes, leave blank for default", }, { type: "toggle", name: "settings.uplinkEnabled", label: "Uplink Enabled", - description: "Description", + description: "Send messages to MQTT from the local mesh", }, { type: "toggle", name: "settings.downlinkEnabled", label: "Downlink Enabled", - description: "Description", + description: "Forward messages from MQTT to the local mesh", }, ], }, From 273ec23fc0829ef5d7bbf33caa3683912b58689d Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Sat, 30 Sep 2023 10:04:16 -0700 Subject: [PATCH 2/4] description clarity --- src/components/PageComponents/Channel.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/PageComponents/Channel.tsx b/src/components/PageComponents/Channel.tsx index 57bf5aa0..2f8f7666 100644 --- a/src/components/PageComponents/Channel.tsx +++ b/src/components/PageComponents/Channel.tsx @@ -76,13 +76,13 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => { type: "toggle", name: "settings.uplinkEnabled", label: "Uplink Enabled", - description: "Send messages to MQTT from the local mesh", + description: "Sends messages to MQTT from the local mesh", }, { type: "toggle", name: "settings.downlinkEnabled", label: "Downlink Enabled", - description: "Forward messages from MQTT to the local mesh", + description: "Sends messages from the local mesh to MQTT", }, ], }, From f5b498a685f47b9183ca1ee6abc80533080d6877 Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Sat, 30 Sep 2023 10:09:00 -0700 Subject: [PATCH 3/4] oops --- src/components/PageComponents/Channel.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/PageComponents/Channel.tsx b/src/components/PageComponents/Channel.tsx index 2f8f7666..5dc493b2 100644 --- a/src/components/PageComponents/Channel.tsx +++ b/src/components/PageComponents/Channel.tsx @@ -61,7 +61,7 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => { type: "password", name: "settings.psk", label: "pre-Shared Key", - description: "0, 16, or 32 bytes, \"0\"= no crypto, \"1\" = default key", + description: "16, or 32 bytes, \"0\"= no crypto, \"1\" = default key", properties: { // act }, @@ -76,13 +76,13 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => { type: "toggle", name: "settings.uplinkEnabled", label: "Uplink Enabled", - description: "Sends messages to MQTT from the local mesh", + description: "Send messages to MQTT from the local mesh", }, { type: "toggle", name: "settings.downlinkEnabled", label: "Downlink Enabled", - description: "Sends messages from the local mesh to MQTT", + description: "Send messages to the local mesh from MQTT", }, ], }, From af76050bfe350d57d4631f4fb1dcad255477cbf4 Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Sat, 30 Sep 2023 10:32:54 -0700 Subject: [PATCH 4/4] reword --- src/components/PageComponents/Channel.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/PageComponents/Channel.tsx b/src/components/PageComponents/Channel.tsx index 5dc493b2..03b447e1 100644 --- a/src/components/PageComponents/Channel.tsx +++ b/src/components/PageComponents/Channel.tsx @@ -76,13 +76,13 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => { type: "toggle", name: "settings.uplinkEnabled", label: "Uplink Enabled", - description: "Send messages to MQTT from the local mesh", + description: "Send messages from the local mesh to MQTT", }, { type: "toggle", name: "settings.downlinkEnabled", label: "Downlink Enabled", - description: "Send messages to the local mesh from MQTT", + description: "Send messages from MQTT to the local mesh", }, ], },