Germany/hunting
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Fixed:formatting bug and cross compile.

Browse Source
This commit is contained in:
Fancy code 2024-07-16 18:53:46 +08:00
parent dd0f1b0895
commit 93cb0f8573
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/MissionManager/src/FormattingState.cpp
View File

@ -65,6 +65,6 @@ void FormattingState::FormattingThread(void)
IFilesManager::GetInstance()->UnInit(); IFilesManager::GetInstance()->UnInit();
IStorageManager::GetInstance()->FormatSDCardNow(); IStorageManager::GetInstance()->FormatSDCardNow();
// IFilesManager::GetInstance()->Init(); // IFilesManager::GetInstance()->Init();
MissionStateMachine::GetInstance()->SwitchState(SystemState::STORAGE_HANDLE_STATE); MissionStateMachine::GetInstance()->SwitchState(SystemState::IDLE_STATE);
LogInfo("Formatting SD card done.\n"); LogInfo("Formatting SD card done.\n");
} }

6
hal/src/SdCardHal.cpp
View File

@ -147,8 +147,8 @@ void SdCardHal::DevDetectingThread(void)
} }
else { else {
// LogInfo("sdCardHal: %s is inserted.\n", SD_CARD_DEVICE); // LogInfo("sdCardHal: %s is inserted.\n", SD_CARD_DEVICE);
if (SdCardHalStatus::INSERTED != mStatus && SdCardHalStatus::MOUNTED != mStatus && if (SdCardHalStatus::INSERTED != mStatus && SdCardHalStatus::MOUNTED != mStatus /* &&
SdCardHalStatus::UNMOUNTED != mStatus) { SdCardHalStatus::UNMOUNTED != mStatus*/) {
mStatus = SdCardHalStatus::INSERTED; mStatus = SdCardHalStatus::INSERTED;
ReportDetecedChangedResult(mStatus); ReportDetecedChangedResult(mStatus);
} }
@ -220,6 +220,8 @@ void SdCardHal::UnmountSdCard(void)
LogError("Format sd card failed [%s].\n", SD_CARD_DEVICE); LogError("Format sd card failed [%s].\n", SD_CARD_DEVICE);
return; return;
} }
mStatus = SdCardHalStatus::UNMOUNTED;
ReportDetecedChangedResult(mStatus);
} }
void SdCardHal::MountSdCard(void) void SdCardHal::MountSdCard(void)
{ {

2
utils/MediaBase/CMakeLists.txt
View File

@ -20,7 +20,7 @@ aux_source_directory(./src SRC_FILES)
set(TARGET_NAME MediaBase) set(TARGET_NAME MediaBase)
add_library(${TARGET_NAME} STATIC ${SRC_FILES}) add_library(${TARGET_NAME} STATIC ${SRC_FILES})
target_link_libraries(${TARGET_NAME} avformat avcodec avutil swresample avdevice avfilter swscale postproc fdk-aac StatusCode Log) target_link_libraries(${TARGET_NAME} LinuxApi avformat avcodec avutil swresample avdevice avfilter swscale postproc fdk-aac StatusCode Log)
if(${TARGET_PLATFORM} MATCHES ${DEFINE_LINUX}) if(${TARGET_PLATFORM} MATCHES ${DEFINE_LINUX})
target_link_libraries(${TARGET_NAME} z) target_link_libraries(${TARGET_NAME} z)
endif() endif()