modify log info.

common/common_func.hpp

@@ -67,9 +67,11 @@ typedef struct statfs DISK, *pDISK;
 #define UINT16_HIGH(x) ((x & 0xFF00u) >> 8u)
 #define UINT16_LOW(x) ((x & 0x00FFu))
 
-#define GENERAL_BUF_SIZE 128 * 1024 * 10
 
-enum TIME_SIZE { TIME_MINUTE = 5, TIME_SECEOND = 8 };
+enum TIME_SIZE { 
+	TIME_MINUTE = 5, 
+	TIME_SECEOND = 8 
+};
 
 struct DevData {
     char mData[128];
@@ -329,12 +331,6 @@ extern int write_data(int fd, char* buff, int len);
 extern int read_data(int fd, char* buff, int len, int timeout);
 extern int ModifyMac(char* buff);
 extern void mssleep(unsigned long microseconds);
-/**
-* @brief 系统运行时输入入参进行系统软件版本查询
-* @param argv 输入参数 -vV版本查询  --debugmode日志调试模式
-* @return 函数返回0执行成功
-*/
-extern int CheckFileVersion(int argc, char** argv);
 
 /**
 * @brief 获取当前实时时间
@@ -413,7 +409,7 @@ extern std::string IpAddrInit();
 * @brief  获取正在工作的网卡
 * @return std::string
 */
-extern std::string GetWorkNic();
+// extern std::string GetWorkNic();
 
 /**
 * @brief  获取系统基本信息
@@ -439,24 +435,12 @@ extern void StartWriteToDat();
 */
 extern void BackupDatFile();
 
-/**
-* @brief  降采样
-* @return double
-*/
-extern float* ReSample(int WaveDataLength, int N, int* NewWaveDataLength, std::vector<float>& WaveData);
-
 /**
 * @brief  设置系统时间
 * @return int
 */
 extern int SetTime(unsigned long seconds, int milliseconds = 0);
 
-/**
-* @brief  删除配置文件
-* @return int
-*/
-extern void RemoveConfig();
-
 /**
 * @brief  获取文件内容
 * @param filename 文件名
@@ -491,9 +475,9 @@ extern char* solve(char* dest, const char* src);
 extern void swap(char* data);
 extern int hexStringToBytes(const char* hexStr, unsigned char* bytes, size_t bytesSize);
 
-extern int OpenWatchDog();
-extern int WriteWatchDog(int fd);
-extern int CloseWatchDog(int fd);
+int OpenWatchDog();
+int WriteWatchDog(int fd);
+
 //获取4G信号强度
 extern int getcsq();
 extern std::string GetGwIp_(const char* eth_name);
@@ -505,18 +489,10 @@ extern int writeIntValue(const char* section, char* key, int val, const char* fi
 
 int getDiskInfo(char* diskTotal, char* diskFree);
 
-void timeout(int signo);
 unsigned short cal_chksum(unsigned short* addr, int len);
-int pack(int pkt_no, char* sendpacket);
-int send_packet(int pkt_no, char* sendpacket);
-int recv_packet(int pkt_no, char* recvpacket);
-int unpack(int cur_seq, char* buf, int len);
-void tv_sub(struct timeval* out, struct timeval* in);
-void _CloseSocket();
 
 int socketHeart(const char* pSendData);
 
-extern bool NetIsOk();
 extern int Ping(const char* ips, int timeout);
 extern int get_netlink_status(const char* if_name);
 extern int compareVersions(const std::string& version1, const std::string& version2);

jsonparse/communication_cmd.hpp

@@ -40,7 +40,7 @@ public:
     std::string JsonCmd_51(Json::Value &recvBody);
     std::string JsonCmd_52(); // upload static data
     std::string JsonCmd_53(Json::Value &recvBody);
-    void JsonCmd_38(Json::Value &recvBody); //获取原始数据
+        
 
     // web command parse
     std::string JsonCmd_Cgi_01(Param_01 &param); //用户操作处理

jsonparse/mqtt_cmd_parse.cpp

@@ -488,31 +488,6 @@ std::string JsonData::JsonCmd_29(Param_29 &param) {
     return show_value_.write(jsonVal);
 }
 
-void JsonData::JsonCmd_38(Json::Value &recvBody) {
-    Json::Value jsChannel = recvBody["channelArray"];
-    print_info("jsChannel size : %d\n", jsChannel.size());
-    if (jsChannel.isArray()) {
-        for (int i = 0; i < jsChannel.size(); i++) {
-            std::string strChannelid = jsChannel[i].asString();
-            WAVE_GENERAL wavedata;
-
-            WAVE_CONTAIN wave;
-            memset(wave.channelId, 0, 16);
-            sprintf(wave.channelId, "%s", strChannelid.c_str());
-
-            memset(wave.SensorEngineeringUnit, 0, 32);
-            sprintf(wave.SensorEngineeringUnit, "%s", wavedata.SensorEngineeringUnit.c_str());
-
-            wave.total = 1;
-            wave.count = 1;
-            wave.type = 0;
-            wave.flag = 0;
-            wave.number = wavedata.number;
-            memcpy(wave.waveData, wavedata.waveData, wavedata.number * sizeof(float));
-        }
-    }
-}
-
 void JsonData::DataNodeStatusCheck() {
     array_t vetRes = sqlite_db_ctrl::instance().GetDataMultiLine(T_SENSOR_INFO(TNAME), "*", NULL);
     int nSize = vetRes.size();

main.cpp

@@ -26,7 +26,7 @@ zlog_category_t *zct = NULL;
 zlog_category_t *zbt = NULL;
 
 int main(int argc, char *argv[]) {
-    int rc = zlog_init("/opt/wlg.conf");
+    int rc = zlog_init("/opt/configenv/wlg.conf");
     if (rc) {
         printf("init failed\n");
         return -1;
@@ -40,8 +40,8 @@ int main(int argc, char *argv[]) {
         return -2;
     }
 
-    zlog_info(zbt, " Firmware compile time:%s %s,version %s\n", __DATE__, __TIME__, GlobalConfig::Version.c_str());
-    zlog_info(zbt, "####CIDNSOFT start####\n");   
+    zlog_info(zbt, " Firmware compile time:%s %s,version %s", __DATE__, __TIME__, GlobalConfig::Version.c_str());
+    zlog_info(zbt, "####CIDNSOFT start####");       
 
     g_VecWaveDataX.reserve(1000);
     g_VecWaveDataY.reserve(1000);

uart/uart.cpp

@@ -14,7 +14,6 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include "utility/serial.h"
 
-char g_UartRecvBuf[GENERAL_BUF_SIZE];
 int offSize = 0;
 pTestRecvCallBack pTestRecv;