tangchao0503/airborne_CO2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

M350b版本

Browse Source
This commit is contained in:
xin
2026-01-21 14:44:51 +08:00
parent a76d4b77e9
commit 742b0a1e5a
14 changed files with 92 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/M300/PSDK_Qt/Config/ConfigParser_M300RTK.cpp
View File

@ -153,12 +153,18 @@ int ZZ_ConfigParser_M300RTK::LoadParams()
m_struAppRegInfo.qstrUserAppName = qstrUSER_APP_NAME;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
QString qstrUSER_BAUD_RATE = m_pqfM300ConfigFiles[1]->value(QString("COMPORT/USER_BAUD_RATE"),"NULL").toString();
QString qstrAirplaneType = m_pqfM300ConfigFiles[1]->value(QString("Airplane/AirplaneType"),"NULL").toString();
qDebug() << qstrUSER_BAUD_RATE;
if (qstrUSER_BAUD_RATE == "NULL")
{
qDebug() << "ZZ_ConfigParser_M300:Func LoadParams.USER_BAUD_RATE not load";
return 1;
}
if (qstrAirplaneType == "NULL")
{
qDebug() << "ZZ_ConfigParser_M300:Func LoadParams.AirplaneType not load";
qstrAirplaneType="M350";
}
int iCONFIG_HARDWARE_CONNECTION = m_pqfM300ConfigFiles[1]->value(QString("ADV MODE/CONFIG_HARDWARE_CONNECTION"),10000).toInt();
qDebug() << iCONFIG_HARDWARE_CONNECTION;
@ -170,6 +176,7 @@ int ZZ_ConfigParser_M300RTK::LoadParams()
m_struHardwareInfo.enumHCM = HardwareConnectionMode(iCONFIG_HARDWARE_CONNECTION);
m_struHardwareInfo.qstrBaudRate = qstrUSER_BAUD_RATE;
m_struHardwareInfo.AirplaneType = qstrAirplaneType;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
int iCaptureMode = m_pqfM300ConfigFiles[2]->value(QString("PSDK/CaptureMode"), -1).toInt();
qDebug() << iCaptureMode;

61
Source/M300/PSDK_Qt/Main/VehicleController.cpp
View File

@ -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())

3
Source/M300/PSDK_Qt/Main/test_power_management.c
View File

@ -75,6 +75,7 @@ T_DjiReturnCode DjiTest_PowerManagementStartService(void)
T_DjiReturnCode returnCode;
T_DjiAircraftInfoBaseInfo baseInfo = {0};
int bbb=11;
returnCode = DjiPowerManagement_Init();
if (returnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
USER_LOG_ERROR("power management init error: 0x%08llX.", returnCode);
@ -117,7 +118,7 @@ T_DjiReturnCode DjiTest_PowerManagementStartService(void)
if (baseInfo.djiAdapterType == DJI_SDK_ADAPTER_TYPE_SKYPORT_V3 ||
baseInfo.djiAdapterType == DJI_SDK_ADAPTER_TYPE_EPORT_V2_RIBBON_CABLE) {
E_DjiHighPowerVoltage voltage = E_DJI_HIGH_POWER_VOLTAGE_17V;
E_DjiHighPowerVoltage voltage = E_DJI_HIGH_POWER_VOLTAGE_24V;
USER_LOG_INFO("Start to apply high power.");

1
Source/M300/PSDK_Qt/ZZ_Types_DJI.h
View File

@ -29,6 +29,7 @@ namespace ZZ
{
HardwareConnectionMode enumHCM;
QString qstrBaudRate;
QString AirplaneType;
}HardwareInfo;
typedef struct tagUIConfig