merge commit
authorCaisking <3449750381@qq.com>
Fri, 15 Mar 2024 02:15:39 +0000 (10:15 +0800)
committerCaisking <3449750381@qq.com>
Fri, 15 Mar 2024 02:15:39 +0000 (10:15 +0800)
commit27cddbd234864b998e0e8af832a1f87c5142d196
tree96d4ef130e283c1fbbee51a31021e0da19f48d1d
parentdc8fb7546fa8a5c4ece37a1ae18a91444881a285
merge commit
92 files changed:
.gitignore
code/sdk/application/brandy/brandy_standard/service_init.c
code/sdk/application/brandy/brandy_standard/thread_pri_init.c
code/sdk/application/wearable/fd230app/CMakeLists.txt
code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp
code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodCheckView.h
code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodOxygenView.h
code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenView.cpp
code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassModel.cpp
code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/BloodCardView.h
code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/BloodCardView.cpp
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h
code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialViewGroup.h
code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp
code/sdk/application/wearable/fd230app/nativeui/message/src/MessageCardView.cpp
code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp
code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingModel.h
code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPlayerView.h
code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPresenter.h
code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingView.h
code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingVolumeSettingView.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingModel.cpp
code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPlayerView.cpp
code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingView.cpp
code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingVolumeSettingView.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h
code/sdk/application/wearable/fd230app/nativeui/soundandvibration/include/SoundAndVibrationVolumeSettingView.h
code/sdk/application/wearable/fd230app/nativeui/soundandvibration/include/SystemVolumePresenter.h
code/sdk/application/wearable/fd230app/nativeui/soundandvibration/include/SystemVolumeView.h
code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingView.cpp
code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumePresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumeView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
code/sdk/build/config/target_config/brandy/config.py
code/sdk/drivers/peripheral/CMakeLists.txt
code/sdk/drivers/peripheral/acc/lis2doc_STdC/examples/lis2doc_read_data_single.c
code/sdk/drivers/peripheral/acc/lis2doc_STdC/lis2doc_porting.c
code/sdk/drivers/peripheral/acc/service/acc_service.c
code/sdk/drivers/peripheral/cywee/CMakeLists.txt
code/sdk/drivers/peripheral/cywee/Inc/CWM_EventStructure.h
code/sdk/drivers/peripheral/cywee/Inc/OsApi.h
code/sdk/drivers/peripheral/cywee/Inc/config.h [moved from code/sdk/drivers/peripheral/cywee/src/config.h with 100% similarity]
code/sdk/drivers/peripheral/cywee/Inc/cywee_at_cmd.h [new file with mode: 0644]
code/sdk/drivers/peripheral/cywee/Inc/cywee_hal.h [new file with mode: 0644]
code/sdk/drivers/peripheral/cywee/Inc/cywee_service.h [new file with mode: 0644]
code/sdk/drivers/peripheral/cywee/service/cywee_at_cmd.c [new file with mode: 0644]
code/sdk/drivers/peripheral/cywee/service/cywee_service.c [new file with mode: 0644]
code/sdk/drivers/peripheral/cywee/src/board_yh601s.c
code/sdk/drivers/peripheral/cywee/src/main.c
code/sdk/drivers/peripheral/cywee/src/main_dml.c
code/sdk/drivers/peripheral/cywee/src/test_api.c
code/sdk/drivers/peripheral/mag/service/mag_service.c
code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp
code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228/DBG/CRANE_DS_XIP_DM_GENERIC_DIAG.mdb [deleted file]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228/DBG/customer_app.hex [deleted file]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228_release_pack.zip [deleted file]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/cat1Service.py
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/checkota.py
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312/DBG/CRANE_DS_XIP_DM_GENERIC.axf [moved from code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228/DBG/CRANE_DS_XIP_DM_GENERIC.axf with 72% similarity]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312/DBG/CRANE_DS_XIP_DM_GENERIC.map [moved from code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228/DBG/CRANE_DS_XIP_DM_GENERIC.map with 62% similarity]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312/DBG/CRANE_DS_XIP_DM_GENERIC_DIAG.mdb [new file with mode: 0644]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312/DBG/CRANE_DS_XIP_DM_GENERIC_MDB.txt [moved from code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228/DBG/CRANE_DS_XIP_DM_GENERIC_MDB.txt with 90% similarity]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312/DBG/CRANE_DS_XIP_DM_GENERIC_NVM.mdb [moved from code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228/DBG/CRANE_DS_XIP_DM_GENERIC_NVM.mdb with 65% similarity]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312/DBG/customer_app.elf [moved from code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228/DBG/customer_app.elf with 67% similarity]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312/DBG/customer_app.hex [new file with mode: 0644]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312/DBG/customer_app.map [moved from code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228/DBG/customer_app.map with 74% similarity]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312.json [moved from code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228.json with 100% similarity]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312.zip [moved from code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228.zip with 56% similarity]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_release_pack.zip [new file with mode: 0644]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20240314-2201.zip [new file with mode: 0644]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/Quectel_Disclaimer_for_Software_BETA_Version.pdf [moved from code/sdk/drivers/peripheral/slip/cat1Service/pyscript/Quectel_Disclaimer_for_Software_BETA_Version.pdf with 100% similarity]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/V2-V3-ota/customer_fs.bin [new file with mode: 0644]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/V2-V3-ota/dfota_1.bin [new file with mode: 0644]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/V2-V3-ota/dfota_2.bin [new file with mode: 0644]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/current_img/readme.txt [new file with mode: 0644]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/main.py
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/origImg/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228.zip [moved from code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228_slip_pcm.zip with 100% similarity]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/origImg/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228_20240303-1652.zip [moved from code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228_20240303-1652.zip with 100% similarity]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/origImg/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228_20240305-0342.zip [moved from code/sdk/drivers/peripheral/slip/cat1Service/pyscript/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0228_20240305-0342.zip with 100% similarity]
code/sdk/drivers/peripheral/slip/cat1Service/pyscript/origImg/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312.zip [new file with mode: 0644]
code/sdk/drivers/peripheral/utils/custom_utils.c
code/sdk/drivers/peripheral/vibrator/service/vibrator_service.cpp
code/sdk/middleware/services/gui/uikit/utils/interfaces/innerkits/graphic_config.h
code/sdk/open_source/openharmony/third_party/lwip/src/apps/http/http_client.c