Rebase

CMakeLists.txt

@@ -34,32 +34,19 @@ set(CMAKE_NO_SYSTEM_FROM_IMPORTED ON)
 project(ctrlm-main VERSION ${CMAKE_PROJECT_VERSION})
 
 # OPTIONS
-option(A5000_ENABLE "ES1 A5000 use libse051" OFF)
-option(ANSI_CODES_DISABLED "Disable ANSI code logging" OFF)
-option(ASSERT_ON_WRONG_THREAD "Assert on wrong thread" OFF)
 option(AUTH_ENABLED "Enable AUTH" OFF)
 option(BLE_ENABLED "Enable BLE" ON)
 option(BLE_SERVICES "Enable BLE Services" OFF)
 option(BREAKPAD "Enable BREAKPAD" OFF)
 option(BUILD_CTRLM_FACTORY "Build Control Factory Test" OFF)
-option(DEEPSLEEP_CLOSE_DB "Deep Sleep Close DB" OFF)
-option(ENABLE_NETWORKED_STANDBY_MODE "Enable Networked Standby Mode)" OFF)
-option(FACTORY_AUDIO_PLAYBACK "Factory test audio playback" OFF)
-option(FACTORY_CUSTOM_AUDIO_ANALYSIS "Factory custom audio analysis" OFF)
 option(FDC_ENABLED "Enable FDC" OFF)
 option(IP_ENABLED "Enable IP" OFF)
-option(LOCAL_MIC "Local Microphone" OFF)
-option(LOCAL_MIC_DISABLE_VIA_PRIVACY "Use Privacy to disable microphone" OFF)
-option(MEM_DEBUG "Enable memory debugging" OFF)
-option(MEMORY_LOCK "Memory Lock" OFF)
-option(MIC_TAP "Enable MIC_TAP" OFF)
 option(RF4CE_ENABLED "Enable RF4CE" ON)
 option(TELEMETRY_SUPPORT "Enable TELEMETRY_SUPPORT" OFF)
 option(THUNDER "Enable THUNDER" ON)
 option(THUNDER_SECURITY "Enable THUNDER_SECURITY" OFF)
 option(USE_SAFEC "Use safec" OFF)
 option(USE_IARM_POWER_MANAGER "Use IARM Power Manager" OFF)
-option(VOICE_KEYWORD_BEEP "Enable VOICE_KEYWORD_BEEP" OFF)
 option(XRSR_HTTP "Enable XRSR_HTTP" OFF)
 option(XRSR_SDT "Enable XRSR_SDT" OFF)
 option(ENABLE_ASYNC_SRVR_MSG "Enable Asynchronous Server Messaging Feature" OFF)
@@ -181,19 +168,10 @@ install(TARGETS controlMgr RUNTIME DESTINATION bin)
 install(FILES ${CMAKE_BINARY_DIR}/ctrlm_config.json.template DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} COMPONENT config )
 
 # DEFINES FROM OPTIONS
-if(A5000_ENABLE)
-   find_library( SE_HAL_PATH SE_HAL ${CMAKE_SYSROOT}/usr/lib/se051)
-   target_link_libraries(controlMgr ${SE_HAL_PATH})
-endif()
-
 if(ANSI_CODES_DISABLED)
    add_compile_definitions(ANSI_CODES_DISABLED)
 endif()
 
-if(ASSERT_ON_WRONG_THREAD)
-   add_compile_definitions(ASSERT_ON_WRONG_THREAD)
-endif()
-
 if(BLE_ENABLED)
    target_link_libraries(controlMgr BTMgr)
    if(BLE_SERVICES)
@@ -207,10 +185,6 @@ if(BREAKPAD)
    add_compile_definitions(BREAKPAD_SUPPORT)
 endif()
 
-if(DEEPSLEEP_CLOSE_DB)
-   add_compile_definitions(DEEPSLEEP_CLOSE_DB)
-endif()
-
 if(ENABLE_ASYNC_SRVR_MSG)
    add_compile_definitions(SUPPORT_ASYNC_SRVR_MSG)
 endif()
@@ -219,10 +193,6 @@ if(ENABLE_AVS_WITH_SDT)
     add_compile_definitions(SUPPORT_VOICE_DEST_ALSA SUPPORT_ASYNC_SRVR_MSG)
 endif()
 
-if(ENABLE_NETWORKED_STANDBY_MODE)
-   add_compile_definitions(NETWORKED_STANDBY_MODE_ENABLED)
-endif()
-
 if(FDC_ENABLED)
    add_compile_definitions(FDC_ENABLED)
 endif()
@@ -231,25 +201,6 @@ if(IP_ENABLED)
    add_compile_definitions(CTRLM_NETWORK_IP CTRLM_IP_HAL_LOG_ENABLED)
 endif()
 
