fix review comments

components/openthread/CMakeLists.txt

@@ -132,8 +132,10 @@ execute_process(
 )
 
 string(TIMESTAMP OT_BUILD_TIMESTAMP " %Y-%m-%d %H:%M:%S UTC" UTC)
-set(OT_FULL_VERSION_STRING
+string(CONCAT OT_FULL_VERSION_STRING
-       "openthread-esp32/${IDF_VERSION_FOR_OPENTHREAD_PACKAGE}-${OPENTHREAD_VERSION}\; ${CONFIG_IDF_TARGET}\; ${OT_BUILD_TIMESTAMP}")
+       "openthread-esp32/"
+       "${IDF_VERSION_FOR_OPENTHREAD_PACKAGE}-${OPENTHREAD_VERSION}\; "
+       "${CONFIG_IDF_TARGET}\; ${OT_BUILD_TIMESTAMP}")
 
 idf_component_register(SRC_DIRS "${src_dirs}"
                        EXCLUDE_SRCS "${exclude_srcs}"
@@ -159,7 +161,7 @@ if(CONFIG_OPENTHREAD_ENABLED)
         "PACKAGE_VERSION=\"${IDF_VERSION_FOR_OPENTHREAD_PACKAGE}-${OPENTHREAD_VERSION}\""
         "OPENTHREAD_BUILD_DATETIME=\"${OT_BUILD_TIMESTAMP}\""
         )
-    if (CONFIG_OPENTHREAD_RADIO)
+    if(CONFIG_OPENTHREAD_RADIO)
         file(WRITE ${CMAKE_BINARY_DIR}/rcp_version ${OT_FULL_VERSION_STRING})
     endif()
 

components/openthread/include/esp_openthread_border_router.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -70,7 +70,7 @@ void esp_openthread_register_rcp_failure_handler(esp_openthread_rcp_failure_hand
  * @brief   Deinitializes the conneciton to RCP.
  *
  */
-void esp_openthread_rcp_deinit();
+void esp_openthread_rcp_deinit(void);
 
 #ifdef __cplusplus
 }

components/openthread/include/esp_openthread_types.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -17,8 +17,6 @@
 extern "C" {
 #endif
 
-#define RCP_FIRMWARE_DIR_SIZE 20
-
 /**
  * @brief OpenThread event declarations
  *

components/openthread/openthread-spinel-config.h

@@ -1,68 +0,0 @@
-/*
- *  Copyright (c) 2020, The OpenThread Authors.
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. Neither the name of the copyright holder nor the
- *     names of its contributors may be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- *  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- *  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *  POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * @file
- *   This file includes compile-time configuration constants for OpenThread.
- */
-
-#ifndef OPENTHREAD_SPINEL_CONFIG_H_
-#define OPENTHREAD_SPINEL_CONFIG_H_
-
-/**
- * @def OPENTHREAD_SPINEL_CONFIG_OPENTHREAD_MESSAGE_ENABLE
- *
- * Define 1 to enable feeding an OpenThread message to encoder/decoder.
- *
- */
-#ifndef OPENTHREAD_SPINEL_CONFIG_OPENTHREAD_MESSAGE_ENABLE
-#define OPENTHREAD_SPINEL_CONFIG_OPENTHREAD_MESSAGE_ENABLE 0
-#endif
-
-/**
- * @def OPENTHREAD_SPINEL_CONFIG_RCP_RESTORATION_MAX_COUNT
- *
- * Defines the max count of RCP failures allowed to be recovered.
- * 0 means to disable RCP failure recovering.
- *
- */
-#ifndef OPENTHREAD_SPINEL_CONFIG_RCP_RESTORATION_MAX_COUNT
-#define OPENTHREAD_SPINEL_CONFIG_RCP_RESTORATION_MAX_COUNT 0
-#endif
-
-/**
- * @def OPENTHREAD_SPINEL_CONFIG_RCP_CUSTOM_RESTORATION
- *
- * Define 1 to call the custom RCP failure handler on RCP failure.
- *
- */
-#ifndef OPENTHREAD_SPINEL_CONFIG_RCP_CUSTOM_RESTORATION
-#define OPENTHREAD_SPINEL_CONFIG_RCP_CUSTOM_RESTORATION 0
-#endif
-
-#endif // OPENTHREAD_SPINEL_CONFIG_H_

components/openthread/private_include/openthread-core-esp32x-ftd-config.h

@@ -190,7 +190,7 @@
 #endif
 
 /**
- * @def oPENTHREAD_CONFIG_BACKBONE_ROUTER_ENABLE
+ * @def OPENTHREAD_CONFIG_BACKBONE_ROUTER_ENABLE
  *
  * Define to 1 to enable Backbone Router support.
  *
@@ -237,7 +237,7 @@
  *
  */
 #ifndef OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE
-#define OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE 0
+#define OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE 1
 #endif
 
 /**
@@ -247,7 +247,7 @@
  *
  */
 #ifndef OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE
-#define OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE 0
+#define OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE 1
 #endif
 
 /**

components/openthread/private_include/openthread-spinel-config.h

@@ -0,0 +1,46 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ *   This file includes compile-time configuration constants for OpenThread.
+ */
+
+#ifndef OPENTHREAD_SPINEL_CONFIG_H_
+#define OPENTHREAD_SPINEL_CONFIG_H_
+
+/**
+ * @def OPENTHREAD_SPINEL_CONFIG_OPENTHREAD_MESSAGE_ENABLE
+ *
+ * Define 1 to enable feeding an OpenThread message to encoder/decoder.
+ *
+ */
+#ifndef OPENTHREAD_SPINEL_CONFIG_OPENTHREAD_MESSAGE_ENABLE
+#define OPENTHREAD_SPINEL_CONFIG_OPENTHREAD_MESSAGE_ENABLE 0
+#endif
+
+/**
+ * @def OPENTHREAD_SPINEL_CONFIG_RCP_RESTORATION_MAX_COUNT
+ *
+ * Defines the max count of RCP failures allowed to be recovered.
+ * 0 means to disable RCP failure recovering.
+ *
+ */
+#ifndef OPENTHREAD_SPINEL_CONFIG_RCP_RESTORATION_MAX_COUNT
+#define OPENTHREAD_SPINEL_CONFIG_RCP_RESTORATION_MAX_COUNT 0
+#endif
+
+/**
+ * @def OPENTHREAD_SPINEL_CONFIG_RCP_CUSTOM_RESTORATION
+ *
+ * Define 1 to call the custom RCP failure handler on RCP failure.
+ *
+ */
+#ifndef OPENTHREAD_SPINEL_CONFIG_RCP_CUSTOM_RESTORATION
+#define OPENTHREAD_SPINEL_CONFIG_RCP_CUSTOM_RESTORATION 0
+#endif
+
+#endif // OPENTHREAD_SPINEL_CONFIG_H_

examples/openthread/ot_rcp/partitions.csv

@@ -1,8 +1,6 @@
 # Name,   Type, SubType, Offset,  Size, Flags
 # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap
 nvs,        data, nvs,      0x9000,  0x6000,
-otadata,    data, ota,      ,        0x2000,
 phy_init,   data, phy,      ,        0x1000,
-ot_storage, data, 0x3a,     ,        0x2000,
+factory,    app,  factory,  0x10000, 1M,
-ota_0,      app,  ota_0,    ,        900K,
+ot_storage, data, 0x3a,            , 0x2000,
-ota_1,      app,  ota_1,    ,        900K,