diff --git a/Cidn-SH b/Cidn-SH index 6693b72..f0d2141 100755 Binary files a/Cidn-SH and b/Cidn-SH differ diff --git a/uart/uart_cmd.cpp b/uart/uart_cmd.cpp index dcc5fe7..17286fc 100644 --- a/uart/uart_cmd.cpp +++ b/uart/uart_cmd.cpp @@ -145,7 +145,6 @@ void Uart::WritePanId2Zigbee(unsigned short pad) { zlog_info(zct, "WritePanId2Zigbee : %d", pad); unsigned short pad1 = pad, tmp; tmp = GlobalConfig::Zigbee_G.MyAddr; - zlog_info(zct, "MyAddr : %d", GlobalConfig::Zigbee_G.MyAddr); swap((char *)&pad1); GlobalConfig::Zigbee_G.PanID = pad1; modify_info(tmp, (char *)&GlobalConfig::Zigbee_G); diff --git a/uart/uart_feature_parse.cpp b/uart/uart_feature_parse.cpp index 6025dda..f61944c 100644 --- a/uart/uart_feature_parse.cpp +++ b/uart/uart_feature_parse.cpp @@ -687,7 +687,7 @@ std::vector Uart::DealData(int iChannel, float coe, unsigned int sampleRa } zlog_info(zct, "len = %d,data = %02x,iChannel = %d,compress = %d,count = %d", j, data[0], iChannel, compress, count); if (j * 92 < count) return vecData; - + if (compress) { zlog_info(zct, "iChannel = %d,compress = %d", iChannel, compress); int r = lzo1x_decompress(data, count, outdata, &new_len, NULL);