V1.1 正式版本提交
主要新增功能： 1. 添加 Debian 打包脚本 (pack_deb.sh)，支持一键打包部署 2. 新增机顶辐照度使用说明书 (README.md)，记录系统配置和使用方法 3. 添加 SD 卡配置更新功能 (configdatairis 文件夹)，便于现场配置 4. 新增光谱仪打开失败检测，两灯同时闪烁提示异常 5. 添加说明书自动拷贝到 SD 卡功能 详细修改： - main.cpp: * 添加 SD 卡 configdatairis 配置更新逻辑 * 添加说明书自动拷贝到 /home/data/ * 优化 stopwait.txt 判断逻辑 - Source/Capture/MainGrabber.cpp: * 添加光谱仪初始化失败检测，失败时两灯同时闪烁 - Source/Logger/Logger.h: * 添加日志功能支持 - pack_deb.sh: * 新增完整的 Debian 打包脚本 * 支持自动构建、复制文件、生成 postinst/prerm - root/start.sh: * 添加 mkdir 确保 /home/data 目录存在 - root/DCTable.txt: * 添加默认暗电流校准表文件 - README.md: * 编写完整的中文使用说明书 * 包含硬件连接、目录结构、配置说明、GPIO 指示灯含义等 依赖文件： - /root/DeviceSettings.ini (需另行配置) - /root/机顶辐照度使用说明书.md (打包时自动复制)
This commit is contained in:
108
main.cpp
108
main.cpp
@ -46,7 +46,7 @@ int main(int argc, char* argv[])
|
||||
|
||||
QCoreApplication a(argc, argv);
|
||||
|
||||
//ָʾ<D6B8>ƿ<EFBFBD><C6BF><EFBFBD>
|
||||
//ָʾ<D6B8>ƿ<EFBFBD><C6BF><EFBFBD>
|
||||
//system("sudo mount / dev / mmcblk1p1 / home / data");
|
||||
system("gpio mode 4 out");
|
||||
system("gpio mode 5 out");
|
||||
@ -55,7 +55,7 @@ int main(int argc, char* argv[])
|
||||
qDebug() << "system(gpio mode 5 out)";
|
||||
|
||||
///check tf card
|
||||
//<2F><><EFBFBD><EFBFBD>sd<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>أ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>еƾͽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˸
|
||||
//<2F><><EFBFBD>sd<73><64><EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD>أ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>еƾͽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˸
|
||||
std::string device = "/dev/mmcblk1p1";
|
||||
std::string mount_point = "/home/data";
|
||||
if (!is_mounted(device, mount_point)/*1*/)
|
||||
@ -75,21 +75,60 @@ int main(int argc, char* argv[])
|
||||
}
|
||||
}
|
||||
|
||||
// 拷贝说明书到 SD 卡
|
||||
if (!QFile::exists("/home/data/机顶辐照度使用说明书.md")) {
|
||||
if (QFile::exists("/root/机顶辐照度使用说明书.md")) {
|
||||
QFile::copy("/root/机顶辐照度使用说明书.md", "/home/data/机顶辐照度使用说明书.md");
|
||||
}
|
||||
}
|
||||
|
||||
QEventLoop qeLoop;
|
||||
QTimer::singleShot(30000, &qeLoop, SLOT(quit()));
|
||||
//QTimer::singleShot(10000, &qeLoop, SLOT(quit()));
|
||||
qeLoop.exec();
|
||||
//////////////////////////////////////////////////////////////////////////Check configdatairis folder
|
||||
QDir qdirConfigDataIris("/home/data/configdatairis");
|
||||
if (qdirConfigDataIris.exists())
|
||||
{
|
||||
printf("configdatairis folder found. Copying config files...\n");
|
||||
|
||||
QFileInfo fiSettings("/home/data/configdatairis/DeviceSettings.ini");
|
||||
if (fiSettings.isFile() && fiSettings.size() >= 50)
|
||||
{
|
||||
QFile::copy("/home/data/configdatairis/DeviceSettings.ini", "/root/DeviceSettings.ini");
|
||||
printf(" DeviceSettings.ini copied.\n");
|
||||
}
|
||||
|
||||
QFileInfo fiDCTable("/home/data/configdatairis/DCTable.txt");
|
||||
if (fiDCTable.isFile())
|
||||
{
|
||||
QFile::copy("/home/data/configdatairis/DCTable.txt", "/root/DCTable.txt");
|
||||
printf(" DCTable.txt copied.\n");
|
||||
}
|
||||
|
||||
// 删除configdatairis文件夹
|
||||
qdirConfigDataIris.removeRecursively();
|
||||
printf("configdatairis folder removed.\n");
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////Check configdatairis folder
|
||||
|
||||
|
||||
|
||||
if (!QFile::exists("/home/data/stopwait.txt")) {
|
||||
QEventLoop qeLoop;
|
||||
QTimer::singleShot(30000, &qeLoop, SLOT(quit()));
|
||||
// //QTimer::singleShot(10000, &qeLoop, SLOT(quit()));
|
||||
qeLoop.exec();
|
||||
}
|
||||
// QTimer::singleShot(30000, &qeLoop, SLOT(quit()));
|
||||
// //QTimer::singleShot(10000, &qeLoop, SLOT(quit()));
|
||||
// qeLoop.exec();
|
||||
|
||||
|
||||
|
||||
OneFSContext m_struFSParam;//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
OneFSContext m_struFSParam;//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
GPSInfo m_struGPSInfo;
|
||||
//FodisRP m_struMiscRunParams;
|
||||
|
||||
ZZ_SysConfigger m_syscfSettings;//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
ZZ_SysConfigger m_syscfSettings;//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
BD357Controller m_ctrlGPS;
|
||||
CMainGrabber m_mgMainGrabber;//<2F><><EFBFBD>ɼ<EFBFBD>
|
||||
CMainGrabber m_mgMainGrabber;//<2F><><EFBFBD>ɼ<EFBFBD>
|
||||
DataFileProcessor m_dfpDataSaver;
|
||||
|
||||
#ifndef WIN32
|
||||
@ -108,47 +147,12 @@ int main(int argc, char* argv[])
|
||||
|
||||
QFileInfo m_qfiSettingFileInfo("/home/data/Setting/DeviceSettings.ini");
|
||||
|
||||
if (!m_qfiSettingFileInfo.isFile())
|
||||
// 如果SD卡上有配置文件，拷贝到/root下
|
||||
if (m_qfiSettingFileInfo.isFile() && m_qfiSettingFileInfo.size() >= 50)
|
||||
{
|
||||
printf ("DeviceSettings File Missing !!! Will create from default one.");
|
||||
|
||||
QDir qdirPath("/home/data/Setting");
|
||||
if (!qdirPath.exists())
|
||||
{
|
||||
bool bRes = qdirPath.mkpath("/home/data/Setting");
|
||||
if (!bRes)
|
||||
{
|
||||
qDebug() << "DataFileProcessor mkdir Failed.";
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
bool bRes = QFile::copy("/root/DeviceSettings.ini", "/home/data/Setting/DeviceSettings.ini");
|
||||
if (!bRes)
|
||||
{
|
||||
qDebug() << " QFile::copy Failed.";
|
||||
return -2;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
int iSize = m_qfiSettingFileInfo.size();
|
||||
if (iSize<50)
|
||||
{
|
||||
bool bRes = QFile::remove("/home/data/Setting/DeviceSettings.ini");
|
||||
if (!bRes)
|
||||
{
|
||||
qDebug() << " QFile::remove Failed.";
|
||||
return -2;
|
||||
}
|
||||
|
||||
bRes = QFile::copy("/root/DeviceSettings.ini", "/home/data/Setting/DeviceSettings.ini");
|
||||
if (!bRes)
|
||||
{
|
||||
qDebug() << " QFile::copy Failed.";
|
||||
return -2;
|
||||
}
|
||||
}
|
||||
printf("DeviceSettings found on SD card. Copying to /root...");
|
||||
QFile::copy("/home/data/Setting/DeviceSettings.ini", "/root/DeviceSettings.ini");
|
||||
printf("Done.\n");
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////Check Settings File
|
||||
//////////////////////////////////////////////////////////////////////////Load Settings File
|
||||
@ -209,19 +213,19 @@ int main(int argc, char* argv[])
|
||||
//m_test.Initialize_Part();
|
||||
//m_test.LoadTable();
|
||||
////////////////////////////////test only
|
||||
m_ctrlGPS.SetContext(m_mgMainGrabber);//<2F><>ʼ<EFBFBD><CABC>gps
|
||||
m_ctrlGPS.SetContext(m_mgMainGrabber);//<2F><>ʼ<EFBFBD><CABC>gps
|
||||
m_ctrlGPS.SetupMessagePipeline();
|
||||
m_ctrlGPS.Initialize(m_struGPSInfo);
|
||||
|
||||
QThread* m_pqDataGrabberThreadHolder = new QThread();
|
||||
m_mgMainGrabber.moveToThread(m_pqDataGrabberThreadHolder);
|
||||
|
||||
m_mgMainGrabber.SetRunParams(m_struFSParam);//<2F><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD>ɼ<EFBFBD><C9BC>߳<EFBFBD>
|
||||
m_mgMainGrabber.SetRunParams(m_struFSParam);//<2F><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD>ɼ<EFBFBD><C9BC>߳<EFBFBD>
|
||||
m_mgMainGrabber.SetContext(m_ctrlGPS, m_dfpDataSaver);
|
||||
|
||||
m_pqDataGrabberThreadHolder->start();
|
||||
|
||||
m_mgMainGrabber.Initialize();//<2F><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>
|
||||
m_mgMainGrabber.Initialize();//<2F><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>
|
||||
|
||||
//m_ctrlGPS.VSlot_SkipSyncDateOnce();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user