diff --git a/common/common_func.hpp b/common/common_func.hpp index f8b1322..2737732 100644 --- a/common/common_func.hpp +++ b/common/common_func.hpp @@ -61,16 +61,40 @@ struct compressWaveChannel { int compressChannelX; int compressChannelY; int compressChannelZ; + int compressChannelVolX; + int compressChannelVolY; + int compressChannelVolZ; int CountX; int CountY; int CountZ; + int CountVolX; + int CountVolY; + int CountVolZ; + int samplerateX; + int samplerateY; + int samplerateZ; + int samplerateVolX; + int samplerateVolY; + int samplerateVolZ; compressWaveChannel() { compressChannelX = 0; compressChannelY = 0; compressChannelZ = 0; + compressChannelVolX = 0; + compressChannelVolY = 0; + compressChannelVolZ = 0; CountX = 0; CountY = 0; CountZ = 0; + CountVolX = 0; + CountVolY = 0; + CountVolZ = 0; + samplerateX = 0; + samplerateY = 0; + samplerateZ = 0; + samplerateVolX = 0; + samplerateVolY = 0; + samplerateVolZ = 0; } }; struct WaveChannel { @@ -84,6 +108,17 @@ struct WaveChannel { WaveChannelZ.reserve(48000); } }; +struct WaveVolChannel { + std::vector WaveChannelVolX; + std::vector WaveChannelVolY; + std::vector WaveChannelVolZ; + std::string wave_timestamp; + WaveVolChannel() { + WaveChannelVolX.reserve(25600); + WaveChannelVolY.reserve(25600); + WaveChannelVolZ.reserve(48000); + } +}; struct DevDataOfGwid { std::string mDevdata; std::string mDevid; @@ -193,6 +228,8 @@ typedef struct { int Voltage; float nodeWorkTime; float nodeSendTime; + int minmumBatteryVoltageType; + int instantaneousBatteryVoltage; }DataRecvStatic; typedef struct { @@ -211,6 +248,8 @@ typedef struct { float Phase2; float Phase3; float Phase4; + float kurtosis; + float IntegratRMSMENS; }DataRecvDym; struct TopicList {