Changes restyle

project-chip · Feb 11, 2022 · 838d669 · 838d669
1 parent 4903ab5
commit 838d669
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 15 deletions.
diff --git a/examples/lighting-app/mbed/CMakeLists.txt b/examples/lighting-app/mbed/CMakeLists.txt
@@ -27,7 +27,7 @@ if(APP_TYPE STREQUAL "boot" OR APP_TYPE STREQUAL "upgrade")
 endif()
 
 include(${MBED_PATH}/tools/cmake/app.cmake)
-if(MBED_TARGET STREQUAL "CY8CPROTO_062_4343W" AND BOOT_ENABLED)   
+if(MBED_TARGET STREQUAL "CY8CPROTO_062_4343W" AND BOOT_ENABLED)
     list(REMOVE_ITEM MBED_TARGET_LABELS CM0P_SLEEP)
     list(REMOVE_ITEM MBED_TARGET_DEFINITIONS COMPONENT_CM0P_SLEEP=1)
 endif()
@@ -58,7 +58,6 @@ target_sources(${APP_TARGET} PRIVATE
                main/main.cpp
                main/ZclCallbacks.cpp
                ${GEN_DIR}/lighting-app/zap-generated/callback-stub.cpp
-               ${GEN_DIR}/lighting-app/zap-generated/CHIPClusters.cpp
                ${GEN_DIR}/lighting-app/zap-generated/IMClusterCommandHandler.cpp
                ${MBED_COMMON}/util/LEDWidget.cpp
                ${MBED_COMMON}/util/DFUManager.cpp

diff --git a/examples/lock-app/mbed/CMakeLists.txt b/examples/lock-app/mbed/CMakeLists.txt
@@ -27,7 +27,7 @@ if(APP_TYPE STREQUAL "boot" OR APP_TYPE STREQUAL "upgrade")
 endif()
 
 include(${MBED_PATH}/tools/cmake/app.cmake)
-if(MBED_TARGET STREQUAL "CY8CPROTO_062_4343W" AND BOOT_ENABLED)   
+if(MBED_TARGET STREQUAL "CY8CPROTO_062_4343W" AND BOOT_ENABLED)
     list(REMOVE_ITEM MBED_TARGET_LABELS CM0P_SLEEP)
     list(REMOVE_ITEM MBED_TARGET_DEFINITIONS COMPONENT_CM0P_SLEEP=1)
 endif()
@@ -49,7 +49,7 @@ target_include_directories(${APP_TARGET} PRIVATE
                            ${MBED_COMMON}/util/include
                            ${GEN_DIR}/app-common
                            ${GEN_DIR}/lock-app
-                           ${NLIO_ROOT}                                    
+                           ${NLIO_ROOT}
 )
 
 target_sources(${APP_TARGET} PRIVATE
@@ -58,7 +58,6 @@ target_sources(${APP_TARGET} PRIVATE
                main/main.cpp
                main/ZclCallbacks.cpp
                ${GEN_DIR}/lock-app/zap-generated/callback-stub.cpp
-               ${GEN_DIR}/lock-app/zap-generated/CHIPClusters.cpp
                ${GEN_DIR}/lock-app/zap-generated/IMClusterCommandHandler.cpp
                ${MBED_COMMON}/util/LEDWidget.cpp
                ${MBED_COMMON}/util/DFUManager.cpp

diff --git a/examples/ota-requestor-app/mbed/main/AppTask.cpp b/examples/ota-requestor-app/mbed/main/AppTask.cpp
@@ -513,4 +513,4 @@ bool AppTask::OnUpdateApplyHandler(void * context)
     }
     ChipLogProgress(NotSpecified, "\tApply new update %s", response == kUser_Response_confirm ? "CONFIRM" : "REJECT");
     return response == kUser_Response_confirm;
-}
+}
diff --git a/examples/pigweed-app/mbed/main/include/CHIPProjectConfig.h b/examples/pigweed-app/mbed/main/include/CHIPProjectConfig.h
@@ -33,4 +33,4 @@
 
 #ifndef CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION
 #define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION MBED_CONF_APP_VERSION_NUMBER
-#endif
+#endif
diff --git a/examples/platform/mbed/ota/generate_ota_list_image.py b/examples/platform/mbed/ota/generate_ota_list_image.py
@@ -47,23 +47,30 @@
 }
 """
 
+
 def CreateOtaListFile(config, imagePath):
     data = json.loads(FILE_DATA_TEMPLATE)
 
-    data["deviceSoftwareVersionModel"][0]["vendorId"] = int(config["config"]["vendor-id"]["value"])
-    data["deviceSoftwareVersionModel"][0]["productId"] = int(config["config"]["product-id"]["value"])
-    data["deviceSoftwareVersionModel"][0]["softwareVersion"] = int(config["config"]["version-number"]["value"])
-    data["deviceSoftwareVersionModel"][0]["softwareVersionString"] = config["config"]["version-number-str"]["value"].strip('"\\')
+    data["deviceSoftwareVersionModel"][0]["vendorId"] = int(
+        config["config"]["vendor-id"]["value"])
+    data["deviceSoftwareVersionModel"][0]["productId"] = int(
+        config["config"]["product-id"]["value"])
+    data["deviceSoftwareVersionModel"][0]["softwareVersion"] = int(
+        config["config"]["version-number"]["value"])
+    data["deviceSoftwareVersionModel"][0]["softwareVersionString"] = config[
+        "config"]["version-number-str"]["value"].strip('"\\')
     data["deviceSoftwareVersionModel"][0]["otaURL"] = str(imagePath)
 
     output_path = os.path.join(os.path.dirname(imagePath), FILE_NAME)
 
     with open(output_path, 'w') as jsonFile:
         json.dump(data, jsonFile)
 
+
 def main():
     if len(sys.argv) != 3:
-        print('Usage: ' + sys.argv[0] + ' <mbed_config_json_file_path> <image_path>')
+        print('Usage: ' + sys.argv[0] +
+              ' <mbed_config_json_file_path> <image_path>')
         exit(1)
 
     config_json_path = sys.argv[1]

diff --git a/examples/platform/mbed/util/DFUManager.cpp b/examples/platform/mbed/util/DFUManager.cpp
@@ -88,4 +88,4 @@ bool DFUManager::OnOtaUpdateApplyHandler(void * context)
 
     return true;
 }
-#endif
+#endif
diff --git a/examples/platform/mbed/util/include/DFUManager.h b/examples/platform/mbed/util/include/DFUManager.h
@@ -72,4 +72,4 @@ class DFUManager
 inline DFUManager & GetDFUManager(void)
 {
     return DFUManager::sDFUMgr;
-}
+}
diff --git a/src/platform/mbed/OTARequestorDriverImpl.cpp b/src/platform/mbed/OTARequestorDriverImpl.cpp
@@ -59,4 +59,4 @@ void OTARequestorDriverImpl::UpdateDownloaded()
 }
 
 } // namespace DeviceLayer
-} // namespace chip
+} // namespace chip
-Original file line number
+Diff line change
@@ Expand Up / @@ -513,4 +513,4 @@ bool AppTask::OnUpdateApplyHandler(void * context) @@
         }
         ChipLogProgress(NotSpecified, "\tApply new update %s", response == kUser_Response_confirm ? "CONFIRM" : "REJECT");
         return response == kUser_Response_confirm;
-    }
+    }