Remove demo UDP advertisement from Thread samples

This pre-SRP advertisement is not based on anything in the specification. It dates back to 0561e68 ("[nrf5-demo] Add simple service discovery code for nrf5 example app (project-chip#2211)") to allow discovery prior to all of the dependencies of SRP being in place and since then been copied to various other samples. We have SRP now, time to remove it.
mspang · Jul 14, 2021 · 6c3f24f · 6c3f24f
1 parent 0d085d7
commit 6c3f24f
Show file tree

Hide file tree

Showing 20 changed files with 0 additions and 351 deletions.
diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn
@@ -83,7 +83,6 @@ efr32_executable("lighting_app") {
 
  sources = [
  "${examples_plat_dir}/LEDWidget.cpp",
- "${examples_plat_dir}/Service.cpp",
  "${examples_plat_dir}/init_efrPlatform.cpp",
  "${examples_plat_dir}/uart.c",
  "src/AppTask.cpp",

diff --git a/examples/lighting-app/efr32/src/AppTask.cpp b/examples/lighting-app/efr32/src/AppTask.cpp
@@ -22,7 +22,6 @@
 #include "AppEvent.h"
 #include "ButtonHandler.h"
 #include "LEDWidget.h"
-#include "Service.h"
 #include "lcd.h"
 #include "qrcodegen.h"
 #include <app/common/gen/attribute-id.h>
@@ -160,7 +159,6 @@ void AppTask::AppTaskMain(void * pvParameter)
 {
  int err;
  AppEvent event;
- uint64_t mLastChangeTimeUS = 0;
 
  err = sAppTask.Init();
  if (err != CHIP_NO_ERROR)
@@ -170,7 +168,6 @@ void AppTask::AppTaskMain(void * pvParameter)
  }
 
  EFR32_LOG("App Task started");
- SetDeviceName("EFR32LightingDemo._matter._udp.local.");
 
  while (true)
  {
@@ -231,15 +228,6 @@ void AppTask::AppTaskMain(void * pvParameter)
 
  sStatusLED.Animate();
  sLightLED.Animate();
-
- uint64_t nowUS = chip::System::Clock::GetMonotonicMicroseconds();
- uint64_t nextChangeTimeUS = mLastChangeTimeUS + 5 * 1000 * 1000UL;
-
- if (nowUS > nextChangeTimeUS)
- {
- PublishService();
- mLastChangeTimeUS = nowUS;
- }
  }
 }
 

diff --git a/examples/lighting-app/mbed/main/AppTask.cpp b/examples/lighting-app/mbed/main/AppTask.cpp
@@ -51,8 +51,6 @@
 #define BUTTON_PUSH_EVENT 1
 #define BUTTON_RELEASE_EVENT 0
 
-constexpr uint32_t kPublishServicePeriodUs = 5000000;
-
 static LEDWidget sStatusLED(MBED_CONF_APP_SYSTEM_STATE_LED);
 
 static mbed::InterruptIn sLightingButton(LIGHTING_BUTTON);
@@ -125,7 +123,6 @@ int AppTask::Init()
 int AppTask::StartApp()
 {
  int ret = Init();
- uint64_t mLastPublishServiceTimeUS = 0;
 
  if (ret)
  {
@@ -191,16 +188,6 @@ int AppTask::StartApp()
  }
 
  sStatusLED.Animate();
-
- uint64_t nowUS = chip::System::Clock::GetMonotonicMicroseconds();
- uint64_t nextChangeTimeUS = mLastPublishServiceTimeUS + kPublishServicePeriodUs;
-
- if (nowUS > nextChangeTimeUS)
- {
- // TODO:
- // PublishService();
- mLastPublishServiceTimeUS = nowUS;
- }
  }
 }
 

