Added the wrapper cmake script

shripad621git · shripad621git · commit 38ac9730ea07 · 2024-01-08T14:24:40.000+05:30
diff --git a/config/esp32/components/chip/factory.cmake b/config/esp32/components/chip/factory.cmake
@@ -14,6 +14,8 @@
 #   limitations under the License.
 #
 
+include(${CMAKE_CURRENT_LIST_DIR}/factory_wrapper.cmake)
+
 function(generate_build_time_partition fctry_partition esp_secure_cert_partition chip_root)
     set(options FLASH_IN_PROJECT)
     set(multi DEPENDS)
@@ -34,31 +36,19 @@ function(generate_build_time_partition fctry_partition esp_secure_cert_partition
     message(STATUS "secure_cert_partition_offset : ${secure_cert_partition_offset}")
 
     if("${fctry_partition_size}" AND "${fctry_partition_offset}")
-        set(DEFAULT_DEVICE_NAME "My bulb")
-        set(DEFAULT_VENDOR_NAME "Test-vendor")
-        set(DEFAULT_HARDWARE_VERSION 1)
-        set(DEFAULT_HARDWARE_VERSION_STR "Devkit")
-        set(DEFAULT_VENDOR_ID 0xFFF2)
-        set(DEFAULT_PRODUCT_ID 0x8001)
-        set(DEFAULT_DAC_CERT "${chip_root_abs_path}/credentials/test/attestation/Chip-Test-DAC-FFF2-8001-0008-Cert.der")
-        set(DEFAULT_DAC_KEY "${chip_root_abs_path}/credentials/test/attestation/Chip-Test-DAC-FFF2-8001-0008-Key.der")
-        set(DEFAULT_PAI_CERT "${chip_root_abs_path}/credentials/test/attestation/Chip-Test-PAI-FFF2-8001-Cert.der")
-        set(DEFAULT_CERT_DCLRN "${chip_root_abs_path}/credentials/test/certification-declaration/Chip-Test-CD-FFF2-8001.der")
-        set(DEFAULT_PASSCODE 20202020)
-        set(DEFAULT_DISCRIMINATOR 3841)
-
-        set(DEVICE_NAME ${DEFAULT_DEVICE_NAME} CACHE STRING "My bulb")
-        set(VENDOR_NAME ${DEFAULT_VENDOR_NAME} CACHE STRING "Test-vendor")
-        set(HARDWARE_VERSION ${DEFAULT_HARDWARE_VERSION} CACHE STRING 1)
-        set(HARDWARE_VERSION_STR  ${DEFAULT_HARDWARE_VERSION_STR} CACHE STRING "Devkit")
-        set(VENDOR_ID ${DEFAULT_VENDOR_ID} CACHE STRING 0xFFF2)
-        set(PRODUCT_ID ${DEFAULT_PRODUCT_ID} CACHE STRING 0x8001)
-        set(DAC_CERT ${DEFAULT_DAC_CERT} CACHE STRING "${chip_root_abs_path}/credentials/test/attestation/Chip-Test-DAC-FFF2-8001-0008-Cert.der")
-        set(DAC_KEY ${DEFAULT_DAC_KEY} CACHE STRING "${chip_root_abs_path}/credentials/test/attestation/Chip-Test-DAC-FFF2-8001-0008-Key.der")
-        set(PAI_CERT ${DEFAULT_PAI_CERT} CACHE STRING "${chip_root_abs_path}/credentials/test/attestation/Chip-Test-PAI-FFF2-8001-Cert.der")
-        set(CERT_DCLRN ${DEFAULT_CERT_DCLRN} CACHE STRING "${chip_root_abs_path}/credentials/test/certification-declaration/Chip-Test-CD-FFF2-8001.der")
-        set(PASSCODE ${DEFAULT_PASSCODE} CACHE STRING 20202020)
-        set(DISCRIMINATOR ${DEFAULT_DISCRIMINATOR} CACHE STRING 3841)
+
+        set_values()
+
+        set(PREVIOUS_VALUES_FILE "${CMAKE_BINARY_DIR}/previous_values.txt")
+
+        if (NOT EXISTS ${PREVIOUS_VALUES_FILE})
+            file(WRITE ${PREVIOUS_VALUES_FILE} "")
+        endif()
+
+        file(READ ${PREVIOUS_VALUES_FILE} PREVIOUS_VALUES)
+
+        set(CURRENT_VALUES_STRING
+        "${DEVICE_NAME}${VENDOR_NAME}${DISCRIMINATOR}${PASSCODE}${VENDOR_ID}${PRODUCT_ID}${HARDWARE_VERSION}${HARDWARE_VERSION_STR}${DAC_CERT}${DAC_KEY}${PAI_CERT}${CERT_DCLRN}")
 
         message(STATUS "Bulb Name: ${DEVICE_NAME}")
         message(STATUS "Vendor Name: ${VENDOR_NAME}")
@@ -73,26 +63,29 @@ function(generate_build_time_partition fctry_partition esp_secure_cert_partition
         message(STATUS "Passcode: ${PASSCODE}")
         message(STATUS "Discriminator: ${DISCRIMINATOR}")
 
-
-        # Execute Factory partition image generation; this always executes as there is no way to specify for CMake to watch for
-        # contents of the base dir changing.
-        add_custom_target(build_time_partition ALL
-        COMMAND ${generate_esp32_chip_factory_bin.py} -d ${DISCRIMINATOR}
-               -p ${PASSCODE}
-               --product-name "${DEVICE_NAME}"
-               --vendor-name "${VENDOR_NAME}"
-               --vendor-id ${VENDOR_ID}
-               --product-id ${PRODUCT_ID}
-               --hw-ver ${HARDWARE_VERSION}
-               --hw-ver-str "${HARDWARE_VERSION_STR}"
-               --dac-cert ${DAC_CERT}
-               --dac-key ${DAC_KEY}
-               --pai-cert ${PAI_CERT}
-               --cd ${CERT_DCLRN}
-	       --dac-in-secure-cert
-	       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    )
-
+        if (NOT "${CURRENT_VALUES_STRING}" STREQUAL "${PREVIOUS_VALUES}")
+            message(STATUS "Values have changed. Triggering add_custom_target.")
+            add_custom_target(build_time_partition ALL
+            COMMAND ${generate_esp32_chip_factory_bin.py} -d ${DISCRIMINATOR}
+                -p ${PASSCODE}
+                --product-name "${DEVICE_NAME}"
+                --vendor-name "${VENDOR_NAME}"
+                --vendor-id ${VENDOR_ID}
+                --product-id ${PRODUCT_ID}
+                --hw-ver ${HARDWARE_VERSION}
+                --hw-ver-str "${HARDWARE_VERSION_STR}"
+                --dac-cert ${DAC_CERT}
+                --dac-key ${DAC_KEY}
+                --pai-cert ${PAI_CERT}
+                --cd ${CERT_DCLRN}
+            --dac-in-secure-cert
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+            )
+            file(WRITE ${PREVIOUS_VALUES_FILE} ${CURRENT_VALUES_STRING})
+        else()
+            add_custom_target(build_time_partition)
+            message(STATUS "Values have not changed. Skipping add_custom_target.")
+        endif()
 
         set(factory_partition_bin ${CMAKE_BINARY_DIR}/bin/factory_partition.bin)
         set(esp_secure_cert_partition_bin ${CMAKE_BINARY_DIR}/bin/esp_secure_cert_partititon.bin)
diff --git a/config/esp32/components/chip/factory_wrapper.cmake b/config/esp32/components/chip/factory_wrapper.cmake
@@ -0,0 +1,25 @@
+# Function to set variable with default value if not defined
+
+
+function(set_default_value VAR DEFAULT_VALUE)
+    if (NOT DEFINED ${VAR})
+        set(${VAR} ${DEFAULT_VALUE} CACHE STRING ${VAR})
+    endif()
+endfunction()
+
+
+function(set_values)
+    # Set variables with default values if not defined
+    set_default_value(DEVICE_NAME "My bulb")
+    set_default_value(VENDOR_NAME "Test-vendor")
+    set_default_value(DISCRIMINATOR 3841)
+    set_default_value(PASSCODE 20202020)
+    set_default_value(VENDOR_ID 0xFFF2)
+    set_default_value(PRODUCT_ID 0x8001)
+    set_default_value(HARDWARE_VERSION 1)
+    set_default_value(HARDWARE_VERSION_STR "Devkit")
+    set_default_value(DAC_CERT "${CHIP_ROOT}/credentials/test/attestation/Chip-Test-DAC-FFF2-8001-0008-Cert.der")
+    set_default_value(DAC_KEY  "${CHIP_ROOT}/credentials/test/attestation/Chip-Test-DAC-FFF2-8001-0008-Key.der")
+    set_default_value(PAI_CERT  "${CHIP_ROOT}/credentials/test/attestation/Chip-Test-PAI-FFF2-8001-Cert.der")
+    set_default_value(CERT_DCLRN "${CHIP_ROOT}/credentials/test/certification-declaration/Chip-Test-CD-FFF2-8001.der")
+endfunction()
diff --git a/scripts/tools/generate_esp32_chip_factory_bin.py b/scripts/tools/generate_esp32_chip_factory_bin.py
@@ -18,16 +18,12 @@
 
 import argparse
 import base64
-import csv
 import enum
-import hashlib
-import json
 import logging
 import os
-import pyqrcode
 import sys
-
 from types import SimpleNamespace
+
 import cryptography.x509
 from bitarray import bitarray
 from bitarray.util import ba2int
@@ -36,8 +32,6 @@
 CHIP_TOPDIR = os.path.dirname(os.path.realpath(__file__))[:-len(os.path.join('scripts', 'tools'))]
 sys.path.insert(0, os.path.join(CHIP_TOPDIR, 'scripts', 'tools', 'spake2p'))
 from spake2p import generate_verifier  # noqa: E402 isort:skip
-sys.path.insert(0,os.path.join(CHIP_TOPDIR, 'src', 'setup_payload','python'))
-from generate_setup_payload import SetupPayload, CommissioningFlow
 
 if os.getenv('IDF_PATH'):
     sys.path.insert(0, os.path.join(os.getenv('IDF_PATH'),
@@ -54,13 +48,11 @@
 
 TOOLS = {}
 
+
 FACTORY_PARTITION_CSV = 'nvs_partition.csv'
 FACTORY_PARTITION_BIN = 'factory_partition.bin'
 NVS_KEY_PARTITION_BIN = 'nvs_key_partition.bin'
 ESP_SECURE_CERT_PARTITION_BIN = 'esp_secure_cert_partititon.bin'
-CONFIG_FILE = 'config.json'
-ONBOARDING_DATA_FILE = 'onboarding_codes.csv'
-QROCDE_FILE = 'qrcode.png'
 
 FACTORY_DATA = {
     # CommissionableDataProvider
@@ -175,25 +167,6 @@
 }
 
 
-def save_config(args):
-    with open(CONFIG_FILE, 'w') as config_file:
-        json.dump(vars(args), config_file)
-
-def load_config():
-    try:
-        with open(CONFIG_FILE, 'r') as config_file:
-            return json.load(config_file)
-    except FileNotFoundError:
-        return None
-
-def calculate_hash(data):
-    return hashlib.sha256(data.encode('utf-8')).hexdigest()
-
-
-def args_changed(current_args, saved_args):
-    return calculate_hash(json.dumps(vars(current_args))) != calculate_hash(json.dumps(saved_args))
-
-
 class CalendarTypes(enum.Enum):
     Buddhist = 0
     Chinese = 1
@@ -629,12 +602,6 @@ def any_base_int(s): return int(s, 0)
                         help='Do not generate the factory partition binary')
     parser.add_argument('--output_dir', type=str, default='bin', help='Created image output file path')
 
-    parser.add_argument('-cf', '--commissioning-flow', type=any_base_int, default=0,
-                                 help='Device commissioning flow, 0:Standard, 1:User-Intent, 2:Custom. \
-                                          Default is 0.', choices=[0, 1, 2])
-    parser.add_argument('-dm', '--discovery-mode', type=any_base_int, default=1,
-                                 help='Commissionable device discovery networking technology. \
-                                         0:WiFi-SoftAP, 1:BLE, 2:On-network. Default is BLE.', choices=[0, 1, 2])
     parser.set_defaults(generate_bin=True)
 
     return parser.parse_args()
@@ -665,42 +632,13 @@ def generate_factory_partiton_binary(args):
 def set_up_out_dirs(args):
     os.makedirs(args.output_dir, exist_ok=True)
 
-def generate_onboarding_data(args):
-    payloads = SetupPayload(args.discriminator, args.passcode, args.discovery_mode, CommissioningFlow(args.commissioning_flow),
-                            args.vendor_id, args.product_id)
-    logging.info('Discovery mode' + str(args.discovery_mode))
-    chip_qrcode = payloads.generate_qrcode()
-    chip_manualcode = payloads.generate_manualcode()
-    # ToDo: remove this if qrcode tool can handle the standard manual code format
-    if args.commissioning_flow == CommissioningFlow.Standard:
-        chip_manualcode = chip_manualcode[:4] + '-' + chip_manualcode[4:7] + '-' + chip_manualcode[7:]
-    else:
-        chip_manualcode = '"' + chip_manualcode[:4] + '-' + chip_manualcode[4:7] + '-' + chip_manualcode[7:11] + '\n' + chip_manualcode[11:15] + '-' + chip_manualcode[15:18] + '-' + chip_manualcode[18:20] + '-' + chip_manualcode[20:21] + '"'
-
-    logging.info('Generated QR code: ' + chip_qrcode)
-    logging.info('Generated manual code: ' + chip_manualcode)
-
-    csv_data = 'qrcode,manualcode,discriminator,passcode\n'
-    csv_data += chip_qrcode + ',' + chip_manualcode + ',' + str(args.discriminator) + ',' + str(args.passcode) + '\n'
-
-    with open(os.path.join(args.output_dir,ONBOARDING_DATA_FILE), 'w') as f:
-        f.write(csv_data)
-
-    chip_qr = pyqrcode.create(chip_qrcode, version=2, error='M')
-    chip_qr.png(os.path.join(args.output_dir,QROCDE_FILE), scale=6)
-
 
 def main():
-    saved_args = load_config()
     args = get_args()
-    if saved_args is None or args_changed(args, saved_args):
-        set_up_out_dirs(args)
-        set_up_factory_data(args)
-        generate_factory_partiton_binary(args)
-        generate_onboarding_data(args)
-        save_config(args)
-    else:
-        logging.info("No changes in arguments. Skipping partition generation.")
+    set_up_out_dirs(args)
+    set_up_factory_data(args)
+    generate_factory_partiton_binary(args)
+
 
 if __name__ == "__main__":
     logging.basicConfig(format='[%(asctime)s] [%(levelname)7s] - %(message)s', level=logging.INFO)
