diff --git a/CmakeLists.txt b/CmakeLists.txt index f55164e..3516327 100644 --- a/CmakeLists.txt +++ b/CmakeLists.txt @@ -20,6 +20,7 @@ include_directories("source/Settings") include_directories("source/Thread") include_directories("source/LinearShutter") include_directories("source/OSIF/include") +include_directories("source/Misc_Detector") link_directories("source/OSIF/DLib") diff --git a/Data/2021_12_14/beijing_16_10_04.csv b/Data/2021_12_14/beijing_16_10_04.csv new file mode 100644 index 0000000..3d883b4 --- /dev/null +++ b/Data/2021_12_14/beijing_16_10_04.csv @@ -0,0 +1,6 @@ +EnvironmentalContext,CaseHumidity,,CaseTemperature,,GPS_Altitude,50,GPS_Latitude,118,GPS_Longtitude,117,GPS_North,on,Location,beijing,UTCDateTime,2021_12_14 08:10:04,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110 +TotalSpectrometer,1 +FS1_Info,Model,OSIFAlpha,SN,QEP02975,Pixels,1044,Depth,230000 +Wavelength,730.326,730.39,730.454,730.517,730.581,730.645,730.708,730.772,730.835,730.899,730.962,731.026,731.089,731.152,731.216,731.279,731.342,731.406,731.469,731.532,731.595,731.659,731.722,731.785,731.848,731.911,731.974,732.037,732.1,732.163,732.226,732.289,732.352,732.415,732.478,732.541,732.603,732.666,732.729,732.792,732.854,732.917,732.98,733.042,733.105,733.168,733.23,733.293,733.355,733.418,733.48,733.542,733.605,733.667,733.73,733.792,733.854,733.917,733.979,734.041,734.103,734.165,734.227,734.29,734.352,734.414,734.476,734.538,734.6,734.662,734.724,734.786,734.847,734.909,734.971,735.033,735.095,735.157,735.218,735.28,735.342,735.403,735.465,735.527,735.588,735.65,735.711,735.773,735.834,735.896,735.957,736.018,736.08,736.141,736.203,736.264,736.325,736.386,736.448,736.509,736.57,736.631,736.692,736.753,736.814,736.875,736.936,736.997,737.058,737.119,737.18,737.241,737.302,737.363,737.424,737.484,737.545,737.606,737.667,737.727,737.788,737.849,737.909,737.97,738.03,738.091,738.151,738.212,738.272,738.333,738.393,738.453,738.514,738.574,738.634,738.695,738.755,738.815,738.875,738.935,738.996,739.056,739.116,739.176,739.236,739.296,739.356,739.416,739.476,739.536,739.596,739.655,739.715,739.775,739.835,739.894,739.954,740.014,740.074,740.133,740.193,740.252,740.312,740.372,740.431,740.491,740.55,740.609,740.669,740.728,740.788,740.847,740.906,740.966,741.025,741.084,741.143,741.202,741.262,741.321,741.38,741.439,741.498,741.557,741.616,741.675,741.734,741.793,741.852,741.91,741.969,742.028,742.087,742.146,742.204,742.263,742.322,742.38,742.439,742.498,742.556,742.615,742.673,742.732,742.79,742.849,742.907,742.965,743.024,743.082,743.141,743.199,743.257,743.315,743.373,743.432,743.49,743.548,743.606,743.664,743.722,743.78,743.838,743.896,743.954,744.012,744.07,744.128,744.186,744.243,744.301,744.359,744.417,744.474,744.532,744.59,744.647,744.705,744.763,744.82,744.878,744.935,744.993,745.05,745.108,745.165,745.222,745.28,745.337,745.394,745.452,745.509,745.566,745.623,745.68,745.737,745.795,745.852,745.909,745.966,746.023,746.08,746.137,746.194,746.25,746.307,746.364,746.421,746.478,746.534,746.591,746.648,746.705,746.761,746.818,746.875,746.931,746.988,747.044,747.101,747.157,747.214,747.27,747.326,747.383,747.439,747.495,747.552,747.608,747.664,747.72,747.777,747.833,747.889,747.945,748.001,748.057,748.113,748.169,748.225,748.281,748.337,748.393,748.449,748.505,748.56,748.616,748.672,748.728,748.783,748.839,748.895,748.95,749.006,749.061,749.117,749.172,749.228,749.283,749.339,749.394,749.45,749.505,749.56,749.616,749.671,749.726,749.781,749.837,749.892,749.947,750.002,750.057,750.112,750.167,750.222,750.277,750.332,750.387,750.442,750.497,750.552,750.606,750.661,750.716,750.771,750.826,750.88,750.935,750.99,751.044,751.099,751.153,751.208,751.262,751.317,751.371,751.426,751.48,751.534,751.589,751.643,751.697,751.752,751.806,751.86,751.914,751.968,752.022,752.077,752.131,752.185,752.239,752.293,752.347,752.401,752.454,752.508,752.562,752.616,752.67,752.724,752.777,752.831,752.885,752.938,752.992,753.046,753.099,753.153,753.206,753.26,753.313,753.367,753.42,753.474,753.527,753.58,753.634,753.687,753.74,753.794,753.847,753.9,753.953,754.006,754.059,754.112,754.165,754.218,754.271,754.324,754.377,754.43,754.483,754.536,754.589,754.642,754.694,754.747,754.8,754.853,754.905,754.958,755.011,755.063,755.116,755.168,755.221,755.273,755.326,755.378,755.431,755.483,755.535,755.588,755.64,755.692,755.744,755.797,755.849,755.901,755.953,756.005,756.057,756.109,756.161,756.213,756.265,756.317,756.369,756.421,756.473,756.525,756.576,756.628,756.68,756.732,756.783,756.835,756.887,756.938,756.99,757.042,757.093,757.145,757.196,757.247,757.299,757.35,757.402,757.453,757.504,757.556,757.607,757.658,757.709,757.76,757.812,757.863,757.914,757.965,758.016,758.067,758.118,758.169,758.22,758.271,758.322,758.372,758.423,758.474,758.525,758.576,758.626,758.677,758.728,758.778,758.829,758.879,758.93,758.981,759.031,759.082,759.132,759.182,759.233,759.283,759.333,759.384,759.434,759.484,759.534,759.585,759.635,759.685,759.735,759.785,759.835,759.885,759.935,759.985,760.035,760.085,760.135,760.185,760.235,760.285,760.334,760.384,760.434,760.483,760.533,760.583,760.632,760.682,760.732,760.781,760.831,760.88,760.93,760.979,761.028,761.078,761.127,761.176,761.226,761.275,761.324,761.373,761.423,761.472,761.521,761.57,761.619,761.668,761.717,761.766,761.815,761.864,761.913,761.962,762.01,762.059,762.108,762.157,762.206,762.254,762.303,762.352,762.4,762.449,762.497,762.546,762.595,762.643,762.691,762.74,762.788,762.837,762.885,762.933,762.982,763.03,763.078,763.126,763.174,763.223,763.271,763.319,763.367,763.415,763.463,763.511,763.559,763.607,763.655,763.703,763.751,763.798,763.846,763.894,763.942,763.989,764.037,764.085,764.132,764.18,764.228,764.275,764.323,764.37,764.418,764.465,764.512,764.56,764.607,764.654,764.702,764.749,764.796,764.843,764.891,764.938,764.985,765.032,765.079,765.126,765.173,765.22,765.267,765.314,765.361,765.408,765.455,765.501,765.548,765.595,765.642,765.688,765.735,765.782,765.828,765.875,765.922,765.968,766.015,766.061,766.108,766.154,766.2,766.247,766.293,766.339,766.386,766.432,766.478,766.524,766.571,766.617,766.663,766.709,766.755,766.801,766.847,766.893,766.939,766.985,767.031,767.077,767.122,767.168,767.214,767.26,767.306,767.351,767.397,767.443,767.488,767.534,767.579,767.625,767.67,767.716,767.761,767.807,767.852,767.897,767.943,767.988,768.033,768.079,768.124,768.169,768.214,768.259,768.304,768.35,768.395,768.44,768.485,768.53,768.575,768.619,768.664,768.709,768.754,768.799,768.844,768.888,768.933,768.978,769.022,769.067,769.112,769.156,769.201,769.245,769.29,769.334,769.379,769.423,769.467,769.512,769.556,769.6,769.645,769.689,769.733,769.777,769.821,769.866,769.91,769.954,769.998,770.042,770.086,770.13,770.174,770.217,770.261,770.305,770.349,770.393,770.437,770.48,770.524,770.568,770.611,770.655,770.698,770.742,770.786,770.829,770.872,770.916,770.959,771.003,771.046,771.089,771.133,771.176,771.219,771.262,771.306,771.349,771.392,771.435,771.478,771.521,771.564,771.607,771.65,771.693,771.736,771.779,771.822,771.864,771.907,771.95,771.993,772.035,772.078,772.121,772.163,772.206,772.249,772.291,772.334,772.376,772.418,772.461,772.503,772.546,772.588,772.63,772.673,772.715,772.757,772.799,772.841,772.883,772.926,772.968,773.01,773.052,773.094,773.136,773.178,773.219,773.261,773.303,773.345,773.387,773.429,773.47,773.512,773.554,773.595,773.637,773.679,773.72,773.762,773.803,773.845,773.886,773.927,773.969,774.01,774.052,774.093,774.134,774.175,774.217,774.258,774.299,774.34,774.381,774.422,774.463,774.504,774.545,774.586,774.627,774.668,774.709,774.75,774.791,774.831,774.872,774.913,774.953,774.994,775.035,775.075,775.116,775.157,775.197,775.238,775.278,775.318,775.359,775.399,775.44,775.48,775.52,775.56,775.601,775.641,775.681,775.721,775.761,775.801,775.842,775.882,775.922,775.962,776.002,776.041,776.081,776.121,776.161,776.201,776.241,776.28,776.32,776.36,776.399,776.439,776.479,776.518,776.558,776.597,776.637,776.676,776.716,776.755,776.794,776.834,776.873,776.912,776.952,776.991,777.03,777.069,777.108,777.147,777.186,777.226,777.265,777.304,777.342,777.381,777.42,777.459,777.498,777.537,777.576,777.614,777.653,777.692,777.731,777.769,777.808,777.846,777.885,777.923,777.962,778,778.039,778.077,778.116,778.154,778.192,778.231,778.269,778.307,778.345,778.383,778.422,778.46,778.498,778.536,778.574,778.612,778.65,778.688,778.726,778.764,778.802,778.839,778.877,778.915,778.953,778.99,779.028,779.066,779.103,779.141,779.178,779.216,779.254,779.291,779.328,779.366,779.403,779.441,779.478,779.515,779.552,779.59,779.627,779.664,779.701,779.738,779.776,779.813,779.85,779.887,779.924,779.961,779.997,780.034,780.071,780.108,780.145,780.182,780.218,780.255,780.292,780.328,780.365,780.402,780.438,780.475,780.511,780.548,780.584,780.621,780.657,780.693,780.73,780.766,780.802,780.839,780.875,780.911,780.947,780.983,781.019,781.055,781.091,781.128,781.163,781.199,781.235,781.271,781.307,781.343,781.379,781.414,781.45,781.486,781.522,781.557,781.593,781.629,781.664,781.7,781.735,781.771,781.806,781.841,781.877,781.912,781.948,781.983,782.018,782.053,782.089,782.124,782.159,782.194,782.229 +Data Section +OSIFAlpha_P1,valid,10,-1,1,1,-6,5,-4,1,-4,1,6,1,-3,0,2,-1,-3,-1,-2,-2,-3,-2,-2,3,2,0,0,-2,-4,-1,-3,0,4,2,0,3,1,3,-4,-1,-5,3,3,4,-5,-1,0,1,-1,2,-2,0,1,-2,-2,-2,1,7,-6,3,-1,1,1,3,3,2,-1,1,-4,0,-5,3,6,-3,1,1,-2,-1,1,2,2,-1,0,-5,0,3,2,2,3,-1,3,-6,0,0,-1,2,-3,5,2,-3,0,-2,2,-1,6,1,-1,0,-5,6,-1,-1,1,-4,4,3,2,1,-1,0,3,0,0,-3,-1,0,2,4,-4,1,8,0,-2,3,0,3,-2,1,1,0,-4,0,2,-2,-4,-1,2,1,1,-1,1,-1,4,1,2,1,5,-4,-1,-4,-1,-5,0,-5,1,2,-1,-1,-5,4,1,4,5,-4,-2,-2,-4,0,6,0,-3,-2,-1,-1,-1,3,1,5,-8,-7,1,-1,-2,-3,-1,0,1,2,0,-3,-2,2,0,-1,-3,0,3,-2,-3,1,2,2,-3,-2,3,1,-5,0,3,-2,0,-3,-1,-3,1,3,1,4,0,-6,2,-1,-1,4,2,-5,-2,-2,1,-1,2,1,-8,8,-1,5,2,0,-1,3,-1,-1,-2,-6,4,-4,1,2,-1,1,-4,3,2,-1,2,4,-2,-1,2,1,-3,0,2,-4,5,0,1,-2,-1,-1,5,-2,0,0,3,-3,2,-2,3,-4,0,-8,-4,-1,0,1,-1,6,8,0,-5,2,2,0,-3,-5,5,1,-1,0,3,5,-2,1,-6,1,-3,0,-5,8,2,5,1,2,4,4,1,0,-4,7,-1,-2,0,-4,-3,-3,1,-4,4,-2,2,0,0,0,-3,-2,2,0,2,-4,-2,2,7,3,-2,-3,4,-5,8,2,2,-2,-1,-2,0,6,-1,0,2,-6,-2,-4,4,3,-3,-1,1,3,-1,-1,1,4,2,-6,-2,-7,-3,1,-3,0,-5,7,3,1,-3,3,0,5,-6,1,1,8,4,5,-2,-1,-3,1,-1,-1,2,1,4,5,-1,1,0,-1,3,1,-1,-2,2,1,-3,1,1,-4,6,-1,-2,-1,5,-1,5,3,3,-5,-1,2,-2,-3,2,-1,3,-2,5,-3,3,-3,0,4,-3,-1,-2,-7,1,0,7,0,-1,-2,0,2,-1,2,-2,-3,-2,-6,-5,2,-1,-6,3,1,-4,-4,0,5,3,-6,-6,0,5,-3,2,3,-2,-6,2,-2,4,-3,1,-3,1,2,-2,-2,-1,2,-1,-2,2,2,2,4,1,1,-2,0,11,1,0,1,1,1,-3,-7,-5,1,1,-2,-1,5,-4,-7,-1,0,2,-2,-2,-1,4,4,-3,-1,3,1,4,-1,3,0,-2,-2,-3,0,-2,1,1,4,0,2,-3,6,-1,-6,-2,12,0,2,3,1,0,-2,0,2,3,2,-6,-1,2,-2,-4,1,2,-1,2,-3,1,5,-2,-4,-3,0,4,4,-2,9,0,0,4,1,-4,-2,-1,-4,-7,1,1,-4,4,0,-3,3,4,3,-2,1,-6,-3,-5,2,-4,1,2,-4,1,2,-1,4,-2,-4,2,1,-2,-3,-2,0,0,-1,-2,-4,2,-1,1,1,2,-3,2,3,4,3,0,5,-3,1,0,1,-3,-7,-4,4,-3,-3,3,2,2,1,-2,2,1,-3,0,1,0,-7,1,-1,-5,1,3,-1,-5,-1,1,-4,8,0,2,0,0,-6,0,-5,4,-1,-2,4,1,-1,0,3,2,1,2,0,-2,-2,4,0,0,4,1,3,3,1,2,-1,-1,-5,-2,0,0,-5,1,-4,-1,2,0,4,7,-6,-2,-2,0,-1,1,0,4,5,-1,-2,-3,-4,-1,3,3,3,0,1,-4,-2,6,1,-4,-2,-2,-1,2,0,0,1,-6,1,4,-1,-5,-3,0,1,5,-1,2,4,2,-1,2,1,-3,2,-2,5,-2,4,1,-2,0,0,-2,2,1,5,-3,3,4,-1,1,7,-3,3,1,0,-4,1,0,-5,-2,0,3,-1,1,1,1,1,4,2,2,-3,2,-1,2,-2,-4,-1,0,1,-2,0,-3,4,3,-2,5,5,0,1,7,-2,-1,6,5,-4,-3,-1,2,-1,-2,2,-2,-4,4,1,2,2,2,3,1,-2,-2,-1,2,0,-3,4,-2,-2,-1,4,-5,-4,-4,3,4,7,0,-3,-3,0,1,-3,1,1,2,5,4,-2,4,6,2,-4,-1,-1,-4,1,0,1,-6,-3,4,1,-8,0,2,1,0,3,-2,-4,-1,0,0,-6,1,4,0,1,6,-1,2,-5,2,-1,3,0,-1,-2,3,-6,-1,-1,1,-1,-2,0,-1,2,3,2,-3,-6,1,2,5,4,1,-1,1,6,-1,4,4,5,-2,2,-3,3,1,0,-3,1,-2,3,-2,1,0,1,-4,0,-3,-7,3,0,-4,0,-1,2,-1,0,2,-1,1,5,1,0,3,1,-3,-2,4,-4,-2,-2,1,-2,-3,-2,0,2,1,-3,4,4,1,-2,4,0,-1,-1,4,2,-4,1,0,-2,1,0,0,3,-2,1,-4,-5,-4,4,0,-3,-3,4,2,-1,4,1,-1,-1,-3,2,0,-4,2,0,-1,0,1,2,0,3,-2,3,3,0,-1,5,-5 diff --git a/config/DeviceSettings.ini b/config/DeviceSettings.ini index 6a514d3..afaf4fd 100644 --- a/config/DeviceSettings.ini +++ b/config/DeviceSettings.ini @@ -4,14 +4,14 @@ TotalSpectrometer=1 [FS1] Model=OSIFAlpha Port=-1 -UID=QEP02975 +UID=FLMS15814 AEMax=0.85 AEMin=0.75 Depth=230000 [FS2] Model=OSIFBeta Port=-1 -UID=FLMS15815 +UID=QEP02975 AEMax=0.85 AEMin=0.75 Depth=65535 @@ -28,4 +28,5 @@ Position2=220000 Position3=330000 Position4=440000 Position5=550000 - +[HUMITURE] +port=COM11 diff --git a/config/config.json b/config/config.json index a9765ac..55592fb 100644 --- a/config/config.json +++ b/config/config.json @@ -1 +1 @@ -{"BeginTime":"16:43","IntervalTime":"10","EndTime":"16:45","Location":"beijing","GPS_Longtitude":"117","GPS_Latitude":"118","GPS_Altitude":"50","GPS_North":"on","InstallationTime":"2021-11-18","ISIFCalibrationTime":"2021-11-26","IS1CalibrationTime":"2021-11-19","NameOfMaintenanceStaff":"renlixin","PhoneNumberOfMaintenanceStaff":"110110110","DownloadUserID":"newuser","DownlaodAddress":"http:\/\/www.iris-rs.cn","SIFUpCalFile":"dat1","SIFDownCalFile1":"dat2","SIFDownCalFile2":"dat2","SIFDownCalFile3":"dat3","IS1UpCalFile":"dat1","IS1DownCalFile1":"sdaf","IS1DownCalFile2":"dat2","IS1DownCalFile3":"asdf","HTTPServer":"192.168.2.1"} \ No newline at end of file +{"BeginTime":"8:00","IntervalTime":"10","EndTime":"18:00","Location":"beijing","GPS_Longtitude":"117","GPS_Latitude":"118","GPS_Altitude":"50","GPS_North":"on","InstallationTime":"2021-11-18","ISIFCalibrationTime":"2021-11-26","IS1CalibrationTime":"2021-11-19","NameOfMaintenanceStaff":"renlixin","PhoneNumberOfMaintenanceStaff":"110110110","DownloadUserID":"newuser","DownlaodAddress":"http:\/\/www.iris-rs.cn","SIFUpCalFile":"dat1","SIFDownCalFile1":"dat2","SIFDownCalFile2":"dat2","SIFDownCalFile3":"dat3","IS1UpCalFile":"dat1","IS1DownCalFile1":"sdaf","IS1DownCalFile2":"dat2","IS1DownCalFile3":"asdf","HTTPServer":"192.168.2.1"} \ No newline at end of file diff --git a/main.cpp b/main.cpp index 296ddab..cd66180 100644 --- a/main.cpp +++ b/main.cpp @@ -5,6 +5,7 @@ #include "MainDataGrabber.h" #include "DataFileProcessor.h" #include "Scheduler.h" +#include "GY39Controller.h" using namespace std; #pragma once @@ -14,8 +15,11 @@ int main(int argc, char *argv[]) QCoreApplication a(argc, argv); //////////////////////////////////////////////////////////////////////////logger //QT_LOG::ZZ_InitLogger(QCoreApplication::applicationDirPath() + "/Log/"); - - + float fTemp, fHum; + GY39Controller m_test123; + m_test123.Initialize("COM11"); + m_test123.GetHumiture(fTemp, fHum); + //////////////////////////////////////////////////////////////////////////configger DataFileProcessor testdp; ZZ_SysConfigger test; diff --git a/source/Misc_Detector/GY39Controller.cpp b/source/Misc_Detector/GY39Controller.cpp new file mode 100644 index 0000000..e791788 --- /dev/null +++ b/source/Misc_Detector/GY39Controller.cpp @@ -0,0 +1,140 @@ +#include "GY39Controller.h" +#include "ZZ_Types.h" +using namespace ZZ_MISCDEF; + +GY39Controller::GY39Controller(QObject* parent /*= nullptr*/) +{ + m_pSerialPort = new QSerialPort; + m_iBaudRate = 9600; +} + +GY39Controller::~GY39Controller() +{ + if (m_pSerialPort != NULL) + { + delete m_pSerialPort; + } +} + +int GY39Controller::SendCommand(QByteArray qbCommand) +{ + qint64 qi64Write = m_pSerialPort->write(qbCommand); + if (qi64Write != qbCommand.size()) + { + qDebug() << "Err:write Failed.Exit Code:1" << qi64Write; + return 1; + } + + return 0; +} + +int GY39Controller::RecvHumitureData(QByteArray &qbData) +{ + qbData.clear(); + qbData = m_pSerialPort->readAll(); + + int iCounter = 0; + while (qbData.size() < 15) + { + m_pSerialPort->waitForReadyRead(50); + QByteArray qbTemp = m_pSerialPort->readAll(); + qbData.append(qbTemp); + + if (iCounter > 10) + { + qDebug() << "Err:RecvHumitureData Failed,Not Enough Data.Exit Code:1" << qbData.size(); + return 1; + } + iCounter++; + } + return 0; +} + +int GY39Controller::ParseHumitureData(QByteArray &qbData) +{ + ZZ_U8 cTempH8, cTempL8, cHumH8, cHumL8; + + cTempH8 = qbData[4]; + cTempL8 = qbData[5]; + + cHumH8 = qbData[10]; + cHumL8 = qbData[11]; + + float fTemp = (cTempH8 << 8) | cTempL8; + fTemp = fTemp / 100; + float fHum = (cHumH8 << 8) | cHumL8; + fHum = fHum / 100; + + m_fTemperature = fTemp; + m_fHumidity = fHum; + return 0; +} + +int GY39Controller::Initialize(std::string ucPortName, bool bAuto15/*=false*/, bool bAuto45/*=false*/) +{ + QString qstrPortName = QString::fromStdString(ucPortName); + + m_pSerialPort->setPortName(qstrPortName); + m_pSerialPort->setReadBufferSize(512); + bool bRes = m_pSerialPort->setBaudRate(m_iBaudRate); + if (!bRes) + { + qDebug() << "Err:setBaudRate Failed.Exit Code:1"; + //std::cout << "Err.setBaudRate Failed" << std::endl; + return 1; + } + + bRes = m_pSerialPort->open(QIODevice::ReadWrite); + if (!bRes) + { + qDebug() << "Err:open Failed.Exit Code:2"; + //std::cout << "Err.open Failed" << std::endl; + return 2; + } + + QByteArray qbSend; + + if (bAuto15==false && bAuto45==false) + { + qbSend.resize(3); + qbSend[0] = (ZZ_U8)0xA5; + qbSend[1] = (ZZ_U8)0x00; + qbSend[2] = (ZZ_U8)0xA5; + } + + if (bAuto15 == true && bAuto45 == true) + { + qbSend.resize(3); + qbSend[0] = (ZZ_U8)0xA5; + qbSend[1] = (ZZ_U8)0x03; + qbSend[2] = (ZZ_U8)0xA8; + } + SendCommand(qbSend); + return 0; +} + +int GY39Controller::GetHumiture(float &fTemp, float &fHum) +{ + QByteArray qbSend,qbRecv; + + qbSend.resize(3); + qbSend[0] = (ZZ_U8)0xA5; + qbSend[1] = (ZZ_U8)0x52; + qbSend[2] = (ZZ_U8)0xF7; + int iRes = SendCommand(qbSend); + if (iRes) + { + return iRes; + } + + iRes = RecvHumitureData(qbRecv); + if (iRes) + { + return iRes; + } + + ParseHumitureData(qbRecv); + fTemp = m_fTemperature; + fHum = m_fHumidity; + return 0; +} diff --git a/source/Misc_Detector/GY39Controller.h b/source/Misc_Detector/GY39Controller.h new file mode 100644 index 0000000..a596b4b --- /dev/null +++ b/source/Misc_Detector/GY39Controller.h @@ -0,0 +1,23 @@ +#pragma once +#include "pch.h" +class GY39Controller :public QObject +{ + Q_OBJECT +public: + GY39Controller(QObject* parent = nullptr); + ~GY39Controller(); +private: + int SendCommand(QByteArray qbCommand); + int RecvHumitureData(QByteArray &qbData); + int ParseHumitureData(QByteArray &qbData); +public: + int Initialize(std::string ucPortName,bool bAuto15 = false,bool bAuto45 = false); + int GetHumiture(float &fTemp, float &fHum); +public slots: +signals: + +private: + int m_iBaudRate; + QSerialPort *m_pSerialPort; + float m_fTemperature, m_fHumidity; +}; \ No newline at end of file diff --git a/source/Settings/SystemConfigger.cpp b/source/Settings/SystemConfigger.cpp index 82cf681..10e4775 100644 --- a/source/Settings/SystemConfigger.cpp +++ b/source/Settings/SystemConfigger.cpp @@ -32,6 +32,7 @@ delete m_qsDeviceConfig; } m_qsDeviceConfig = new QSettings(m_qstrDeviceConfigFilePath, QSettings::IniFormat); + ////FS m_struFSContext.ucDeviceNumber = m_qsDeviceConfig->value(QString("DEVICE INFO/TotalSpectrometer"),-1).toInt(); if (m_struFSContext.ucDeviceNumber == -1) { @@ -59,6 +60,7 @@ m_struFSContext.lDepth[i] = lDepth; } + ////LS m_struAcqPosition.iTotalPosition = m_qsDeviceConfig->value(QString("LINEAR SHUTTER/TotalPosition"), -1).toInt(); if (m_struAcqPosition.iTotalPosition == -1) { diff --git a/source/Thread/Scheduler.cpp b/source/Thread/Scheduler.cpp index 151c5b2..9e06f10 100644 --- a/source/Thread/Scheduler.cpp +++ b/source/Thread/Scheduler.cpp @@ -44,7 +44,7 @@ void Scheduler::StartAsPlanned() while (!bStopWait) { QThread::msleep(100); - if (m_struAcqTime.qtStartTime >= qtTime && qtTime < m_struAcqTime.qtStopTime) + if (m_struAcqTime.qtStartTime <= qtTime && qtTime < m_struAcqTime.qtStopTime) { bStopWait = true; }