Skip to content

Commit d58e662

Browse files
authored
Merge branch 'master' into rjosefsen/update-occupancy-sensing-revision
2 parents a52c4b9 + 8da05d0 commit d58e662

File tree

61 files changed

+2462
-308
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2462
-308
lines changed

config/telink/chip-module/Kconfig

+4
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,10 @@ config CHIP_ENABLE_POWER_ON_FACTORY_RESET
216216
first 5 seconds after power on and this sequence repeated 5 times - factory
217217
reset will be involved.
218218

219+
config CHIP_TASK_STACK_SIZE
220+
int
221+
default 8192
222+
219223
config CHIP_USE_MARS_SENSOR
220224
bool "Use Mars board sensor"
221225
depends on SOC_SERIES_RISCV_TELINK_B9X && (BOARD_TLSR9518ADK80D || BOARD_TLSR9518ADK80D_RETENTION)

config/telink/chip-module/Kconfig.defaults

+4-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ config SETTINGS_NVS_SECTOR_SIZE_MULT
211211

212212
# Set sector counter of NVS
213213
config SETTINGS_NVS_SECTOR_COUNT
214-
default 10
214+
default 12
215215

216216
# Enable OpenThread
217217

@@ -329,4 +329,7 @@ config PWM_SHELL
329329
config OPENTHREAD_SHELL
330330
default n
331331

