M350b版本
This commit is contained in:
@ -237,12 +237,7 @@ int VehicleController::SetupEnvironment_M300RTK()
|
||||
throw std::runtime_error("Register osal handler error.");
|
||||
}
|
||||
|
||||
returnCode = DjiPlatform_RegHalUartHandler(&uartHandler);
|
||||
if (returnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
|
||||
{
|
||||
qDebug() << "VehicleController: Func DjiPlatform_RegHalUartHandler. Register hal uart handler error";
|
||||
throw std::runtime_error("Register hal uart handler error.");
|
||||
}
|
||||
|
||||
|
||||
// if (m_struHardwareInfo.enumHCM == HardwareConnectionMode::UartAndNetwork)
|
||||
// {
|
||||
@ -253,8 +248,14 @@ int VehicleController::SetupEnvironment_M300RTK()
|
||||
// throw std::runtime_error("Register hal network handler error");
|
||||
// }
|
||||
// }
|
||||
|
||||
if (m_struHardwareInfo.AirplaneType=="M350"||m_struHardwareInfo.AirplaneType == "M300")
|
||||
{
|
||||
returnCode = DjiPlatform_RegHalUartHandler(&uartHandler);
|
||||
if (returnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
|
||||
{
|
||||
qDebug() << "VehicleController: Func DjiPlatform_RegHalUartHandler. Register hal uart handler error";
|
||||
throw std::runtime_error("Register hal uart handler error.");
|
||||
}
|
||||
//<2F><><EFBFBD><EFBFBD>
|
||||
returnCode = DjiPlatform_RegHalNetworkHandler(&networkHandler);
|
||||
if (returnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
|
||||
@ -268,16 +269,15 @@ int VehicleController::SetupEnvironment_M300RTK()
|
||||
printf("register osal socket handler error");
|
||||
return DJI_ERROR_SYSTEM_MODULE_CODE_SYSTEM_ERROR;
|
||||
}
|
||||
}else {
|
||||
returnCode = DjiPlatform_RegHalUsbBulkHandler(&usbBulkHandler);
|
||||
if (returnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
|
||||
printf("register hal usb bulk handler error");
|
||||
return DJI_ERROR_SYSTEM_MODULE_CODE_SYSTEM_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
// {
|
||||
// returnCode = DjiPlatform_RegHalUsbBulkHandler(&usbBulkHandler);
|
||||
// if (returnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
|
||||
// printf("register hal usb bulk handler error");
|
||||
// return DJI_ERROR_SYSTEM_MODULE_CODE_SYSTEM_ERROR;
|
||||
// }
|
||||
//
|
||||
// }
|
||||
|
||||
returnCode = DjiPlatform_RegFileSystemHandler(&fileSystemHandler);
|
||||
if (returnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
|
||||
{
|
||||
@ -348,20 +348,20 @@ int VehicleController::StartupPSDK_M300RTK()
|
||||
throw std::runtime_error("Start sdk application error.");
|
||||
}
|
||||
|
||||
// T_DjiTestApplyHighPowerHandler applyHighPowerHandler = {
|
||||
// .pinInit = DjiTest_HighPowerApplyPinInit,
|
||||
// .pinWrite = DjiTest_WriteHighPowerApplyPin,
|
||||
// };
|
||||
//
|
||||
// returnCode = DjiTest_RegApplyHighPowerHandler(&applyHighPowerHandler);
|
||||
// if (returnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
|
||||
// USER_LOG_ERROR("regsiter apply high power handler error");
|
||||
// }
|
||||
//
|
||||
// returnCode = DjiTest_PowerManagementStartService();
|
||||
// if (returnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
|
||||
// USER_LOG_ERROR("power management init error");
|
||||
// }
|
||||
T_DjiTestApplyHighPowerHandler applyHighPowerHandler = {
|
||||
.pinInit = DjiTest_HighPowerApplyPinInit,
|
||||
.pinWrite = DjiTest_WriteHighPowerApplyPin,
|
||||
};
|
||||
|
||||
returnCode = DjiTest_RegApplyHighPowerHandler(&applyHighPowerHandler);
|
||||
if (returnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
|
||||
USER_LOG_ERROR("regsiter apply high power handler error");
|
||||
}
|
||||
|
||||
returnCode = DjiTest_PowerManagementStartService();
|
||||
if (returnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
|
||||
USER_LOG_ERROR("power management init error");
|
||||
}
|
||||
osalHandler->TaskSleepMs(5000);
|
||||
SetupWidget();//<2F>?<EFBFBD><C9BC>?<EFBFBD><DFBC><3E><><EFBFBD>
|
||||
osalHandler->TaskSleepMs(5000);
|
||||
@ -784,6 +784,9 @@ int VehicleController::InitSystemParams()
|
||||
// qt.fromString(qstrTime,"hhmmsszzz");
|
||||
qstrDateTime = qstrDate + qstrTime;
|
||||
qdtDateTime = QDateTime::fromString(qstrDateTime, "yyyyMMddhhmmss");
|
||||
QString command="date -s \""+qdtDateTime.toString("yyyy-MM-dd hh:mm:ss")+"\"";
|
||||
system(command.toLatin1().data());
|
||||
|
||||
time_t stdTime = qdtDateTime.toTime_t();
|
||||
|
||||
if (qdtDateTime.isValid())
|
||||
|
||||
Reference in New Issue
Block a user