Skip to content

Commit 2e4171d

Browse files
committed
more min/max/step defaults, fix some max range exceeds
1 parent 4b32753 commit 2e4171d

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

src/_templates.tsp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ scalar desiredtemp extends UCH;
5656
scalar outsidetemp extends SCH;
5757

5858
@unit("%")
59-
@minValue(-100) @maxValue(100)
59+
@minValue(-100) @maxValue(100) @step(0.5)
6060
scalar percent extends D2C;
6161

6262
@unit("%")
@@ -67,7 +67,7 @@ scalar percent0 extends UCH;
6767
scalar percent1 extends D1C;
6868

6969
@unit("%")
70-
@minValue(-100) @maxValue(100)
70+
@minValue(-100) @maxValue(100) @step(0.5)
7171
scalar percent2 extends D2B;
7272

7373
@unit("%")
@@ -76,7 +76,7 @@ scalar percents extends SCH;
7676

7777
/** temperature */
7878
@unit("°C")
79-
@minValue(-50) @maxValue(180)
79+
@minValue(-50) @maxValue(180) @step(0.5)
8080
scalar temp extends D2C;
8181

8282
/** temperature */
@@ -90,12 +90,12 @@ scalar temp1 extends D1C;
9090

9191
/** temperature */
9292
@unit("°C")
93-
@minValue(-50) @maxValue(180)
93+
@minValue(-50) @maxValue(127) @step(0.5)
9494
scalar temp2 extends D2B;
9595

9696
/** pressure */
9797
@unit("bar")
98-
@minValue(0) @maxValue(70)
98+
@minValue(0) @maxValue(70) @step(0.5)
9999
scalar press extends D2B;
100100

101101
/** time */

src/vaillant/_templates.tsp

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ scalar temps2 extends SIN;
2020

2121
/** temperature */
2222
@unit("°C")
23-
@minValue(-50) @maxValue(180)
23+
@minValue(-50) @maxValue(180) @step(0.5)
2424
scalar tempv extends EXP;
2525

2626
/** pressure */
2727
@unit("bar")
28-
@minValue(0) @maxValue(70)
28+
@minValue(0) @maxValue(32) @step(0.5)
2929
scalar press extends FLT;
3030

3131
/** pressure */
3232
@unit("bar")
33-
@minValue(0) @maxValue(70)
33+
@minValue(0) @maxValue(70) @step(0.5)
3434
scalar pressv extends EXP;
3535

3636
@unit("l/h")
@@ -46,13 +46,15 @@ scalar flowrate100 extends UIN;
4646
scalar airflowrate extends UIN;
4747

4848
@unit("rpm")
49+
@maxValue(1000)
4950
scalar fanspeed extends UIN;
5051

5152
@unit("rpm")
53+
@minValue(-1000) @maxValue(1000)
5254
scalar fanspeedoffset extends SIN;
5355

5456
@unit("rpm")
55-
@minValue(0)
57+
@minValue(0) @maxValue(1000) @step(1)
5658
scalar fanspeedv extends EXP;
5759

5860
/** two-point / analogue control */
@@ -61,7 +63,7 @@ scalar twopointanalog extends UCH;
6163

6264
/** percentage */
6365
@unit("%")
64-
@minValue(0) @maxValue(100)
66+
@minValue(0) @maxValue(100) @step(0.5)
6567
scalar percentv extends EXP;
6668

6769
/** date */
@@ -154,7 +156,7 @@ scalar seconds2 extends UIN;
154156
scalar seconds4 extends ULG;
155157

156158
@unit("K")
157-
@minValue(-450) @maxValue(450)
159+
@minValue(-450) @maxValue(450) @step(0.5)
158160
scalar calibration extends D2C;
159161

160162
@unit("K")
@@ -168,7 +170,7 @@ scalar calibration1 extends D1C;
168170
scalar calibrations extends SCH;
169171

170172
@unit("K")
171-
@minValue(-450) @maxValue(450)
173+
@minValue(-450) @maxValue(450) @step(0.5)
172174
scalar calibrationv extends EXP;
173175

174176
@unit("°min")
@@ -277,7 +279,7 @@ model presssensor {
277279
scalar pressm extends ULG;
278280

279281
/** pressure */
280-
@unit("mbar")
282+
@unit("mbar") @step(50)
281283
scalar pressm2 extends UIN;
282284

283285
@divisor(100)
@@ -1125,4 +1127,6 @@ model Timer<T> {
11251127
/** display contrast */
11261128
@minValue(0)
11271129
@maxValue(15)
1130+
@unit("%", "heinz")
1131+
@attr("other", "xxx")
11281132
scalar displaycontrast extends UCH;

0 commit comments

Comments
 (0)