Skip to content

Commit b2527e5

Browse files
committed
elements definitions and minor changes
1 parent 8215a7b commit b2527e5

7 files changed

+56
-50
lines changed

elements.json

+41-41
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@
2828
"actions": ["start", "stop"]
2929
},
3030

31-
"analog": {
32-
"properties": ["readtimems", "hysteresis", "pin", "reference", "mapinmin", "mapinmax", "mapoutmin", "mapoutmax"],
31+
"sensor": {
32+
"properties": ["warmuptime", "readtime", "resendtime", "restart"]
33+
},
34+
35+
"analog": { "extends": "sensor",
36+
"properties": ["pin", "hysteresis", "reference", "mapinmin", "mapinmax", "mapoutmin", "mapoutmax"],
3337
"events": ["onvalue", "onreference", "onhigh", "onlow"]
3438
},
3539

@@ -179,7 +183,7 @@
179183

180184
"display":{
181185
"ui": "display",
182-
"properties": ["color", "background", "address", "spimosi", "spimiso", "spiclk", "spics", "spidc", "invert", "resetpin", "lightpin", "width", "height", "rotation"],
186+
"properties": ["width", "height", "rotation", "busmode", "address", "spimosi", "spimiso", "spiclk", "cspin", "dcpin", "color", "background", "border", "invert", "resetpin", "lightpin"],
183187
"actions" : ["brightness", "page", "addpage", "clear"],
184188
"events": ["onpage"]
185189
},
@@ -189,9 +193,16 @@
189193
"displayst7735": { "extends": "display", "ui": "display" },
190194
"displayst7789": { "extends": "display", "ui": "display" },
191195
"displayst7796": { "extends": "display", "ui": "display" },
196+
"displaygc9a01": { "extends": "display", "ui": "display" },
197+
198+
"displaytouchcst816": { "icon": "default", "sys": "true",
199+
"properties": ["address", "width", "height", "rotation", "interruptpin", "resetpin"],
200+
"events": ["ontouch"]
201+
},
192202

193203
"displaytouchgt911": { "icon": "default",
194-
"properties": ["address", "width", "height", "rotation", "interruptpin", "resetpin"]
204+
"properties": ["address", "width", "height", "rotation", "interruptpin", "resetpin"],
205+
"events": ["ontouch"]
195206
},
196207

197208
"displaytouchft6336": { "icon": "default",
@@ -215,74 +226,63 @@
215226
"events": ["onvoltage", "oncurrent", "onpower"]
216227
},
217228

218-
"ina219": {
219-
"ui": "ina2xx",
220-
"properties": ["address", "readtime", "warmuptime", "resendtime", "restart",
221-
"gain", "mode", "samples", "range"],
229+
"ina219": { "extends": "sensor", "ui": "ina2xx",
230+
"properties": ["address", "gain", "mode", "samples", "range"],
222231
"events": ["onvoltage", "oncurrent", "onpower"]
223232
},
224233

225-
"ina226": {
226-
"ui": "ina2xx",
227-
"properties": ["address", "readtime", "warmuptime", "resendtime", "restart",
228-
"gain", "mode", "samples", "range"],
234+
"ina226": { "extends": "sensor", "ui": "ina2xx",
235+
"properties": ["address", "gain", "mode", "samples", "range"],
229236
"events": ["onvoltage", "oncurrent", "onpower"]
230237
},
231238

232-
"dht": {
233-
"ui": "air",
234-
"properties": ["pin", "readtime", "warmuptime", "resendtime", "restart"],
239+
"dht": { "extends": "sensor", "ui": "air",
240+
"properties": ["pin"],
235241
"events": ["ontemperature", "onhumidity"]
236242
},
237243

238-
"aht20": {
239-
"icon": "dht", "ui": "air",
240-
"properties": ["address", "readtime", "warmuptime", "resendtime", "restart"],
244+
"aht20": { "extends": "sensor", "icon": "dht", "ui": "air",
245+
"properties": ["address"],
241246
"events": ["ontemperature", "onhumidity"]
242247
},
243248

244-
"am2320": {
245-
"icon": "dht", "ui": "air",
246-
"properties": ["address", "readtime", "warmuptime", "resendtime", "restart"],
249+
"am2320": { "extends": "sensor", "icon": "dht", "ui": "air",
250+
"properties": ["address"],
247251
"events": ["ontemperature", "onhumidity"]
248252
},
249253

250-
"sht20": {
251-
"icon": "dht", "ui": "air",
252-
"properties": ["address", "readtime", "warmuptime", "resendtime", "restart"],
254+
"sht20": { "extends": "sensor", "icon": "dht", "ui": "air",
255+
"properties": ["address"],
253256
"events": ["ontemperature", "onhumidity"]
254257
},
255258

256-
"dallas": {
257-
"properties": ["pin", "readtime", "warmuptime", "resendtime", "restart"],
259+
"dallas": { "extends": "sensor",
260+
"properties": ["pin"],
258261
"events": ["ontemperature"]
259262
},
260263

261-
"bme680": {
262-
"icon": "dht", "ui": "air",
263-
"properties": ["address", "readtime", "warmuptime", "resendtime", "restart"],
264+
"bme680": { "extends": "sensor", "icon": "dht", "ui": "air",
265+
"properties": ["address"],
264266
"events": ["ontemperature", "onhumidity", "onpressure", "ongas"]
265267
},
266268

267-
"bmp280": {
268-
"icon": "dht", "ui": "air",
269-
"properties": ["address", "readtime", "warmuptime", "resendtime", "restart"],
269+
"bmp280": { "extends": "sensor", "icon": "dht", "ui": "air",
270+
"properties": ["address"],
270271
"events": ["ontemperature", "onpressure"]
271272
},
272273

273-
"scd4x": {
274-
"icon": "dht", "ui": "air",
275-
"properties": ["address", "readtime", "warmuptime", "resendtime", "restart"],
274+
"scd4x": { "extends": "sensor", "icon": "dht", "ui": "air",
275+
"properties": ["address"],
276276
"events": ["ontemperature", "onhumidity", "onco2"]
277277
},
278278

279-
"bh1750": {
280-
"properties": ["address", "mode", "factor", "readtime", "warmuptime", "resendtime", "restart"],
279+
"bh1750": { "extends": "sensor",
280+
"properties": ["address", "mode", "factor"],
281281
"events": ["onvalue"]
282282
},
283283

284-
"pms": {
285-
"properties": ["pinrx", "pintx", "readtime", "warmuptime", "resendtime", "restart"],
284+
"pms": { "extends": "sensor",
285+
"properties": ["pinrx", "pintx"],
286286
"events": ["onvalue"]
287287
},
288288

@@ -359,8 +359,8 @@
359359
},
360360

361361
"timer": {
362-
"properties": ["type", "waittime", "pulsetime", "cycletime"],
363-
"actions": ["next"],
362+
"properties": ["mode", "waittime", "pulsetime", "cycletime", "restart"],
363+
"actions": ["start", "stop", "next"],
364364
"events": ["onon", "onoff", "onvalue"]
365365
},
366366

iotstyle.css

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

iotstyle.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

micro-mini.js

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

micro-mini.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

micro.js

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

micro.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)