diff --git a/Plx/include/LowLevel/HonaLowLevelAPI.h b/Plx/include/LowLevel/HonaLowLevelAPI.h index 8a5c53f..972ea1b 100644 --- a/Plx/include/LowLevel/HonaLowLevelAPI.h +++ b/Plx/include/LowLevel/HonaLowLevelAPI.h @@ -3,6 +3,9 @@ #include +#include "LowLevel/Setting/Setting.h" +#include "HonaPacket.h" + class HonaLowLevelAPI : public QObject { Q_OBJECT @@ -29,7 +32,7 @@ private: int hiruGetDOA(); signals: - void signalToTop(QList<&HonaPacket> honaPacketList, int i, int j); + void signalToTop(QList honaPacketList, int i, int j); //uncrustify off public slots: //uncrustify on diff --git a/Plx/include/LowLevel/HonaPacket.h b/Plx/include/LowLevel/HonaPacket.h index f9ae66a..505a033 100644 --- a/Plx/include/LowLevel/HonaPacket.h +++ b/Plx/include/LowLevel/HonaPacket.h @@ -2,62 +2,61 @@ #define HONAPACKET_H #include -#include "include/LowLevel/Utils/Utils.h" +#include "include/LowLevel/Utils/Utils.h" class HonaPacket { private: - - qreal toaClock; - honaPacketType m_PacketType; - quint32 m_PacketNumber; - qulonglong m_Toa; - quint32 m_Doa; - quint32 m_Pa1; - quint32 m_Pa2; - quint32 m_Pa3; - quint32 m_Pa4; - quint32 m_Code; - quint32 m_CodeL; - quint32 m_CodeM; + qreal toaClock; + honaPacketType m_PacketType; + quint32 m_PacketNumber; + qulonglong m_Toa; + quint32 m_Doa; + quint32 m_Pa1; + quint32 m_Pa2; + quint32 m_Pa3; + quint32 m_Pa4; + quint32 m_Code; + quint32 m_CodeL; + quint32 m_CodeM; public: - HonaPacket(); - /******************************************************************/ - honaPacketType getPacketType(void); - void setPacketType(honaPacketType &temp); - /******************************************************************/ - quint32 getPacketNumber(void); - void setPacketNumber(quint32 temp); - /******************************************************************/ - qulonglong getToa(void); - void setToa(qulonglong temp); - /******************************************************************/ - quint32 getDoa(void); - void setDoa(quint32 temp); - /******************************************************************/ - quint32 getPa1(void); - void setPa1(quint32 temp); - /******************************************************************/ - quint32 getPa2(void); - void setPa2(quint32 temp); - /******************************************************************/ - quint32 getPa3(void); - void setPa3(quint32 temp); - /******************************************************************/ - quint32 getPa4(void); - void setPa4(quint32 temp); - /******************************************************************/ - quint32 getCode(void); - void setCode(quint32 temp); - /******************************************************************/ - quint32 getCodeL(void); - void setCodeL(quint32 temp); - /******************************************************************/ - quint32 getCodeM(void); - void setCodeM(quint32 temp); - /******************************************************************/ + HonaPacket(); + /******************************************************************/ + honaPacketType getPacketType(); + void setPacketType(honaPacketType& temp); + /******************************************************************/ + quint32 getPacketNumber(); + void setPacketNumber(quint32 temp); + /******************************************************************/ + qulonglong getToa(); + void setToa(qulonglong temp); + /******************************************************************/ + quint32 getDoa(); + void setDoa(quint32 temp); + /******************************************************************/ + quint32 getPa1(); + void setPa1(quint32 temp); + /******************************************************************/ + quint32 getPa2(); + void setPa2(quint32 temp); + /******************************************************************/ + quint32 getPa3(); + void setPa3(quint32 temp); + /******************************************************************/ + quint32 getPa4(); + void setPa4(quint32 temp); + /******************************************************************/ + quint32 getCode(); + void setCode(quint32 temp); + /******************************************************************/ + quint32 getCodeL(); + void setCodeL(quint32 temp); + /******************************************************************/ + quint32 getCodeM(); + void setCodeM(quint32 temp); + /******************************************************************/ }; -#endif // HONAPACKET_H +#endif //HONAPACKET_H diff --git a/Plx/include/LowLevel/Setting/Setting.h b/Plx/include/LowLevel/Setting/Setting.h index 60aae31..2dae7b9 100644 --- a/Plx/include/LowLevel/Setting/Setting.h +++ b/Plx/include/LowLevel/Setting/Setting.h @@ -1,4 +1,3 @@ - #ifndef SETTINGS_H #define SETTINGS_H @@ -8,34 +7,32 @@ /***********************************************************************************************/ typedef struct _HIRUSETTINGS { - recorderStart recordStard; - recorderMode recordMode; - quint32 recordChannel; - quint32 threshold = 0; - quint32 timeout = 1000; - quint32 count = 5; - + recorderStart recordStard; + recorderMode recordMode; + quint32 recordChannel; + quint32 threshold = 0; + quint32 timeout = 1000; + quint32 count = 5; }hiruSettings; /***********************************************************************************************/ typedef struct _HSRUSETTINGS { - bool isReal = true; - quint32 honaInt123CTHR = 128; - quint32 honaRes123CTHR = 128; - quint32 honaIntSTHR = 20; - quint32 honaResSTHR = 20; - quint32 honaSPTHR = 20; //mode4 - quint32 intM4_THR = 20; //mode4 - quint32 resM4_THR = 20; //mode4 - + bool isReal = true; + quint32 honaInt123CTHR = 128; + quint32 honaRes123CTHR = 128; + quint32 honaIntSTHR = 20; + quint32 honaResSTHR = 20; + quint32 honaSPTHR = 20; //mode4 + quint32 intM4_THR = 20; //mode4 + quint32 resM4_THR = 20; //mode4 }hsruSettings; /***********************************************************************************************/ -typedef struct _HONASETTINGS +struct HonaSetting { - quint32 hsruSettings; - quint32 hiruSettings; + quint32 hsruSettings; + quint32 hiruSettings; +}; -}honaSettings; /***********************************************************************************************/ -#endif // SETTING_H +#endif //SETTING_H