Skip to content

Commit 66f0a44

Browse files
authored
Merge branch 'master' into osirko_extract_runner
2 parents 08af42e + d815fde commit 66f0a44

File tree

89 files changed

+7027
-466
lines changed

Some content is hidden

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

89 files changed

+7027
-466
lines changed

examples/air-quality-sensor-app/silabs/include/AppTask.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ class AppTask : public BaseApplication
8989
static AppTask sAppTask;
9090

9191
/**
92-
* @brief AppTask initialisation function
92+
* @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
9393
*
9494
* @return CHIP_ERROR
9595
*/
96-
CHIP_ERROR Init();
96+
CHIP_ERROR AppInit() override;
9797

9898
/**
9999
* @brief PB0 Button event processing function

examples/air-quality-sensor-app/silabs/src/AppTask.cpp

+1-7
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ using namespace chip::app::Clusters;
6868

6969
AppTask AppTask::sAppTask;
7070

71-
CHIP_ERROR AppTask::Init()
71+
CHIP_ERROR AppTask::AppInit()
7272
{
7373
CHIP_ERROR err = CHIP_NO_ERROR;
7474
chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
@@ -77,12 +77,6 @@ CHIP_ERROR AppTask::Init()
7777
GetLCD().SetCustomUI(AirQualitySensorUI::DrawUI);
7878
#endif
7979

80-
err = BaseApplication::Init();
81-
if (err != CHIP_NO_ERROR)
82-
{
83-
ChipLogDetail(AppServer, "BaseApplication::Init() failed");
84-
appError(err);
85-
}
8680
err = SensorManager::SensorMgr().Init();
8781
if (err != CHIP_NO_ERROR)
8882
{

examples/all-clusters-app/nrfconnect/prj.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ CONFIG_CHIP_ENABLE_READ_CLIENT=y
5959
CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE=0x8000
6060

6161
# Increase heap size
62-
CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
62+
CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=32768

examples/all-clusters-app/nrfconnect/prj_dfu.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=y
5757
CONFIG_CHIP_ENABLE_READ_CLIENT=y
5858

5959
# Increase heap size
60-
CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
60+
CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=32768

examples/all-clusters-app/nrfconnect/prj_release.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ CONFIG_LTO=y
6868
CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
6969

7070
# Increase heap size
71-
CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
71+
CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=32768

examples/camera-app/linux/BUILD.gn

+11-12
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,26 @@ import("//build_overrides/build.gni")
1616
import("//build_overrides/chip.gni")
1717

1818
import("${chip_root}/build/chip/tools.gni")
19-
import("${chip_root}/src/app/common_flags.gni")
2019

2120
assert(chip_build_tools)
2221

23-
config("includes") {
22+
config("config") {
23+
cflags = [
24+
"-Wconversion",
25+
"-Wno-shadow",
26+
]
27+
2428
include_dirs = [
25-
".",
2629
"include",
30+
"include/clusters/chime",
31+
"${chip_root}/examples/camera-app/camera-common/include",
32+
"${chip_root}/third_party/libdatachannel/repo/include",
2733
]
2834
}
2935

3036
executable("chip-camera-app") {
37+
configs += [ ":config" ]
38+
3139
sources = [
3240
"${chip_root}/examples/camera-app/linux/src/camera-device.cpp",
3341
"${chip_root}/examples/camera-app/linux/src/clusters/chime/chime-manager.cpp",
@@ -47,15 +55,6 @@ executable("chip-camera-app") {
4755
lib_dirs =
4856
[ rebase_path("${chip_root}/third_party/libdatachannel/repo/build") ]
4957

50-
include_dirs = [
51-
"include",
52-
"include/clusters/chime",
53-
"${chip_root}/examples/camera-app/camera-common/include",
54-
"${chip_root}/third_party/libdatachannel/repo/include",
55-
]
56-
57-
cflags = [ "-Wconversion" ]
58-
5958
output_dir = root_out_dir
6059
}
6160

examples/camera-controller/BUILD.gn

+6-2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,18 @@ import("${chip_root}/src/lib/core/core.gni")
2323
assert(chip_build_tools)
2424

2525
config("config") {
26+
cflags = [
27+
"-Wconversion",
28+
"-Wno-shadow",
29+
]
30+
2631
include_dirs = [
2732
".",
2833
"${chip_root}/examples/common",
2934
"${chip_root}/zzz_generated/app-common/app-common",
3035
"${chip_root}/zzz_generated/chip-tool",
3136
"${chip_root}/src/lib",
37+
"${chip_root}/third_party/libdatachannel/repo/include",
3238
]
3339

3440
defines = [ "CONFIG_USE_SEPARATE_EVENTLOOP=${config_use_separate_eventloop}" ]
@@ -114,8 +120,6 @@ executable("camera-controller") {
114120
lib_dirs =
115121
[ rebase_path("${chip_root}/third_party/libdatachannel/repo/build") ]
116122

117-
include_dirs = [ "${chip_root}/third_party/libdatachannel/repo/include" ]
118-
119123
output_dir = root_out_dir
120124
}
121125

examples/chef/chef.py

+26-5
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
_CD_STAGING_DIR = os.path.join(_CHEF_SCRIPT_PATH, "staging")
4343
_EXCLUDE_DEVICE_FROM_LINUX_CI = [ # These do not compile / deprecated.
4444
"noip_rootnode_dimmablelight_bCwGYSDpoe",
45+
"icd_rootnode_contactsensor_ed3b19ec55",
4546
"rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680",
4647
]
4748

@@ -328,6 +329,8 @@ def main() -> int:
328329
action="store_true", dest="do_erase")
329330
parser.add_option("-i", "--terminal", help="opens terminal to interact with with device",
330331
action="store_true", dest="do_interact")
332+
parser.add_option("-I", "--enable_lit_icd", help="enable LIT ICD (Long Idle Time Intermittently Connected Device) mode",
333+
action="store_true", default=False)
331334
parser.add_option("-m", "--menuconfig", help="runs menuconfig on platforms that support it",
332335
action="store_true", dest="do_menuconfig")
333336
parser.add_option("-z", "--zap", help="runs zap to generate data model & interaction model artifacts",
@@ -390,11 +393,18 @@ def main() -> int:
390393
help=("Builds Chef Examples defined in cicd_config under ci_allow_list_linux. "
391394
"Devices are built without -c for faster compilation."),
392395
dest="ci_linux", action="store_true")
393-
parser.add_option(
394-
"", "--enable_ipv4", help="Enable IPv4 mDNS. Only applicable to platforms that can support IPV4 (e.g, Linux, ESP32)",
395-
action="store_true", default=False)
396-
parser.add_option(
397-
"", "--cpu_type", help="CPU type to compile for. Linux only.", choices=["arm64", "arm", "x64"])
396+
parser.add_option("", "--cpu_type",
397+
help="CPU type to compile for. Linux only.",
398+
choices=["arm64", "arm", "x64"])
399+
parser.add_option("", "--enable_ipv4",
400+
help="Enable IPv4 mDNS. Only applicable to platforms that can support IPV4 (e.g, Linux, ESP32)",
401+
action="store_true", default=False)
402+
parser.add_option("", "--icd_persist_subscription",
403+
help="Enable ICD persistent subscription and re-establish subscriptions from the server side after reboot",
404+
action="store_true", default=False)
405+
parser.add_option("", "--icd_subscription_resumption",
406+
help="Enable subscription resumption after timeout",
407+
action="store_true", default=False)
398408

399409
options, _ = parser.parse_args(sys.argv[1:])
400410

@@ -894,6 +904,17 @@ def main() -> int:
894904
else:
895905
linux_args.append("chip_inet_config_enable_ipv4=false")
896906

907+
if options.enable_lit_icd:
908+
linux_args.append("chip_enable_icd_server = true")
909+
linux_args.append("chip_icd_report_on_active_mode = true")
910+
linux_args.append("chip_enable_icd_lit = true")
911+
linux_args.append("chip_enable_icd_dsls = true")
912+
if options.icd_subscription_resumption:
913+
options.icd_persist_subscription = True
914+
linux_args.append("chip_subscription_timeout_resumption = true")
915+
if options.icd_persist_subscription:
916+
linux_args.append("chip_persist_subscriptions = true")
917+
897918
if sw_ver_string:
898919
linux_args.append(
899920
f'chip_device_config_device_software_version_string = "{sw_ver_string}"')

0 commit comments

Comments
 (0)