332+
config CHIP_TASK_STACK_SIZE
333+
default 4864 if PM
334+
332335
endif
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,353 @@
1+
# CHIP Air Purifier Example
2+
3+
This example implements the following PICS:
4+
5+
```
6+
# Fan Control
7+
FAN.S=1
8+
FAN.C=0
9+
FAN.S.F00=1
10+
FAN.S.F01=1
11+
FAN.S.F02=1
12+
FAN.S.F03=1
13+
FAN.S.F04=1
14+
FAN.S.F05=1
15+
FAN.S.A0000=1
16+
FAN.S.A0001=1
17+
FAN.S.A0002=1
18+
FAN.S.A0003=1
19+
FAN.S.A0004=1
20+
FAN.S.A0005=1
21+
FAN.S.A0006=1
22+
FAN.S.A0007=1
23+
FAN.S.A0008=1
24+
FAN.S.A0009=1
25+
FAN.S.A000A=1
26+
FAN.S.A000B=1
27+
FAN.S.C00.Rsp=1
28+
29+
# HEPA Filter Monitoring Cluster
30+
HEPAFREMON.S=1
31+
HEPAFREMON.C=0
32+
HEPAFREMON.S.F00=1
33+
HEPAFREMON.S.F01=1
34+
HEPAFREMON.S.F02=1
35+
HEPAFREMON.S.A0000=1
36+
HEPAFREMON.S.A0001=1
37+
HEPAFREMON.S.A0002=1
38+
HEPAFREMON.S.A0003=1
39+
HEPAFREMON.S.A0004=1
40+
HEPAFREMON.S.A0005=1
41+
HEPAFREMON.S.C00.Rsp=1
42+
43+
# Activated Carbon Filter Monitoring Cluster
44+
ACFREMON.S=1
45+
ACFREMON.C=0
46+
ACFREMON.S.F00=1
47+
ACFREMON.S.F01=1
48+
ACFREMON.S.F02=1
49+
ACFREMON.S.A0000=1
50+
ACFREMON.S.A0001=1
51+
ACFREMON.S.A0002=1
52+
ACFREMON.S.A0003=1
53+
ACFREMON.S.A0004=1
54+
ACFREMON.S.A0005=1
55+
ACFREMON.S.C00.Rsp=1
56+
57+
# Air Quality Cluster
58+
AIRQUAL.C=0
59+
AIRQUAL.S=1
60+
AIRQUAL.S.F00=1
61+
AIRQUAL.S.F01=1
62+
AIRQUAL.S.F02=1
63+
AIRQUAL.S.F03=1
64+
AIRQUAL.S.A0000=1
65+
AIRQUAL.M.AirQualityChange=0
66+
67+
# Concentration Measurement CLusters
68+
CDOCONC.C=0
69+
CDOCONC.S=1
70+
CDOCONC.S.F00=1
71+
CDOCONC.S.F01=1
72+
CDOCONC.S.F02=1
73+
CDOCONC.S.F03=1
74+
CDOCONC.S.F04=1
75+
CDOCONC.S.F05=1
76+
CDOCONC.S.A0000=1
77+
CDOCONC.S.A0001=1
78+
CDOCONC.S.A0002=1
79+
CDOCONC.S.A0003=1
80+
CDOCONC.S.A0004=1
81+
CDOCONC.S.A0005=1
82+
CDOCONC.S.A0006=1
83+
CDOCONC.S.A0007=1
84+
CDOCONC.S.A0008=1
85+
CDOCONC.S.A0009=1
86+
CDOCONC.S.A000a=1
87+
88+
CMOCONC.C=0
89+
CMOCONC.S=1
90+
CMOCONC.S.F00=1
91+
CMOCONC.S.F01=1
92+
CMOCONC.S.F02=1
93+
CMOCONC.S.F03=1
94+
CMOCONC.S.F04=1
95+
CMOCONC.S.F05=1
96+
CMOCONC.S.A0000=1
97+
CMOCONC.S.A0001=1
98+
CMOCONC.S.A0002=1
99+
CMOCONC.S.A0003=1
100+
CMOCONC.S.A0004=1
101+
CMOCONC.S.A0005=1
102+
CMOCONC.S.A0006=1
103+
CMOCONC.S.A0007=1
104+
CMOCONC.S.A0008=1
105+
CMOCONC.S.A0009=1
106+
CMOCONC.S.A000a=1
107+
108+
NDOCONC.C=0
109+
NDOCONC.S=1
110+
NDOCONC.S.F00=1
111+
NDOCONC.S.F01=1
112+
NDOCONC.S.F02=1
113+
NDOCONC.S.F03=1
114+
NDOCONC.S.F04=1
115+
NDOCONC.S.F05=1
116+
NDOCONC.S.A0000=1
117+
NDOCONC.S.A0001=1
118+
NDOCONC.S.A0002=1
119+
NDOCONC.S.A0003=1
120+
NDOCONC.S.A0004=1
121+
NDOCONC.S.A0005=1
122+
NDOCONC.S.A0006=1
123+
NDOCONC.S.A0007=1
124+
NDOCONC.S.A0008=1
125+
NDOCONC.S.A0009=1
126+
NDOCONC.S.A000a=1
127+
128+
OZCONC.C=0
129+
OZCONC.S=1
130+
OZCONC.S.F00=1
131+
OZCONC.S.F01=1
132+
OZCONC.S.F02=1
133+
OZCONC.S.F03=1
134+
OZCONC.S.F04=1
135+
OZCONC.S.F05=1
136+
OZCONC.S.A0000=1
137+
OZCONC.S.A0001=1
138+
OZCONC.S.A0002=1
139+
OZCONC.S.A0003=1
140+
OZCONC.S.A0004=1
141+
OZCONC.S.A0005=1
142+
OZCONC.S.A0006=1
143+
OZCONC.S.A0007=1
144+
OZCONC.S.A0008=1
145+
OZCONC.S.A0009=1
146+
OZCONC.S.A000a=1
147+
148+
PMICONC.C=0
149+
PMICONC.S=1
150+
PMICONC.S.F00=1
151+
PMICONC.S.F01=1
152+
PMICONC.S.F02=1
153+
PMICONC.S.F03=1
154+
PMICONC.S.F04=1
155+
PMICONC.S.F05=1
156+
PMICONC.S.A0000=1
157+
PMICONC.S.A0001=1
158+
PMICONC.S.A0002=1
159+
PMICONC.S.A0003=1
160+
PMICONC.S.A0004=1
161+
PMICONC.S.A0005=1
162+
PMICONC.S.A0006=1
163+
PMICONC.S.A0007=1
164+
PMICONC.S.A0008=1
165+
PMICONC.S.A0009=1
166+
PMICONC.S.A000a=1
167+
168+
FLDCONC.C=0
169+
FLDCONC.S=1
170+
FLDCONC.S.F00=1
171+
FLDCONC.S.F01=1
172+
FLDCONC.S.F02=1
173+
FLDCONC.S.F03=1
174+
FLDCONC.S.F04=1
175+
FLDCONC.S.F05=1
176+
FLDCONC.S.A0000=1
177+
FLDCONC.S.A0001=1
178+
FLDCONC.S.A0002=1
179+
FLDCONC.S.A0003=1
180+
FLDCONC.S.A0004=1
181+
FLDCONC.S.A0005=1
182+
FLDCONC.S.A0006=1
183+
FLDCONC.S.A0007=1
184+
FLDCONC.S.A0008=1
185+
FLDCONC.S.A0009=1
186+
FLDCONC.S.A000a=1
187+
188+
PMHCONC.C=0
189+
PMHCONC.S=1
190+
PMHCONC.S.F00=1
191+
PMHCONC.S.F01=1
192+
PMHCONC.S.F02=1
193+
PMHCONC.S.F03=1
194+
PMHCONC.S.F04=1
195+
PMHCONC.S.F05=1
196+
PMHCONC.S.A0000=1
197+
PMHCONC.S.A0001=1
198+
PMHCONC.S.A0002=1
199+
PMHCONC.S.A0003=1
200+
PMHCONC.S.A0004=1
201+
PMHCONC.S.A0005=1
202+
PMHCONC.S.A0006=1
203+
PMHCONC.S.A0007=1
204+
PMHCONC.S.A0008=1
205+
PMHCONC.S.A0009=1
206+
PMHCONC.S.A000a=1
207+
208+
PMKCONC.C=0
209+
PMKCONC.S=1
210+
PMKCONC.S.F00=1
211+
PMKCONC.S.F01=1
212+
PMKCONC.S.F02=1
213+
PMKCONC.S.F03=1
214+
PMKCONC.S.F04=1
215+
PMKCONC.S.F05=1
216+
PMKCONC.S.A0000=1
217+
PMKCONC.S.A0001=1
218+
PMKCONC.S.A0002=1
219+
PMKCONC.S.A0003=1
220+
PMKCONC.S.A0004=1
221+
PMKCONC.S.A0005=1
222+
PMKCONC.S.A0006=1
223+
PMKCONC.S.A0007=1
224+
PMKCONC.S.A0008=1
225+
PMKCONC.S.A0009=1
226+
PMKCONC.S.A000a=1
227+
228+
TVOCCONC.C=0
229+
TVOCCONC.S=1
230+
TVOCCONC.S.F00=1
231+
TVOCCONC.S.F01=1
232+
TVOCCONC.S.F02=1
233+
TVOCCONC.S.F03=1
234+
TVOCCONC.S.F04=1
235+
TVOCCONC.S.F05=1
236+
TVOCCONC.S.A0000=1
237+
TVOCCONC.S.A0001=1
238+
TVOCCONC.S.A0002=1
239+
TVOCCONC.S.A0003=1
240+
TVOCCONC.S.A0004=1
241+
TVOCCONC.S.A0005=1
242+
TVOCCONC.S.A0006=1
243+
TVOCCONC.S.A0007=1
244+
TVOCCONC.S.A0008=1
245+
TVOCCONC.S.A0009=1
246+
TVOCCONC.S.A000a=1
247+
248+
RNCONC.C=0
249+
RNCONC.S=1
250+
RNCONC.S.F00=1
251+
RNCONC.S.F01=1
252+
RNCONC.S.F02=1
253+
RNCONC.S.F03=1
254+
RNCONC.S.F04=1
255+
RNCONC.S.F05=1
256+
RNCONC.S.A0000=1
257+
RNCONC.S.A0001=1
258+
RNCONC.S.A0002=1
259+
RNCONC.S.A0003=1
260+
RNCONC.S.A0004=1
261+
RNCONC.S.A0005=1
262+
RNCONC.S.A0006=1
263+
RNCONC.S.A0007=1
264+
RNCONC.S.A0008=1
265+
RNCONC.S.A0009=1
266+
RNCONC.S.A000a=1
267+
268+
# Temperature Measurement Cluster
269+
TMP.S=1
270+
TMP.S.A0000=1
271+
TMP.S.A0001=1
272+
TMP.S.A0002=1
273+
TMP.S.A0003=1
274+
TMP.M.ManuallyControlled=0
275+
276+
# Relative Humidity Cluster
277+
RH.S=1
278+
RH.S.A0000=1
279+
RH.S.A0001=1
280+
RH.S.A0002=1
281+
RH.S.A0003=1
282+
RH.M.ManuallyControlled=0
283+
284+
# Thermostat Cluster
285+
TSTAT.S = 1
286+
TSTAT.S.F00 = 1
287+
TSTAT.S.F01 = 0
288+
TSTAT.S.F02 = 0
289+
TSTAT.S.F03 = 0
290+
TSTAT.S.F04 = 0
291+
TSTAT.S.F05 = 0
292+
TSTAT.S.F06 = 0
293+
294+
TSTAT.S.A0000 = 1
295+
TSTAT.S.A0001 = 0
296+
TSTAT.S.A0002 = 0
297+
TSTAT.S.A0003 = 1
298+
TSTAT.S.A0004 = 1
299+
TSTAT.S.A0005 = 0
300+
TSTAT.S.A0006 = 0
301+
TSTAT.S.A0007 = 0
302+
TSTAT.S.A0008 = 0
303+
TSTAT.S.A0009 = 0
304+
TSTAT.S.A0010 = 0
305+
TSTAT.S.A0011 = 0
306+
TSTAT.S.A0012 = 1
307+
TSTAT.S.A0013 = 0
308+
TSTAT.S.A0014 = 0
309+
TSTAT.S.A0015 = 0
310+
TSTAT.S.A0016 = 0
311+
TSTAT.S.A0017 = 0
312+
TSTAT.S.A0018 = 0
313+
TSTAT.S.A0019 = 0
314+
TSTAT.S.A001a = 0
315+
TSTAT.S.A001b = 1
316+
TSTAT.S.A001c = 1
317+
TSTAT.S.A001d = 0
318+
TSTAT.S.A001e = 0
319+
TSTAT.S.A0020 = 0
320+
TSTAT.S.A0021 = 0
321+
TSTAT.S.A0022 = 0
322+
TSTAT.S.A0023 = 0
323+
TSTAT.S.A0024 = 0
324+
TSTAT.S.A0025 = 0
325+
TSTAT.S.A0029 = 1
326+
TSTAT.S.A0030 = 0
327+
TSTAT.S.A0031 = 0
328+
TSTAT.S.A0032 = 0
329+
TSTAT.S.A0034 = 0
330+
TSTAT.S.A0035 = 0
331+
TSTAT.S.A0036 = 0
332+
TSTAT.S.A0037 = 0
333+
TSTAT.S.A0038 = 0
334+
TSTAT.S.A0039 = 0
335+
TSTAT.S.A003a = 0
336+
TSTAT.S.A0040 = 0
337+
TSTAT.S.A0041 = 0
338+
TSTAT.S.A0042 = 0
339+
TSTAT.S.A0043 = 0
340+
TSTAT.S.A0044 = 0
341+
TSTAT.S.A0045 = 0
342+
TSTAT.S.A0046 = 0
343+
TSTAT.S.A0047 = 0
344+
TSTAT.S.M.MinSetpointDeadBandWritable = 0
345+
TSTAT.S.M.HVACSystemTypeConfigurationWritable = 0
346+
347+
# Server Commands
348+
TSTAT.S.C00.Rsp = 1
349+
TSTAT.S.C01.Rsp = 0
350+
TSTAT.S.C02.Rsp = 0
351+
TSTAT.S.C03.Rsp = 0
352+
TSTAT.S.C04.Rsp = 0
353+
```

0 commit comments

Comments
 (0)