Bladeren bron

1、更新web,添加向web返系统时间
2、对三相电压值进行修正,程序sqrt(3)

guohui 1 jaar geleden
bovenliggende
commit
95211e9bc4

File diff suppressed because it is too large
+ 1 - 1
cust_data/web/unique/css/app.5eadd932.css


File diff suppressed because it is too large
+ 1 - 1
cust_data/web/unique/index.html


File diff suppressed because it is too large
+ 0 - 1
cust_data/web/unique/js/app.ac499230.js


File diff suppressed because it is too large
+ 1 - 0
cust_data/web/unique/js/app.f538f5e0.js


+ 2 - 1
pro/src/app.c

@@ -24,6 +24,7 @@
 #include <sys/mman.h>
 #include <string.h>
 #include <fcntl.h>
+#include <math.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -756,7 +757,7 @@ static void* power_thread(void* arg)
                         _globalPowerInfo._power_info.factor = 0;
 
                     // 计算总电源信息
-                    _globalTotalPowerInfo._power_info.voltage = _globalPowerInfo._power_info.voltage ;
+                    _globalTotalPowerInfo._power_info.voltage = _globalPowerInfo._power_info.voltage*sqrt(3);
                     _globalTotalPowerInfo._power_info.current += _globalPowerInfo._power_info.current ;
                     _globalTotalPowerInfo._power_info.power += _globalPowerInfo._power_info.power ;
                     _globalTotalPowerInfo._power_info.freq = _globalPowerInfo._power_info.freq> _globalTotalPowerInfo._power_info.freq?  _globalPowerInfo._power_info.freq:_globalTotalPowerInfo._power_info.freq;

+ 4 - 0
pro/src/json_handle.c

@@ -1186,6 +1186,7 @@ char* json_to_system_config_info(int tls)
 {
     char* str = NULL;
     buf_t logo={NULL,0,0};
+    char tmp[100];
 
     // 创建 JSON 对象
     cJSON* root = cJSON_CreateObject();   
@@ -1197,6 +1198,9 @@ char* json_to_system_config_info(int tls)
     // 添加基本键值对
     int nLanguageID=__globalDeviceManage._globalDevInfo.product.language+1;
     cJSON_AddNumberToObject(data_field, "systemLanguage", nLanguageID);
+
+    get_curtime_str(tmp, sizeof(tmp));
+    cJSON_AddNumberToObject(data_field, "systemTime", tmp);
     
     //返回websockt
     char strIPInfo[64] = "ws://192.168.1.132:6785/websocket/";