Merge pull request #320 from MichaelDvP/dev

helptext for string commands
emsesp · Jan 24, 2022 · 4569ee5 · 4569ee5
2 parents ab34f7c + cd2ea1d
commit 4569ee5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx
@@ -14,6 +14,7 @@ import {
   DialogActions,
   MenuItem,
   InputAdornment,
+  FormHelperText,
   IconButton,
   List,
   ListItem,
@@ -248,6 +249,9 @@ const DashboardData: FC = () => {
                 }}
               />
             )}
+            {deviceValue.h && (
+              <FormHelperText>{deviceValue.h}</FormHelperText>
+            )}
           </DialogContent>
           <DialogActions>
             <Button

diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts
@@ -131,6 +131,7 @@ export interface DeviceValue {
   n: string; // name
   c: string; // command
   l: string[]; // list
+  h?: string; // help text
 }
 
 export interface DeviceData {

diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp
@@ -737,9 +737,9 @@ void EMSdevice::generate_values_web(JsonObject & output) {
                     l.add("off");
                     l.add("on");
                 }
-                // add command template
+                // add command help template
                 if ((dv.type == DeviceValueType::STRING || dv.type == DeviceValueType::CMD) && dv.options_size == 1) {
-                    obj["o"] = dv.options[0];
+                    obj["h"] = dv.options[0];
                 }
             }
         }