Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...

diff --cc code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp
Simple merge

diff --cc code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp
index c0c0f81,01df559..dbfb23d
--- 1/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp
--- 2/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp
@@@ -21,8 -21,9 +21,7 @@@
  #ifdef SUPPORT_BATTERY_SERVICE
  #include "battery_hal.h"
  #endif
 -
  #include "health/BloodCardView.h"
- 
  #include <custom_save_runtime.h>
  
  #define MAX_UNWARE_COUNT 10

diff --cc code/sdk/application/wearable/fd230/nativeapp/nativeui/safemodemanager/src/SafeModeManagerModel.cpp
index bc7cfd6,5b82d50..b2fe68a
--- 1/code/sdk/application/wearable/fd230/nativeapp/nativeui/safemodemanager/src/SafeModeManagerModel.cpp
--- 2/code/sdk/application/wearable/fd230/nativeapp/nativeui/safemodemanager/src/SafeModeManagerModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/safemodemanager/src/SafeModeManagerModel.cpp
@@@ -37,9 -42,8 +42,8 @@@ extern "C" 
  // #include "build_version.h"
  // const char *get_version_string(void);
  
- #include "battery_hal.h"
 -
  #include "build_version.h"
 +extern uint8_t battery_get_voltage(float *voltage);
  // const char *get_version_string(void);
  
  bool resfile_checksum_thread(void);

diff --cc code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_auto_ota_cli.config
index 0000000,0000000..cfe0e62
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_auto_ota_cli.config
@@@ -1,0 -1,0 +1,18 @@@
++# Generated by Kconfig Tool.
++# Note: !!!This file can not be modify manually!!!
++
++#
++# Main menu description, show how to use this configuration system.
++#
++
++#
++# Product
++#
++
++#
++# Config the product.
++#
++CONFIG_NORFLASH_SIZE=8
++CONFIG_LOAD_FROM_FS=y
++CONFIG_PSRAM_DENSITY_MB=32
++# end of Product

diff --cc code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_auto_ota_ser.config
index 0000000,0000000..cfe0e62
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_auto_ota_ser.config
@@@ -1,0 -1,0 +1,18 @@@
++# Generated by Kconfig Tool.
++# Note: !!!This file can not be modify manually!!!
++
++#
++# Main menu description, show how to use this configuration system.
++#
++
++#
++# Product
++#
++
++#
++# Config the product.
++#
++CONFIG_NORFLASH_SIZE=8
++CONFIG_LOAD_FROM_FS=y
++CONFIG_PSRAM_DENSITY_MB=32
++# end of Product

diff --cc code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_native_js.config
index 0000000,0000000..cfe0e62
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_native_js.config
@@@ -1,0 -1,0 +1,18 @@@
++# Generated by Kconfig Tool.
++# Note: !!!This file can not be modify manually!!!
++
++#
++# Main menu description, show how to use this configuration system.
++#
++
++#
++# Product
++#
++
++#
++# Config the product.
++#
++CONFIG_NORFLASH_SIZE=8
++CONFIG_LOAD_FROM_FS=y
++CONFIG_PSRAM_DENSITY_MB=32
++# end of Product

diff --cc code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_native_js_r.config
index 0000000,0000000..cfe0e62
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_native_js_r.config
@@@ -1,0 -1,0 +1,18 @@@
++# Generated by Kconfig Tool.
++# Note: !!!This file can not be modify manually!!!
++
++#
++# Main menu description, show how to use this configuration system.
++#
++
++#
++# Product
++#
++
++#
++# Config the product.
++#
++CONFIG_NORFLASH_SIZE=8
++CONFIG_LOAD_FROM_FS=y
++CONFIG_PSRAM_DENSITY_MB=32
++# end of Product

diff --cc code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_native_js_user.config
index 0000000,0000000..cfe0e62
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_native_js_user.config
@@@ -1,0 -1,0 +1,18 @@@
++# Generated by Kconfig Tool.
++# Note: !!!This file can not be modify manually!!!
++
++#
++# Main menu description, show how to use this configuration system.
++#
++
++#
++# Product
++#
++
++#
++# Config the product.
++#
++CONFIG_NORFLASH_SIZE=8
++CONFIG_LOAD_FROM_FS=y
++CONFIG_PSRAM_DENSITY_MB=32
++# end of Product

diff --cc code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_ssb_native_js.config
index 0000000,0000000..cfe0e62
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_ssb_native_js.config
@@@ -1,0 -1,0 +1,18 @@@
++# Generated by Kconfig Tool.
++# Note: !!!This file can not be modify manually!!!
++
++#
++# Main menu description, show how to use this configuration system.
++#
++
++#
++# Product
++#
++
++#
++# Config the product.
++#
++CONFIG_NORFLASH_SIZE=8
++CONFIG_LOAD_FROM_FS=y
++CONFIG_PSRAM_DENSITY_MB=32
++# end of Product

diff --cc code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_ssb_xts.config
index 0000000,0000000..cfe0e62
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_ssb_xts.config
@@@ -1,0 -1,0 +1,18 @@@
++# Generated by Kconfig Tool.
++# Note: !!!This file can not be modify manually!!!
++
++#
++# Main menu description, show how to use this configuration system.
++#
++
++#
++# Product
++#
++
++#
++# Config the product.
++#
++CONFIG_NORFLASH_SIZE=8
++CONFIG_LOAD_FROM_FS=y
++CONFIG_PSRAM_DENSITY_MB=32
++# end of Product

diff --cc code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_xts.config
index 0000000,0000000..cfe0e62
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_xts.config
@@@ -1,0 -1,0 +1,18 @@@
++# Generated by Kconfig Tool.
++# Note: !!!This file can not be modify manually!!!
++
++#
++# Main menu description, show how to use this configuration system.
++#
++
++#
++# Product
++#
++
++#
++# Config the product.
++#
++CONFIG_NORFLASH_SIZE=8
++CONFIG_LOAD_FROM_FS=y
++CONFIG_PSRAM_DENSITY_MB=32
++# end of Product

diff --cc code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_xts_r.config
index 0000000,0000000..cfe0e62
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_xts_r.config
@@@ -1,0 -1,0 +1,18 @@@
++# Generated by Kconfig Tool.
++# Note: !!!This file can not be modify manually!!!
++
++#
++# Main menu description, show how to use this configuration system.
++#
++
++#
++# Product
++#
++
++#
++# Config the product.
++#
++CONFIG_NORFLASH_SIZE=8
++CONFIG_LOAD_FROM_FS=y
++CONFIG_PSRAM_DENSITY_MB=32
++# end of Product

diff --cc code/sdk/zhihui/drivers/cywee/dml/cywee_dml.c
Simple merge