Merge branch 'master' into osirko_extract_runner

Author: asirko-soft

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

@@ -89,11 +89,11 @@ class AppTask : public BaseApplication
     static AppTask sAppTask;
 
     /**
-     * @brief AppTask initialisation function
+     * @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
      *
      * @return CHIP_ERROR
      */
-    CHIP_ERROR Init();
+    CHIP_ERROR AppInit() override;
 
     /**
      * @brief PB0 Button event processing function

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

@@ -68,7 +68,7 @@ using namespace chip::app::Clusters;
 
 AppTask AppTask::sAppTask;
 
-CHIP_ERROR AppTask::Init()
+CHIP_ERROR AppTask::AppInit()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
@@ -77,12 +77,6 @@ CHIP_ERROR AppTask::Init()
     GetLCD().SetCustomUI(AirQualitySensorUI::DrawUI);
 #endif
 
-    err = BaseApplication::Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogDetail(AppServer, "BaseApplication::Init() failed");
-        appError(err);
-    }
     err = SensorManager::SensorMgr().Init();
     if (err != CHIP_NO_ERROR)
     {

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

@@ -59,4 +59,4 @@ CONFIG_CHIP_ENABLE_READ_CLIENT=y
 CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE=0x8000
 
 # Increase heap size
-CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
+CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=32768

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

@@ -57,4 +57,4 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=y
 CONFIG_CHIP_ENABLE_READ_CLIENT=y
 
 # Increase heap size
-CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
+CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=32768

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

@@ -68,4 +68,4 @@ CONFIG_LTO=y
 CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
 
 # Increase heap size
-CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
+CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=32768

examples/camera-app/linux/BUILD.gn

@@ -16,18 +16,26 @@ import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 
 import("${chip_root}/build/chip/tools.gni")
-import("${chip_root}/src/app/common_flags.gni")
 
 assert(chip_build_tools)
 
-config("includes") {
+config("config") {
+  cflags = [
+    "-Wconversion",
+    "-Wno-shadow",
+  ]
+
   include_dirs = [
-    ".",
     "include",
+    "include/clusters/chime",
+    "${chip_root}/examples/camera-app/camera-common/include",
+    "${chip_root}/third_party/libdatachannel/repo/include",
   ]
 }
 
 executable("chip-camera-app") {
+  configs += [ ":config" ]
+
   sources = [
     "${chip_root}/examples/camera-app/linux/src/camera-device.cpp",
     "${chip_root}/examples/camera-app/linux/src/clusters/chime/chime-manager.cpp",
@@ -47,15 +55,6 @@ executable("chip-camera-app") {
   lib_dirs =
       [ rebase_path("${chip_root}/third_party/libdatachannel/repo/build") ]
 
-  include_dirs = [
-    "include",
-    "include/clusters/chime",
-    "${chip_root}/examples/camera-app/camera-common/include",
-    "${chip_root}/third_party/libdatachannel/repo/include",
-  ]
-
-  cflags = [ "-Wconversion" ]
-
   output_dir = root_out_dir
 }
 

examples/camera-controller/BUILD.gn

@@ -23,12 +23,18 @@ import("${chip_root}/src/lib/core/core.gni")
 assert(chip_build_tools)
 
 config("config") {
+  cflags = [
+    "-Wconversion",
+    "-Wno-shadow",
+  ]
+
   include_dirs = [
     ".",
     "${chip_root}/examples/common",
     "${chip_root}/zzz_generated/app-common/app-common",
     "${chip_root}/zzz_generated/chip-tool",
     "${chip_root}/src/lib",
+    "${chip_root}/third_party/libdatachannel/repo/include",
   ]
 
   defines = [ "CONFIG_USE_SEPARATE_EVENTLOOP=${config_use_separate_eventloop}" ]
@@ -114,8 +120,6 @@ executable("camera-controller") {
   lib_dirs =
       [ rebase_path("${chip_root}/third_party/libdatachannel/repo/build") ]
 
-  include_dirs = [ "${chip_root}/third_party/libdatachannel/repo/include" ]
-
   output_dir = root_out_dir
 }
 

examples/chef/chef.py

@@ -42,6 +42,7 @@
 _CD_STAGING_DIR = os.path.join(_CHEF_SCRIPT_PATH, "staging")
 _EXCLUDE_DEVICE_FROM_LINUX_CI = [  # These do not compile / deprecated.
     "noip_rootnode_dimmablelight_bCwGYSDpoe",
+    "icd_rootnode_contactsensor_ed3b19ec55",
     "rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680",
 ]
 
@@ -328,6 +329,8 @@ def main() -> int:
                       action="store_true", dest="do_erase")
     parser.add_option("-i", "--terminal", help="opens terminal to interact with with device",
                       action="store_true", dest="do_interact")
+    parser.add_option("-I", "--enable_lit_icd", help="enable LIT ICD (Long Idle Time Intermittently Connected Device) mode",
+                      action="store_true", default=False)
     parser.add_option("-m", "--menuconfig", help="runs menuconfig on platforms that support it",
                       action="store_true", dest="do_menuconfig")
     parser.add_option("-z", "--zap", help="runs zap to generate data model & interaction model artifacts",
@@ -390,11 +393,18 @@ def main() -> int:
                       help=("Builds Chef Examples defined in cicd_config under ci_allow_list_linux. "
                             "Devices are built without -c for faster compilation."),
                       dest="ci_linux", action="store_true")
-    parser.add_option(
-        "", "--enable_ipv4", help="Enable IPv4 mDNS. Only applicable to platforms that can support IPV4 (e.g, Linux, ESP32)",
-        action="store_true", default=False)
-    parser.add_option(
-        "", "--cpu_type", help="CPU type to compile for. Linux only.", choices=["arm64", "arm", "x64"])
+    parser.add_option("", "--cpu_type",
+                      help="CPU type to compile for. Linux only.",
+                      choices=["arm64", "arm", "x64"])
+    parser.add_option("", "--enable_ipv4",
+                      help="Enable IPv4 mDNS. Only applicable to platforms that can support IPV4 (e.g, Linux, ESP32)",
+                      action="store_true", default=False)
+    parser.add_option("", "--icd_persist_subscription",
+                      help="Enable ICD persistent subscription and re-establish subscriptions from the server side after reboot",
+                      action="store_true", default=False)
+    parser.add_option("", "--icd_subscription_resumption",
+                      help="Enable subscription resumption after timeout",
+                      action="store_true", default=False)
 
     options, _ = parser.parse_args(sys.argv[1:])
 
@@ -894,6 +904,17 @@ def main() -> int:
             else:
                 linux_args.append("chip_inet_config_enable_ipv4=false")
 
+            if options.enable_lit_icd:
+                linux_args.append("chip_enable_icd_server = true")
+                linux_args.append("chip_icd_report_on_active_mode = true")
+                linux_args.append("chip_enable_icd_lit = true")
+                linux_args.append("chip_enable_icd_dsls = true")
+                if options.icd_subscription_resumption:
+                    options.icd_persist_subscription = True
+                    linux_args.append("chip_subscription_timeout_resumption = true")
+                if options.icd_persist_subscription:
+                    linux_args.append("chip_persist_subscriptions = true")
+
             if sw_ver_string:
                 linux_args.append(
                     f'chip_device_config_device_software_version_string = "{sw_ver_string}"')