diff --git a/uart/uart_feature_parse.cpp b/uart/uart_feature_parse.cpp index 6b36533..401ac5a 100644 --- a/uart/uart_feature_parse.cpp +++ b/uart/uart_feature_parse.cpp @@ -461,7 +461,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { valNodeData.append(valNodeFeature); DataRecvDym dataDymY; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[37], pRecvData->Data[36]); + sprintf(buf, "%02x%02x", pRecvData->Data[35], pRecvData->Data[34]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -469,7 +469,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymY.DiagnosisPk = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[39], pRecvData->Data[38]); + sprintf(buf, "%02x%02x", pRecvData->Data[37], pRecvData->Data[36]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -477,7 +477,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymY.RmsValues = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[41], pRecvData->Data[40]); + sprintf(buf, "%02x%02x", pRecvData->Data[39], pRecvData->Data[38]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -485,7 +485,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymY.IntegratPk = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[43], pRecvData->Data[42]); + sprintf(buf, "%02x%02x", pRecvData->Data[41], pRecvData->Data[40]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -493,7 +493,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymY.IntegratRMS = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[45], pRecvData->Data[44]); + sprintf(buf, "%02x%02x", pRecvData->Data[43], pRecvData->Data[42]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -501,7 +501,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymY.Amp1 = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[47], pRecvData->Data[46]); + sprintf(buf, "%02x%02x", pRecvData->Data[45], pRecvData->Data[44]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -509,7 +509,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymY.Amp2 = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[49], pRecvData->Data[48]); + sprintf(buf, "%02x%02x", pRecvData->Data[47], pRecvData->Data[46]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -517,7 +517,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymY.Amp3 = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[51], pRecvData->Data[50]); + sprintf(buf, "%02x%02x", pRecvData->Data[49], pRecvData->Data[48]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -525,7 +525,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymY.Amp4 = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[53], pRecvData->Data[52]); + sprintf(buf, "%02x%02x", pRecvData->Data[51], pRecvData->Data[50]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -593,7 +593,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { DataRecvDym dataDymZ; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[65], pRecvData->Data[64]); + sprintf(buf, "%02x%02x", pRecvData->Data[53], pRecvData->Data[52]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -601,7 +601,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymZ.DiagnosisPk = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[67], pRecvData->Data[66]); + sprintf(buf, "%02x%02x", pRecvData->Data[55], pRecvData->Data[54]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -609,7 +609,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymZ.RmsValues = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[69], pRecvData->Data[68]); + sprintf(buf, "%02x%02x", pRecvData->Data[57], pRecvData->Data[56]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -617,7 +617,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymZ.IntegratPk = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[71], pRecvData->Data[70]); + sprintf(buf, "%02x%02x", pRecvData->Data[59], pRecvData->Data[58]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -625,7 +625,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymZ.IntegratRMS = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[73], pRecvData->Data[72]); + sprintf(buf, "%02x%02x", pRecvData->Data[61], pRecvData->Data[60]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -633,7 +633,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymZ.Amp1 = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[75], pRecvData->Data[74]); + sprintf(buf, "%02x%02x", pRecvData->Data[63], pRecvData->Data[62]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -641,7 +641,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymZ.Amp2 = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[77], pRecvData->Data[76]); + sprintf(buf, "%02x%02x", pRecvData->Data[65], pRecvData->Data[64]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -649,7 +649,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymZ.Amp3 = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[79], pRecvData->Data[78]); + sprintf(buf, "%02x%02x", pRecvData->Data[67], pRecvData->Data[66]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -657,7 +657,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymZ.Amp4 = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[81], pRecvData->Data[80]); + sprintf(buf, "%02x%02x", pRecvData->Data[69], pRecvData->Data[68]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -665,7 +665,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymZ.Amp5 = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[83], pRecvData->Data[82]); + sprintf(buf, "%02x%02x", pRecvData->Data[71], pRecvData->Data[70]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -673,7 +673,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymZ.EnvelopEnergy = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[85], pRecvData->Data[84]); + sprintf(buf, "%02x%02x", pRecvData->Data[73], pRecvData->Data[72]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -681,7 +681,7 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymZ.Phase1 = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[87], pRecvData->Data[86]); + sprintf(buf, "%02x%02x", pRecvData->Data[75], pRecvData->Data[74]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; @@ -689,14 +689,14 @@ void Uart::DealDataNodeFeature(const char *pData, int flag) { dataDymZ.Phase2 = lowbit * n; memset(buf, 0, sizeof(buf)); - sprintf(buf, "%02x%02x", pRecvData->Data[89], pRecvData->Data[88]); + sprintf(buf, "%02x%02x", pRecvData->Data[77], pRecvData->Data[76]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff; n = ScaleConvert(highbit); dataDymZ.Phase3 = lowbit * n; - sprintf(buf, "%02x%02x", pRecvData->Data[91], pRecvData->Data[90]); + sprintf(buf, "%02x%02x", pRecvData->Data[79], pRecvData->Data[78]); iTemp = (unsigned int)strtol(buf, NULL, 16); highbit = iTemp >> 14 & 0x3; lowbit = iTemp & 0x3fff;