-if(LOCAL_MIC)
-   add_compile_definitions(CTRLM_LOCAL_MIC)
-   if(MIC_TAP)
-      add_compile_definitions(CTRLM_LOCAL_MIC_TAP)
-   endif()
-   if(LOCAL_MIC_DISABLE_VIA_PRIVACY)
-      add_compile_definitions(CTRLM_LOCAL_MIC_DISABLE_VIA_PRIVACY)
-   endif()
-endif()
-
-if(MEM_DEBUG)
-   add_compile_definitions(MEM_DEBUG)
-endif()
-
-if(MEMORY_LOCK)
-   add_compile_definitions(MEMORY_LOCK)
-   target_link_libraries(controLMgr clnl)
-endif()
-
 # RF4CE options
 if(RF4CE_ENABLED)
    # All RF4CE platforms have HAL NVM
@@ -303,12 +254,6 @@ else()
    add_compile_definitions(SAFEC_DUMMY_API)
 endif()
 
-if(VOICE_KEYWORD_BEEP)
-   add_compile_definitions(BEEP_ON_KWD_ENABLED)
-   add_definitions(-DBEEP_ON_KWD_FILE=\"${CMAKE_DATADIR}/${BEEP_ON_KWD_FILE}\")
-   install(FILES ${CMAKE_SOURCE_DIR}/../${BEEP_ON_KWD_FILE} DESTINATION share )
-endif()
-
 if(USE_DEPRECATED_HDMI_INPUT_PLUGIN)
    add_compile_definitions(USE_DEPRECATED_HDMI_INPUT_PLUGIN)
 endif()

PRODUCT.md

@@ -0,0 +1,64 @@
+# rdkcentral/control Product Functionality
+
+This document summarizes the core product features, capabilities, and user-facing functionality provided by the `rdkcentral/control` project.
+
+## 1. Product Overview
+
+`rdkcentral/control` provides the central control and management solution for RDK-based devices, focusing on remote control integration, device state management, configuration handling, and hardware abstraction. It enables flexible, reliable control of device functions, typically in set-top boxes and smart TV platforms.
+
+## 2. Key Functional Areas
+
+### 2.1 Remote Control Manager
+
+- **Multi-protocol Support:** Integrates with RF4CE and BLE-based remote controls, supporting automatic pairing and discovery of devices.
+- **Key Mapping & Input:** Manages IR, RF, and BLE key events, including vendor-specific key mappings (e.g., for AMC App).
+- **Telemetry & Logging:** Captures and processes telemetry data from voice streams, key events, and audio sessions for diagnostics and monitoring.
+- **OTA & Firmware Management:** Handles remote control firmware updates and network discovery, with stability features when interrupted (e.g., OTA interrupted by reset).
+
+### 2.2 Device State & Power Management
+
+- **Deep Sleep & Wake Handling:** Responds to device state changes, ensuring proper initialization/timer handling during deep sleep or wake events.
+- **Power Plugin Integration:** Uses RDK's Power Manager Thunder plugin for system power state management and interaction.
+
+### 2.3 Configuration Management
+
+- **Dynamic Configuration:** Reads, updates, and applies runtime configuration changes from files, including support for vendor override files.
+- **Device Discovery:** Provides mechanisms to discover IR input devices, support for multiple device types and fallback/stub implementations if hardware is absent.
+- **HAL Abstraction:** Exposes interfaces to control hardware-specific features via C++ classes (see `ctrlm_hal.h`, `ctrlm_hal_rf4ce.h`, `ctrlm_hal_ble.h`).
+
+### 2.4 Audio & Voice Control
+
+- **Voice Session Management:** Supports BLE/RF voice streaming; logs sessions; manages session state, end times, and error reporting.
+- **Audio Stream Management:** Reports and optimizes audio pipe size; ensures reliable audio sample reporting for voice sessions.
+
+### 2.5 API & Service Integration
+
+- **Thunder & HDMI Plugins:** Integrates with plugin frameworks to extend support for HDMI input, AV input, MAC address fetch, and advanced service bridging.
+- **ASB Detection:** Offers runtime detection for Advanced Service Bridge capabilities.
+
+## 3. Product Extensibility
+
+- **Vendor Layer Integration:** Provides hooks for vendor-specific features, such as configuration overrides and device database stubs.
+- **Flexible Build & Runtime Flags:** Build flags allow enabling/disabling features (e.g., BLE audio, packet analysis, deepsleep, memory lock).
+- **Plugin & Target Customization:** Can build custom targets (e.g., just the control config file).
+
+## 4. Typical Use Cases
+
+- **User Experience:** Enables seamless remote pairing and input handling, responsive device wake/sleep, and dynamic feature provisioning.
+- **Monitoring/Diagnostics:** Logs device events and telemetry, aiding both advanced diagnostics and data-driven product improvement.
+- **Integration Point:** Forms the backbone for device control in RDK deployments where remote management and hardware abstraction are required.
+
+## 5. Recent Product Updates (Selected Highlights)
+
+- Multi-protocol remote integration (BLE and RF4CE support).
+- Overhaul of key mapping and vendor integration logic.
+- Telemetry improvements for voice stream analytics.
+- Refactoring to enhance HAL interface extensibility.
+- Crash and stability fixes for deep sleep, rapid input, and device discovery.
+- Improved runtime configuration and plugin extensibility.
+
+_For full release notes, please see the [CHANGELOG](https://github.com/rdkcentral/control/blob/develop/CHANGELOG.md)._
+
+## 6. Summary
+
+`rdkcentral/control` delivers a comprehensive control and management solution for RDK devices, emphasizing extensibility, reliability, and integration with modern remote protocols and power management frameworks. It remains the canonical product for remote control, device state, and configuration management within the RDK platform.

src/auth/ctrlm_auth_certificate.cpp

@@ -42,7 +42,7 @@ ctrlm_auth_certificate_t::ctrlm_auth_certificate_t() {
 
    char *cert_path     = NULL;
    char *cert_password = NULL;
-   rdkcertselector_h cert_selector = rdkcertselector_new( NULL, NULL, "MTLS" );
+   rdkcertselector_h cert_selector = rdkcertselector_new( NULL, NULL, "FBK_MTLS" );
 
    if(cert_selector == NULL){
       XLOGD_TELEMETRY("cert selector init failed");

src/ble/ctrlm_ble_controller.cpp

@@ -615,13 +615,13 @@ void ctrlm_obj_controller_ble_t::print_status() {
    XLOGD_INFO("Model                        : %s", model_->to_string().c_str());
    XLOGD_INFO("MAC Address                  : %s", ieee_address_->to_string().c_str());
    XLOGD_INFO("Device Minor ID              : %d", device_minor_id_);
-   XLOGD_INFO("Battery Level                : %u%%", get_battery_percent());
+   XLOGD_AUTOMATION_INFO("Battery Level                : %u%%", get_battery_percent());
    XLOGD_INFO("HW Revision                  : %s", hw_revision_->to_string().c_str());
    XLOGD_INFO("FW Revision                  : %s", fw_revision_->to_string().c_str());
-   XLOGD_INFO("SW Revision                  : %s", sw_revision_->to_string().c_str());
+   XLOGD_AUTOMATION_INFO("SW Revision                  : %s", sw_revision_->to_string().c_str());
    XLOGD_INFO("Serial Number                : %s", serial_number_->to_string().c_str());
    XLOGD_INFO("");
-   XLOGD_INFO("Connected                    : %s", (connected_==true) ? "true" : "false");
+   XLOGD_AUTOMATION_INFO("Connected                    : %s", (connected_==true) ? "true" : "false");
    XLOGD_INFO("Last Activity Time           : %s", ctrlm_utils_time_as_string(this->last_activity_time_get()).c_str());
    XLOGD_INFO("Bound Time                   : %s", ctrlm_utils_time_as_string(this->time_binding_get()).c_str());
    XLOGD_INFO("");
@@ -654,4 +654,21 @@ void ctrlm_obj_controller_ble_t::print_status() {
    XLOGD_WARN("------------------------------------------------------------");
 }
 
+void ctrlm_obj_controller_ble_t::update_controller_id_and_db_entry(std::string db_name, ctrlm_network_id_t network_id, ctrlm_controller_id_t new_id) {
+    ctrlm_obj_controller_t::update_controller_id_and_db_entry(db_name, network_id, new_id);
+
+    std::stringstream new_controller_db_table;
+    new_controller_db_table << db_name << "_" << COUT_HEX_MODIFIER << (int)network_id << "_controller_" << COUT_HEX_MODIFIER << (int)new_id;
+    std::string new_table = new_controller_db_table.str();
+
+    product_name_->set_table(new_table);
+    serial_number_->set_table(new_table);
+    manufacturer_->set_table(new_table);
+    model_->set_table(new_table);
+    fw_revision_->set_table(new_table);
+    sw_revision_->set_table(new_table);
+    hw_revision_->set_table(new_table);
+    battery_percent_->set_table(new_table);
+}
+
 // End Function Implementations

src/ble/ctrlm_ble_controller.h

@@ -147,6 +147,8 @@ class ctrlm_obj_controller_ble_t : public ctrlm_obj_controller_t {
    ctrlm_timestamp_t                getVoiceStartTimeKey() const;
    ctrlm_timestamp_t                getVoiceStartTimeLocal() const;
 
+   void                             update_controller_id_and_db_entry(std::string name, ctrlm_network_id_t network_id, ctrlm_controller_id_t new_id);
+
 private:
    ctrlm_obj_network_ble_t                *obj_network_ble_ = NULL;