diff --git a/application/MissionManager/src/SdCardHandleState.cpp b/application/MissionManager/src/SdCardHandleState.cpp index a465b79..fef26ff 100644 --- a/application/MissionManager/src/SdCardHandleState.cpp +++ b/application/MissionManager/src/SdCardHandleState.cpp @@ -25,11 +25,11 @@ SdCardHandleState::SdCardHandleState() : State("SdCardHandleState"), mSdCardStat } void SdCardHandleState::GoInState() { - LogInfo(" ========== opState::GoInState.\n"); + LogInfo(" ========== SdCardHandleState::GoInState.\n"); } void SdCardHandleState::GoOutState() { - LogInfo(" ========== opState::GoOutState.\n"); + LogInfo(" ========== SdCardHandleState::GoOutState.\n"); } bool SdCardHandleState::ExecuteStateMsg(VStateMachineData *msg) { diff --git a/application/MissionManager/src/StorageHandleState.cpp b/application/MissionManager/src/StorageHandleState.cpp index be53762..57198a7 100644 --- a/application/MissionManager/src/StorageHandleState.cpp +++ b/application/MissionManager/src/StorageHandleState.cpp @@ -23,12 +23,12 @@ StorageHandleState::StorageHandleState() : State("StorageHandleState") } void StorageHandleState::GoInState() { - LogInfo(" ========== opState::GoInState.\n"); + LogInfo(" ========== StorageHandleState::GoInState.\n"); MissionStateMachine::GetInstance()->SwitchState(SystemState::SD_CARD_HANDLE_STATE); } void StorageHandleState::GoOutState() { - LogInfo(" ========== opState::GoOutState.\n"); + LogInfo(" ========== StorageHandleState::GoOutState.\n"); } bool StorageHandleState::ExecuteStateMsg(VStateMachineData *msg) { diff --git a/application/MissionManager/src/TopState.cpp b/application/MissionManager/src/TopState.cpp index bccf6ed..abfe75a 100644 --- a/application/MissionManager/src/TopState.cpp +++ b/application/MissionManager/src/TopState.cpp @@ -22,14 +22,14 @@ TopState::TopState() : State("TopState") } void TopState::GoInState() { - LogInfo(" ========== opState::GoInState.\n"); + LogInfo(" ========== TopState::GoInState.\n"); std::shared_ptr monitor = std::dynamic_pointer_cast(shared_from_this()); IMediaManager::GetInstance()->SetMediaMonitor(monitor); MissionStateMachine::GetInstance()->SwitchState(SystemState::MISSION_STATE); } void TopState::GoOutState() { - LogInfo(" ========== opState::GoOutState.\n"); + LogInfo(" ========== TopState::GoOutState.\n"); } bool TopState::ExecuteStateMsg(VStateMachineData *msg) { diff --git a/application/MissionManager/src/UpgradeState.cpp b/application/MissionManager/src/UpgradeState.cpp index 49abc61..c3659dc 100644 --- a/application/MissionManager/src/UpgradeState.cpp +++ b/application/MissionManager/src/UpgradeState.cpp @@ -23,11 +23,11 @@ UpgradeState::UpgradeState() : State("UpgradeState") } void UpgradeState::GoInState() { - LogInfo(" ========== opState::GoInState.\n"); + LogInfo(" ========== UpgradeState::GoInState.\n"); } void UpgradeState::GoOutState() { - LogInfo(" ========== opState::GoOutState.\n"); + LogInfo(" ========== UpgradeState::GoOutState.\n"); } bool UpgradeState::ExecuteStateMsg(VStateMachineData *msg) { diff --git a/middleware/HuntingUpgrade/src/HuntingUpgradeImpl.cpp b/middleware/HuntingUpgrade/src/HuntingUpgradeImpl.cpp index 495dbab..ba52807 100644 --- a/middleware/HuntingUpgrade/src/HuntingUpgradeImpl.cpp +++ b/middleware/HuntingUpgrade/src/HuntingUpgradeImpl.cpp @@ -20,6 +20,7 @@ StatusCode HuntingUpgradeImpl::CheckFileHeader(const UpgradeFileHeader &head) } StatusCode HuntingUpgradeImpl::CheckUpgradeFile(void) { + LogError("sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss\n"); UpgradeFileHeader header; StatusCode code = UpgradeBase::CheckUpgradeFile(SD_CARD_MOUNT_PATH APPLICATION_CHECK_PATH, header); if (!IsCodeOK(code)) { diff --git a/utils/UpgradeBase/src/UpgradeBase.cpp b/utils/UpgradeBase/src/UpgradeBase.cpp index 7f350ee..d79b228 100644 --- a/utils/UpgradeBase/src/UpgradeBase.cpp +++ b/utils/UpgradeBase/src/UpgradeBase.cpp @@ -21,9 +21,9 @@ StatusCode UpgradeBase::CheckUpgradeFile(const char *fileName, UpgradeFileHeader &header) { FILE *file = nullptr; - + LogInfo("Checking file:%s\n", fileName); file = fopen(fileName, "rb"); - if (file == NULL) { + if (file == nullptr) { LogError("Error opening file:%s\n", fileName); return CreateStatusCode(STATUS_CODE_NOT_OK); } @@ -48,13 +48,13 @@ StatusCode UpgradeBase::MoveUpgradeFile(const char *sourceFile, const char *targ size_t bytesRead; inputFile = fopen(sourceFile, "rb"); - if (inputFile == NULL) { + if (inputFile == nullptr) { LogError("Error opening input file\n"); return CreateStatusCode(STATUS_CODE_NOT_OK); } outputFile = fopen(targetFile, "wb"); - if (outputFile == NULL) { + if (outputFile == nullptr) { LogError("Error opening output file\n"); fclose(inputFile); return CreateStatusCode(STATUS_CODE_NOT_OK);