From a0a3d8ef3af0cc5b60876c202be7be9f8da6d550 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Mon, 21 Mar 2022 20:21:55 +0100 Subject: [PATCH] min/max to web value edit --- interface/src/project/DashboardData.tsx | 2 +- interface/src/project/types.ts | 2 ++ src/emsdevice.cpp | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx index ea56a2668..d53ebe68e 100644 --- a/interface/src/project/DashboardData.tsx +++ b/interface/src/project/DashboardData.tsx @@ -239,7 +239,7 @@ const DashboardData: FC = () => { sx={{ width: '30ch' }} type={deviceValue.u ? 'number' : 'text'} onChange={updateValue(setDeviceValue)} - inputProps={{ step: deviceValue.s }} + inputProps={deviceValue.u ? { min: deviceValue.m, max: deviceValue.x, step: deviceValue.s } : {}} InputProps={{ startAdornment: {DeviceValueUOM_s[deviceValue.u]} }} diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts index f1c32c030..226873bdd 100644 --- a/interface/src/project/types.ts +++ b/interface/src/project/types.ts @@ -133,6 +133,8 @@ export interface DeviceValue { l: string[]; // list h?: string; // help text s?: string; // steps for up/down + m?: string; // min + x?: string; // max } export interface DeviceData { diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp index d7a4a84b3..47fc3f442 100644 --- a/src/emsdevice.cpp +++ b/src/emsdevice.cpp @@ -741,6 +741,11 @@ void EMSdevice::generate_values_web(JsonObject & output) { } else if (divider < 0) { obj["s"] = Helpers::render_value(s, (-1) * divider, 0); } + int16_t dv_set_min, dv_set_max; + if (dv.get_min_max(dv_set_min, dv_set_max)) { + obj["m"] = Helpers::render_value(s, dv_set_min, 0); + obj["x"] = Helpers::render_value(s, dv_set_max, 0); + } } } }