diff --git a/examples/lighting-app/nrfconnect/CMakeLists.txt b/examples/lighting-app/nrfconnect/CMakeLists.txt
@@ -60,7 +60,6 @@ target_sources(app PRIVATE
  ${LIGHTING_COMMON}/gen/IMClusterCommandHandler.cpp
  ${NRFCONNECT_COMMON}/util/LEDWidget.cpp
  ${NRFCONNECT_COMMON}/util/ThreadUtil.cpp
- ${NRFCONNECT_COMMON}/app/Service.cpp
  ${CHIP_ROOT}/src/app/util/DataModelHandler.cpp
  ${CHIP_ROOT}/src/app/reporting/reporting-default-configuration.cpp
  ${CHIP_ROOT}/src/app/reporting/reporting.cpp

diff --git a/examples/lighting-app/nrfconnect/main/AppTask.cpp b/examples/lighting-app/nrfconnect/main/AppTask.cpp
@@ -22,7 +22,6 @@
 #include "AppEvent.h"
 #include "LEDWidget.h"
 #include "LightingManager.h"
-#include "Service.h"
 #include "ThreadUtil.h"
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
@@ -65,7 +64,6 @@ constexpr int kAppEventQueueSize = 10;
 constexpr int kExampleVendorID = 0xabcd;
 constexpr uint8_t kButtonPushEvent = 1;
 constexpr uint8_t kButtonReleaseEvent = 0;
-constexpr uint32_t kPublishServicePeriodUs = 5000000;
 
 K_MSGQ_DEFINE(sAppEventQueue, sizeof(AppEvent), kAppEventQueueSize, alignof(AppEvent));
 k_timer sFunctionTimer;
@@ -143,7 +141,6 @@ int AppTask::Init()
 int AppTask::StartApp()
 {
  int ret = Init();
- uint64_t mLastPublishServiceTimeUS = 0;
 
  if (ret)
  {
@@ -213,15 +210,6 @@ int AppTask::StartApp()
  sStatusLED.Animate();
  sUnusedLED.Animate();
  sUnusedLED_1.Animate();
-
- uint64_t nowUS = chip::System::Clock::GetMonotonicMicroseconds();
- uint64_t nextChangeTimeUS = mLastPublishServiceTimeUS + kPublishServicePeriodUs;
-
- if (nowUS > nextChangeTimeUS)
- {
- PublishService();
- mLastPublishServiceTimeUS = nowUS;
- }
  }
 }
 

diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn
@@ -68,7 +68,6 @@ efr32_executable("lock_app") {
 
  sources = [
  "${examples_plat_dir}/LEDWidget.cpp",
- "${examples_plat_dir}/Service.cpp",
  "${examples_plat_dir}/init_efrPlatform.cpp",
  "${examples_plat_dir}/uart.c",
  "src/AppTask.cpp",

diff --git a/examples/lock-app/efr32/src/AppTask.cpp b/examples/lock-app/efr32/src/AppTask.cpp
@@ -22,7 +22,6 @@
 #include "AppEvent.h"
 #include "ButtonHandler.h"
 #include "LEDWidget.h"
-#include "Service.h"
 #include "lcd.h"
 #include "qrcodegen.h"
 #include <app/common/gen/attribute-id.h>
@@ -155,7 +154,6 @@ void AppTask::AppTaskMain(void * pvParameter)
 {
  int err;
  AppEvent event;
- uint64_t mLastChangeTimeUS = 0;
 
  err = sAppTask.Init();
  if (err != CHIP_NO_ERROR)
@@ -165,7 +163,6 @@ void AppTask::AppTaskMain(void * pvParameter)
  }
 
  EFR32_LOG("App Task started");
- SetDeviceName("EFR32LockDemo._matter._udp.local.");
 
  while (true)
  {
@@ -226,15 +223,6 @@ void AppTask::AppTaskMain(void * pvParameter)
 
  sStatusLED.Animate();
  sLockLED.Animate();
-
- uint64_t nowUS = chip::System::Clock::GetMonotonicMicroseconds();
- uint64_t nextChangeTimeUS = mLastChangeTimeUS + 5 * 1000 * 1000UL;
-
- if (nowUS > nextChangeTimeUS)
- {
- PublishService();
- mLastChangeTimeUS = nowUS;
- }
  }
 }
 

diff --git a/examples/lock-app/nrfconnect/CMakeLists.txt b/examples/lock-app/nrfconnect/CMakeLists.txt
@@ -60,7 +60,6 @@ target_sources(app PRIVATE
  ${LOCK_COMMON}/gen/IMClusterCommandHandler.cpp
  ${NRFCONNECT_COMMON}/util/LEDWidget.cpp
  ${NRFCONNECT_COMMON}/util/ThreadUtil.cpp
- ${NRFCONNECT_COMMON}/app/Service.cpp
  ${CHIP_ROOT}/src/app/util/DataModelHandler.cpp
  ${CHIP_ROOT}/src/app/reporting/reporting-default-configuration.cpp
  ${CHIP_ROOT}/src/app/reporting/reporting.cpp

diff --git a/examples/lock-app/nrfconnect/main/AppTask.cpp b/examples/lock-app/nrfconnect/main/AppTask.cpp
@@ -20,7 +20,6 @@
 #include "AppConfig.h"
 #include "BoltLockManager.h"
 #include "LEDWidget.h"
-#include "Service.h"
 #include "ThreadUtil.h"
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
@@ -59,8 +58,6 @@
 LOG_MODULE_DECLARE(app);
 K_MSGQ_DEFINE(sAppEventQueue, sizeof(AppEvent), APP_EVENT_QUEUE_SIZE, alignof(AppEvent));
 
-constexpr uint32_t kPublishServicePeriodUs = 5000000;
-
 static LEDWidget sStatusLED;
 static LEDWidget sLockLED;
 static LEDWidget sUnusedLED;
@@ -134,7 +131,6 @@ int AppTask::Init()
 int AppTask::StartApp()
 {
  int ret = Init();
- uint64_t mLastPublishServiceTimeUS = 0;
 
  if (ret)
  {
@@ -205,15 +201,6 @@ int AppTask::StartApp()
  sLockLED.Animate();
  sUnusedLED.Animate();
  sUnusedLED_1.Animate();
-
- uint64_t nowUS = chip::System::Clock::GetMonotonicMicroseconds();
- uint64_t nextChangeTimeUS = mLastPublishServiceTimeUS + kPublishServicePeriodUs;
-
- if (nowUS > nextChangeTimeUS)
- {
- PublishService();
- mLastPublishServiceTimeUS = nowUS;
- }
  }
 }
 

diff --git a/examples/platform/efr32/Service.cpp b/examples/platform/efr32/Service.cpp
diff --git a/examples/platform/efr32/Service.h b/examples/platform/efr32/Service.h