修改好水机按键、增加bms复归键

examples/device-dashboard/appl.c

@@ -3,7 +3,7 @@
 #define DIR_OUT "out"
 #define DIR_IN "in"
 
-char* VERSION = "南瑞电池包_英维克新水机 1.2";
+char* VERSION = "南瑞电池包_英维克新水机 1.3";
 
 struct appl_t APPL;
 struct mg_mgr mgr_mqtt1;  // thingsboard
@@ -932,6 +932,7 @@ static void* thrd_485_2(void* param)
   int step = 1;
   int i;
   int64_t startts;
+  int trycnt;
 
   MG_INFO(("%s ENTER",__func__));
 
@@ -994,6 +995,28 @@ static void* thrd_485_2(void* param)
         // syslog(LOG_INFO,"bms comm ok");
       }
 
+       if(ch->Cmd == CMD_485_BMS_RESET)
+      {
+        ch->Cmd = CMD_485_DONE;
+        trycnt = 3;
+        while(trycnt-- > 0)
+        {
+          appl_chan485_lock(chidx);
+          usleep(30000);
+          modbus_set_slave(ctx,bms->Adr);
+          rc = modbus_write_bit(ctx,0,1);
+          appl_chan485_unlock(chidx);
+          if(rc >= 0)
+          {
+            break;
+          }
+          else
+          {
+            modbus_flush(ctx);
+          }
+        }
+      }
+
       appl_chan485_lock(chidx);
       usleep(30000);
       // 读取动作元件状态 (1-66)
@@ -1451,7 +1474,62 @@ static void* thrd_485_2(void* param)
         bms->MinCellSoh = data[65 - 1 - start];
         bms->MinCellSocIdx = data[66 - 1 - start];
 
-        strcpy(bms->szBatState,"未知");
+        if(bms->WorkState == 1)
+        {
+            strcpy(bms->szWorkState,"开路");
+        }
+        else if(bms->WorkState == 2)
+        {
+        strcpy(bms->szWorkState,"待机");
+        } 
+        else if(bms->WorkState == 3)
+        {
+        strcpy(bms->szWorkState,"充电");
+        } 
+         else if(bms->WorkState == 4)
+        {
+        strcpy(bms->szWorkState,"放电");
+        } 
+
+
+        if(bms->BatSelfSupervise == 1)
+        {
+           strcpy(bms->szBatSelfSupervise,"正常");
+        } 
+        else if(bms->BatSelfSupervise == 2)
+        {
+           strcpy(bms->szBatSelfSupervise,"预警");
+        } 
+        else if(bms->BatSelfSupervise == 3)
+        {
+           strcpy(bms->szBatSelfSupervise,"告警");
+        } 
+        else if(bms->BatSelfSupervise == 4)
+        {
+           strcpy(bms->szBatSelfSupervise,"保护");
+        } 
+
+        if(bms->SysState == 1)
+        {
+          strcpy(bms->szSysState,"待机");
+        }
+        else if(bms->SysState == 2)
+        {
+          strcpy(bms->szSysState,"正常");
+        }
+        else if(bms->SysState == 3)
+        {
+          strcpy(bms->szSysState,"禁充");
+        }
+        else if(bms->SysState == 4)
+        {
+          strcpy(bms->szSysState,"禁放");
+        }
+        else if(bms->SysState == 5)
+        {
+          strcpy(bms->szSysState,"停机");
+        }
+
 
         // if(bms->BatState == 1)
         // {
@@ -2058,9 +2136,9 @@ static void* thrd_485_3(void* param)
       }
       else
       {
-        // t.tv_sec = 0;
-        // t.tv_usec = 500000;
-        // modbus_set_response_timeout(ctx,0,500000);
+        t.tv_sec = 0;
+        t.tv_usec = 500000;
+        modbus_set_response_timeout(ctx,0,500000);
         ch->reqcnt = 0;
         ch->failcnt = 0;
         appl_485_set_state(chidx,ST_485_RUN,ERR_485_NONE);
@@ -2166,6 +2244,7 @@ static void* thrd_485_3(void* param)
           modbus_set_slave(ctx,ac->Adr);
           rc = modbus_write_register(ctx,0xE604,ch->CmdParam);
           appl_chan485_unlock(chidx);
+          // syslog(LOG_INFO,"%s,set PumpShift:%d",__func__,ch->CmdParam);
           if(rc >= 0)
           {
            break;
@@ -2539,7 +2618,7 @@ static void* thrd_485_3(void* param)
             strcpy(ac->szCmpState,"开启");
           }
           
-          sprintf(ac->szRunTime,"压缩机:%dh 水泵:%dh 风机:%dh 加热:%dh",data[0xE720  - start],data[0xE728 - start],data[0xE72C - start],data[0xE724 - start]);
+          sprintf(ac->szRunTime,"压缩机:%d%dh 水泵:%d%dh 风机:%d%dh 加热:%d%dh",data[0xE721  - start],data[0xE720  - start],data[0xE729 - start],data[0xE728 - start],data[0xE72D - start],data[0xE72C - start],data[0xE725 - start],data[0xE724 - start]);
 
           ac->SysRunState = data[0xE730 -start];
           if(ac->SysRunState == 0)
@@ -2581,142 +2660,142 @@ static void* thrd_485_3(void* param)
         {
           break;
         }
-        switch(*Step)
-        {
-        case 0:
-          if(bms->AvgCellT < set->HeatTemp)
-          {
-
-            // 设置制冷方式:加热
-            appl_chan485_lock(chidx);
-            usleep(30000);
-            modbus_set_slave(ctx,ac->Adr);
-            rc = modbus_write_register(ctx,0x0402,3);
-            appl_chan485_unlock(chidx);
-            // 设置加热点温度
-            appl_chan485_lock(chidx);
-            usleep(30000);
-            modbus_set_slave(ctx,ac->Adr);
-            rc = modbus_write_register(ctx,0xE601,set->HeatTempSet);
-            appl_chan485_unlock(chidx);
-            // 下发开机命令
-            appl_chan485_lock(chidx);
-            usleep(30000);
-            modbus_set_slave(ctx,ac->Adr);
-            rc = modbus_write_register(ctx,0x0400,1);
-            appl_chan485_unlock(chidx);
-            *Step = 1;
-          }
-          else if(bms->AvgCellT > set->CoolTemp)
-          {
-            // 设置制冷方式:制冷
-            appl_chan485_lock(chidx);
-            usleep(30000);
-            modbus_set_slave(ctx,ac->Adr);
-            rc = modbus_write_register(ctx,0x0402,2);
-            appl_chan485_unlock(chidx);
-            // 设置恒温方式预设温度
-            appl_chan485_lock(chidx);
-            usleep(30000);
-            modbus_set_slave(ctx,ac->Adr);
-            //rc = modbus_write_register( ctx, 0x1000 + 3, (ac->CoolTemp - ac->CoolGap)*10);
-            rc = modbus_write_register(ctx,0xE600,set->CoolTempSet);
-            appl_chan485_unlock(chidx);
-            // 下发开机命令
-            appl_chan485_lock(chidx);
-            usleep(30000);
-            modbus_set_slave(ctx,ac->Adr);
-            rc = modbus_write_register(ctx,0x0400,1);
-            appl_chan485_unlock(chidx);
-            *Step = 2;
-          }
-          else
-          {
-            // // 下发关机命令
-            // appl_chan485_lock(chidx);
-            // usleep(30000);
-            // modbus_set_slave(ctx, ac->Adr);
-            // rc = modbus_write_register( ctx, 0x0300, 0x0002);
-            // appl_chan485_unlock(chidx);
+        // switch(*Step)
+        // {
+        // case 0:
+        //   if(bms->AvgCellT < set->HeatTemp)
+        //   {
 
-            // 下发开机命令
-            appl_chan485_lock(chidx);
-            usleep(30000);
-            modbus_set_slave(ctx,ac->Adr);
-            rc = modbus_write_register(ctx,0x0400,1);
-            appl_chan485_unlock(chidx);
-            // 设置方式:自动
-            appl_chan485_lock(chidx);
-            usleep(30000);
-            modbus_set_slave(ctx,ac->Adr);
-            rc = modbus_write_register(ctx,0x0401,1);
-            appl_chan485_unlock(chidx);
-          }
-          break;
+        //     // 设置制冷方式:加热
+        //     appl_chan485_lock(chidx);
+        //     usleep(30000);
+        //     modbus_set_slave(ctx,ac->Adr);
+        //     rc = modbus_write_register(ctx,0x0402,3);
+        //     appl_chan485_unlock(chidx);
+        //     // 设置加热点温度
+        //     appl_chan485_lock(chidx);
+        //     usleep(30000);
+        //     modbus_set_slave(ctx,ac->Adr);
+        //     rc = modbus_write_register(ctx,0xE601,set->HeatTempSet);
+        //     appl_chan485_unlock(chidx);
+        //     // 下发开机命令
+        //     appl_chan485_lock(chidx);
+        //     usleep(30000);
+        //     modbus_set_slave(ctx,ac->Adr);
+        //     rc = modbus_write_register(ctx,0x0400,1);
+        //     appl_chan485_unlock(chidx);
+        //     *Step = 1;
+        //   }
+          // else if(bms->AvgCellT > set->CoolTemp)
+          // {
+          //   // 设置制冷方式:制冷
+          //   appl_chan485_lock(chidx);
+          //   usleep(30000);
+          //   modbus_set_slave(ctx,ac->Adr);
+          //   rc = modbus_write_register(ctx,0x0402,2);
+          //   appl_chan485_unlock(chidx);
+          //   // 设置恒温方式预设温度
+          //   appl_chan485_lock(chidx);
+          //   usleep(30000);
+          //   modbus_set_slave(ctx,ac->Adr);
+          //   //rc = modbus_write_register( ctx, 0x1000 + 3, (ac->CoolTemp - ac->CoolGap)*10);
+          //   rc = modbus_write_register(ctx,0xE600,set->CoolTempSet);
+          //   appl_chan485_unlock(chidx);
+          //   // 下发开机命令
+          //   appl_chan485_lock(chidx);
+          //   usleep(30000);
+          //   modbus_set_slave(ctx,ac->Adr);
+          //   rc = modbus_write_register(ctx,0x0400,1);
+          //   appl_chan485_unlock(chidx);
+          //   *Step = 2;
+          // }
+          // else
+          // {
+          //   // // 下发关机命令
+          //   // appl_chan485_lock(chidx);
+          //   // usleep(30000);
+          //   // modbus_set_slave(ctx, ac->Adr);
+          //   // rc = modbus_write_register( ctx, 0x0300, 0x0002);
+          //   // appl_chan485_unlock(chidx);
+
+          //   // 下发开机命令
+          //   appl_chan485_lock(chidx);
+          //   usleep(30000);
+          //   modbus_set_slave(ctx,ac->Adr);
+          //   rc = modbus_write_register(ctx,0x0400,1);
+          //   appl_chan485_unlock(chidx);
+          //   // 设置方式:自动
+          //   appl_chan485_lock(chidx);
+          //   usleep(30000);
+          //   modbus_set_slave(ctx,ac->Adr);
+          //   rc = modbus_write_register(ctx,0x0401,1);
+          //   appl_chan485_unlock(chidx);
+          // }
+          // break;
 
-        case 1: // heat
-          if(bms->AvgCellT > set->HeatTemp + set->HeatGap)
-          {
-            *Step = 0;
-          }
-          else
-          {
-            // 设置制冷方式:加热
-            appl_chan485_lock(chidx);
-            usleep(30000);
-            modbus_set_slave(ctx,ac->Adr);
-            rc = modbus_write_register(ctx,0x0401,3);
-            appl_chan485_unlock(chidx);
-            // 设置恒温方式预设温度
-            appl_chan485_lock(chidx);
-            usleep(30000);
-            modbus_set_slave(ctx,ac->Adr);
-            //rc = modbus_write_register( ctx, 0x1000 + 3, (ac->HeatTemp + ac->HeatGap)*10);
-            rc = modbus_write_register(ctx,0xE601,set->HeatTempSet);
-            appl_chan485_unlock(chidx);
-            // 下发开机命令
-            appl_chan485_lock(chidx);
-            usleep(30000);
-            modbus_set_slave(ctx,ac->Adr);
-            rc = modbus_write_register(ctx,0x0400,1);
-            appl_chan485_unlock(chidx);
+        // case 1: // heat
+        //   if(bms->AvgCellT > set->HeatTemp + set->HeatGap)
+        //   {
+        //     *Step = 0;
+        //   }
+          // else
+          // {
+          //   // 设置制冷方式:加热
+          //   appl_chan485_lock(chidx);
+          //   usleep(30000);
+          //   modbus_set_slave(ctx,ac->Adr);
+          //   rc = modbus_write_register(ctx,0x0401,3);
+          //   appl_chan485_unlock(chidx);
+          //   // 设置恒温方式预设温度
+          //   appl_chan485_lock(chidx);
+          //   usleep(30000);
+          //   modbus_set_slave(ctx,ac->Adr);
+          //   //rc = modbus_write_register( ctx, 0x1000 + 3, (ac->HeatTemp + ac->HeatGap)*10);
+          //   rc = modbus_write_register(ctx,0xE601,set->HeatTempSet);
+          //   appl_chan485_unlock(chidx);
+          //   // 下发开机命令
+          //   appl_chan485_lock(chidx);
+          //   usleep(30000);
+          //   modbus_set_slave(ctx,ac->Adr);
+          //   rc = modbus_write_register(ctx,0x0400,1);
+          //   appl_chan485_unlock(chidx);
             
-          }
-          break;
+          // }
+          // break;
 
-        case 2: // cool
-          if(bms->AvgCellT < set->CoolTemp - set->CoolGap)
-          {
-            *Step = 0;
-          }
-          else
-          {
-            // 设置制冷方式:制冷
-            appl_chan485_lock(chidx);
-            usleep(30000);
-            modbus_set_slave(ctx,ac->Adr);
-            rc = modbus_write_register(ctx,0x0401,2);
-            appl_chan485_unlock(chidx);
-            // 设置恒温方式预设温度
-            appl_chan485_lock(chidx);
-            usleep(30000);
-            modbus_set_slave(ctx,ac->Adr);
-            //rc = modbus_write_register( ctx, 0x1000 + 3, (ac->CoolTemp - ac->CoolGap)*10);
-            rc = modbus_write_register(ctx,0xE600,set->CoolTempSet);
-            appl_chan485_unlock(chidx);
-            // 下发开机命令
-            appl_chan485_lock(chidx);
-            usleep(30000);
-            modbus_set_slave(ctx,ac->Adr);
-            rc = modbus_write_register(ctx,0x0400,1);
-            appl_chan485_unlock(chidx);
-          }
-          break;
+        // case 2: // cool
+        //   if(bms->AvgCellT < set->CoolTemp - set->CoolGap)
+        //   {
+        //     *Step = 0;
+        //   }
+          // else
+          // {
+          //   // 设置制冷方式:制冷
+          //   appl_chan485_lock(chidx);
+          //   usleep(30000);
+          //   modbus_set_slave(ctx,ac->Adr);
+          //   rc = modbus_write_register(ctx,0x0401,2);
+          //   appl_chan485_unlock(chidx);
+          //   // 设置恒温方式预设温度
+          //   appl_chan485_lock(chidx);
+          //   usleep(30000);
+          //   modbus_set_slave(ctx,ac->Adr);
+          //   //rc = modbus_write_register( ctx, 0x1000 + 3, (ac->CoolTemp - ac->CoolGap)*10);
+          //   rc = modbus_write_register(ctx,0xE600,set->CoolTempSet);
+          //   appl_chan485_unlock(chidx);
+          //   // 下发开机命令
+          //   appl_chan485_lock(chidx);
+          //   usleep(30000);
+          //   modbus_set_slave(ctx,ac->Adr);
+          //   rc = modbus_write_register(ctx,0x0400,1);
+          //   appl_chan485_unlock(chidx);
+          // }
+        //   break;
 
-        default:
-          // NEVER REACH HERE
-          break;
-        }
+        // default:
+        //   // NEVER REACH HERE
+        //   break;
+        // }
 
         break;
 
@@ -2735,13 +2814,20 @@ static void* thrd_485_3(void* param)
             rc = modbus_write_register(ctx,0xE60B ,0);
             appl_chan485_unlock(chidx);
 
+            // // 485通讯
+            // appl_chan485_lock(chidx);
+            // usleep(30000);
+            // modbus_set_slave(ctx,ac->Adr);
+            // rc = modbus_write_register(ctx,0xE60A ,0);
+            // appl_chan485_unlock(chidx);
 
-             // 出水温度
-            appl_chan485_lock(chidx);
-            usleep(30000);
-            modbus_set_slave(ctx,ac->Adr);
-            rc = modbus_write_register(ctx,0x0402,1);
-            appl_chan485_unlock(chidx);
+
+            //  // 出水温度
+            // appl_chan485_lock(chidx);
+            // usleep(30000);
+            // modbus_set_slave(ctx,ac->Adr);
+            // rc = modbus_write_register(ctx,0x0402,1);
+            // appl_chan485_unlock(chidx);
 
 
             // 设置制冷方式预设温度
@@ -2774,12 +2860,12 @@ static void* thrd_485_3(void* param)
             rc = modbus_write_register(ctx,0xE603,(set->HeatGap)*10);
             appl_chan485_unlock(chidx);
             
-            // 设置工作模式 自动
-            appl_chan485_lock(chidx);
-            usleep(30000);
-            modbus_set_slave(ctx,ac->Adr);
-            rc = modbus_write_register(ctx,0x0401,4);
-            appl_chan485_unlock(chidx);
+            // // 设置工作模式 自动
+            // appl_chan485_lock(chidx);
+            // usleep(30000);
+            // modbus_set_slave(ctx,ac->Adr);
+            // rc = modbus_write_register(ctx,0x0401,4);
+            // appl_chan485_unlock(chidx);
 
 
 
@@ -3142,7 +3228,7 @@ static void* thrd_485_4(void* param)
       else
       {
         dh->TempInner = data[1 - start] * 0.1;
-        dh->HumiInner = data[2 - start] ;
+        dh->HumiInner = data[2 - start] * 0.1;
         dh->TempLenduan = data[3 - start] * 0.1;
         dh->HumiStart = data[4 - start];
         dh->TempOuter = data[5 - start]* 0.1;
@@ -9266,7 +9352,7 @@ void appl_start(void)
   APPL.Adl200.LastUpdate = 0;
   APPL.Adl200.CommFailTotalCnt = 0;
 
-  // Dehumi
+  // chushiji
   APPL.Dehumi.Adr = 1;
 
   // Co

examples/device-dashboard/appl.h

@@ -67,6 +67,8 @@ enum chan485_cmd_t
   CMD_485_AC_SET_TEMP = 12,
   CMD_485_AC_SET_PUMP = 13,
   CMD_485_AC_SET_COMPRESS = 14,
+  
+  CMD_485_BMS_RESET =15,
 
   CMD_485_DH_SET_HUMISTART,
   CMD_485_DH_SET_HUMISTOP,
@@ -407,8 +409,11 @@ struct NanRuiBms_t
 {
   int Adr;
   int WorkState;
+  char szWorkState[16];
   int BatSelfSupervise;
+  char szBatSelfSupervise[16];
   int SysState;
+  char szSysState[16];
   int HvOnCondition;
   double PosRes;
   double NegRes;
@@ -619,6 +624,11 @@ enum AcCmd_t
   AC_CMD_COMPRESSSET = 12,
 };
 
+enum BmsCmd_t
+{
+  BMS_CMD_RESET = 0,
+};
+
 enum EnvCmd_t
 {
   ENV_CMD_SET_DH_HUMISTART = 0,
@@ -670,11 +680,11 @@ struct Envicool5kW_t
   char szWorkMode[32];
   int WaterTempTargetCtlTemp;
   char szWaterTempTargetCtlTemp[32];
-  int OutWaterTemp;
-  int InWaterTemp;
+  double OutWaterTemp;
+  double InWaterTemp;
   double OutWaterPre;
   double InWaterPre;
-  int EnvTemp;
+  double EnvTemp;
   int ErrCode;
   int ErrLevel;
   char szErrLevel[8];

examples/device-dashboard/net.c

@@ -870,12 +870,48 @@ static void handle_pcs_set(struct mg_connection* c,struct mg_str body)
   }
 }
 
+static void handle_bms_set(struct mg_connection* c,struct mg_str body)
+{
+  long cmd;
+  long param;
+  bool ok = true;
+  struct chan485_t* ch = &APPL.chan485[2];
+  struct Settings_t* set = &APPL.Set.s;
+  cmd = mg_json_get_long(body,"$.cmd",-1);
+  param = mg_json_get_long(body,"$.param",-1);
+  if(cmd == -1 || param == -1)
+  {
+    ok = false;
+  }
+  else
+  {
+    switch(cmd)
+    {
+    case BMS_CMD_RESET:
+      ch->Cmd = CMD_485_BMS_RESET;
+      break;
+
+      default:
+      syslog(LOG_INFO,"%s, unknown cmd : %ld",__func__,cmd);
+      break;
+    }
+  }
+  if(ok)
+  {
+    mg_http_reply(c,200,s_json_header,"true\n");
+  }
+  else
+  {
+    mg_http_reply(c,200,s_json_header,"false\n");
+  }
+}
+
 static void handle_ac_set(struct mg_connection* c,struct mg_str body)
 {
   long cmd;
   long param;
   bool ok = true;
-  struct chan485_t* ch = &APPL.chan485[4];
+  struct chan485_t* ch = &APPL.chan485[3];
   struct Envicool5kW_t* ac = &APPL.Envicool5kW;
   struct Settings_t* set = &APPL.Set.s;
   cmd = mg_json_get_long(body,"$.cmd",-1);
@@ -911,6 +947,7 @@ static void handle_ac_set(struct mg_connection* c,struct mg_str body)
       // 英维克5kW立式 请求设定模式
       // 0：停机模式；1；制冷：2：加热；3：自循环；
     case AC_CMD_MODESET:
+      ch->Cmd = CMD_485_AC_SET_MODESET;
       set->SetMode = param;
       break;
 
@@ -920,9 +957,9 @@ static void handle_ac_set(struct mg_connection* c,struct mg_str body)
       //   ch->CmdParam = param;
       //   break;
       // 英维克5kW立式 设定温度
-    case AC_CMD_SET_TEMP:
-      set->SetTemp = param;
-      break;
+    // case AC_CMD_SET_TEMP:
+    //   set->SetTemp = param;
+    //   break;
 
       // // 同飞5kW LCI-50C-01SZ-1227 水温目标控制温度
       // // 0 出水水温控制 1 回水水温控制
@@ -1122,7 +1159,7 @@ static void handle_ctl_get(struct mg_connection* c)
 %m:%m,%m:%f,%m:%f,%m:%f,%m:%f,\
 %m:%f,%m:%f,%m:%f,\
 %m:%f,%m:%f,%m:%f,%m:%f,%m:%f,%m:%f,\
-%m:%m,%m:%d,%m:%d,%m:%f,%m:%f,\
+%m:%m,%m:%f,%m:%f,%m:%f,%m:%f,\
 %m:%m,%m:%m,%m:%m,\
 %m:%m,%m:%m,\
 %m:%m,%m:%m}\n",
@@ -1222,34 +1259,67 @@ static void handle_pcs_get(struct mg_connection* c)
 /*8*/MG_ESC("交流电容故障字"),MG_ESC(p->szAcCapFault),MG_ESC("系统故障字"),MG_ESC(p->szSysFault),MG_ESC("开关故障字"),MG_ESC(p->szOnOffFault),MG_ESC("其他故障字"),MG_ESC(p->szOtherFault));
 }
 
-static void handle_bms_get(struct mg_connection* c)
+// static void handle_bms_get(struct mg_connection* c)
+// {
+//   struct NanRuiBms_t* bms = &APPL.NanRuiBms;
+//   mg_http_reply(c,200,s_json_header,
+//     "{"
+//     "%m:%m,%m:%f,%m:%f,%m:%f,%m:%f,%m:%m," // 1
+//     "%m:%f,%m:%f," // 2
+//     "%m:%f,%m:%f,%m:%f," // 3
+//     "%m:%f,%m:%f,%m:%f," // 4
+//     "%m:%f,%m:%f," // 5
+//     "%m:%m," // 6
+//     "%m:%d,%m:%d,%m:%d,%m:%d," // 7
+//     "%m:%f,%m:%f," // 8
+//     "%m:%m,%m:%lld," // 9
+//     "%m:%d,%m:%d,%m:%d,%m:%d," // 10
+//     "%m:%m,%m:%m,%m:%m" // 11
+//     "}\n",
+//     /*1*/MG_ESC("通信状态"),MG_ESC(bms->szCommState),MG_ESC("总电压"),bms->BatV,MG_ESC("总电流"),bms->BatI,MG_ESC("SOC"),bms->Soc,MG_ESC("SOH"),bms->Soh,MG_ESC("电池状态"),MG_ESC(bms->szBatState),
+//     /*2*/MG_ESC("绝缘电阻R+"),bms->PosRes,MG_ESC("绝缘电阻R-"),bms->NegRes,
+//     /*3*/MG_ESC("最高电芯电压"),bms->MaxCellV,MG_ESC("平均电芯电压"),bms->AvgCellV,MG_ESC("最低电芯电压"),bms->MinCellV,
+//     /*4*/MG_ESC("最高电芯温度"),bms->MaxCellT,MG_ESC("平均电芯温度"),bms->AvgCellT,MG_ESC("最低电芯温度"),bms->MinCellT,
+//     /*5*/MG_ESC("压差"),bms->CellVDiff,MG_ESC("温差"),bms->CellTDiff,
+//     /*6*/MG_ESC("高压状态"),MG_ESC(bms->szHvState),
+//     /*7*/MG_ESC("最高温度位置"),bms->MaxCellTIdx,MG_ESC("最低温度位置"),bms->MinCellTIdx,MG_ESC("最高电压位置"),bms->MaxCellVIdx,MG_ESC("最低电压位置"),bms->MinCellVIdx,
+//     /*8*/MG_ESC("最大可充电流"),bms->MaxChgCurr,MG_ESC("最大可放电流"),bms->MaxDhgCurr,
+//     /*9*/MG_ESC("数据更新时间"),MG_ESC(bms->szLastUpdate),MG_ESC("通信失败次数"),bms->CommFailTotalCnt,
+//     /*10*/MG_ESC("工作状态"),bms->WorkState,MG_ESC("电池自检"),bms->BatSelfSupervise,MG_ESC("系统状态"),bms->SysState,MG_ESC("上电条件"),bms->HvOnCondition,
+//     /*11*/MG_ESC("动作元件状态"),MG_ESC(bms->szActionCompStatus),MG_ESC("装置自检状态"),MG_ESC(bms->szSelfCheckStatus),MG_ESC("遥信变位状态"),MG_ESC(bms->szRemoteSignal)
+//   );
+// }
+
+ static void handle_bms_get(struct mg_connection* c)
 {
   struct NanRuiBms_t* bms = &APPL.NanRuiBms;
   mg_http_reply(c,200,s_json_header,
     "{"
-    "%m:%m,%m:%f,%m:%f,%m:%f,%m:%f,%m:%m," // 1
-    "%m:%f,%m:%f," // 2
+    "%m:%m,%m:%f,%m:%f,%m:%f,%m:%f," // 1
+    "%m:%f,%m:%f,%m:%f,%m:%f,%m:%f," // 2
     "%m:%f,%m:%f,%m:%f," // 3
     "%m:%f,%m:%f,%m:%f," // 4
     "%m:%f,%m:%f," // 5
-    "%m:%m," // 6
+    "%m:%d,%m:%f," // 6
     "%m:%d,%m:%d,%m:%d,%m:%d," // 7
     "%m:%f,%m:%f," // 8
-    "%m:%m,%m:%lld," // 9
-    "%m:%d,%m:%d,%m:%d,%m:%d," // 10
-    "%m:%m,%m:%m,%m:%m" // 11
+    "%m:%f,%m:%d," //9
+    "%m:%m,%m:%lld," // 10
+    "%m:%m,%m:%m,%m:%m,%m:%d," // 11
+    "%m:%m,%m:%m,%m:%m" // 12
     "}\n",
-    /*1*/MG_ESC("通信状态"),MG_ESC(bms->szCommState),MG_ESC("总电压"),bms->BatV,MG_ESC("总电流"),bms->BatI,MG_ESC("SOC"),bms->Soc,MG_ESC("SOH"),bms->Soh,MG_ESC("电池状态"),MG_ESC(bms->szBatState),
-    /*2*/MG_ESC("绝缘电阻R+"),bms->PosRes,MG_ESC("绝缘电阻R-"),bms->NegRes,
+   /*1*/MG_ESC("通信状态"),MG_ESC(bms->szCommState),MG_ESC("总电压"),bms->BatV,MG_ESC("总电流"),bms->BatI,MG_ESC("SOC"),bms->Soc,MG_ESC("SOH"),bms->Soh,
+    /*2*/MG_ESC("绝缘电阻R+"),bms->PosRes,MG_ESC("绝缘电阻R-"),bms->NegRes,MG_ESC("簇功率"),bms->BatPower,MG_ESC("可充电量"),bms->ChgableAmount,MG_ESC("可放电量"),bms->DhgableAmount,
     /*3*/MG_ESC("最高电芯电压"),bms->MaxCellV,MG_ESC("平均电芯电压"),bms->AvgCellV,MG_ESC("最低电芯电压"),bms->MinCellV,
     /*4*/MG_ESC("最高电芯温度"),bms->MaxCellT,MG_ESC("平均电芯温度"),bms->AvgCellT,MG_ESC("最低电芯温度"),bms->MinCellT,
     /*5*/MG_ESC("压差"),bms->CellVDiff,MG_ESC("温差"),bms->CellTDiff,
-    /*6*/MG_ESC("高压状态"),MG_ESC(bms->szHvState),
+    /*6*/MG_ESC("电池容量"),bms->BatCapacity,MG_ESC("母线总电压"),bms->BusV,
     /*7*/MG_ESC("最高温度位置"),bms->MaxCellTIdx,MG_ESC("最低温度位置"),bms->MinCellTIdx,MG_ESC("最高电压位置"),bms->MaxCellVIdx,MG_ESC("最低电压位置"),bms->MinCellVIdx,
     /*8*/MG_ESC("最大可充电流"),bms->MaxChgCurr,MG_ESC("最大可放电流"),bms->MaxDhgCurr,
-    /*9*/MG_ESC("数据更新时间"),MG_ESC(bms->szLastUpdate),MG_ESC("通信失败次数"),bms->CommFailTotalCnt,
-    /*10*/MG_ESC("工作状态"),bms->WorkState,MG_ESC("电池自检"),bms->BatSelfSupervise,MG_ESC("系统状态"),bms->SysState,MG_ESC("上电条件"),bms->HvOnCondition,
-    /*11*/MG_ESC("动作元件状态"),MG_ESC(bms->szActionCompStatus),MG_ESC("装置自检状态"),MG_ESC(bms->szSelfCheckStatus),MG_ESC("遥信变位状态"),MG_ESC(bms->szRemoteSignal)
+    /*9*/MG_ESC("模组最高电压"),bms->MaxCellVMod,MG_ESC("模组最高电压编号"),bms->MaxCellVModIdx,
+    /*10*/MG_ESC("数据更新时间"),MG_ESC(bms->szLastUpdate),MG_ESC("通信失败次数"),bms->CommFailTotalCnt,
+    /*11*/MG_ESC("工作状态"),MG_ESC(bms->szWorkState),MG_ESC("电池自检"),MG_ESC(bms->szBatSelfSupervise),MG_ESC("系统状态"),MG_ESC(bms->szSysState),MG_ESC("上电条件"),bms->HvOnCondition,
+    /*12*/MG_ESC("动作元件状态"),MG_ESC(bms->szActionCompStatus),MG_ESC("装置自检状态"),MG_ESC(bms->szSelfCheckStatus),MG_ESC("遥信变位状态"),MG_ESC(bms->szRemoteSignal)
   );
 }
 
@@ -1259,17 +1329,16 @@ static void handle_ac_get(struct mg_connection* c)
   struct Settings_t* set = &APPL.Set.s;
  mg_http_reply(c, 200, s_json_header, "{\
 %m:%m,%m:%m,%m:%m,%m:%m,\
-%m:%d,%m:%d,%m:%d,\
-%m:%.2lf,%m:%.2lf,\
+%m:%f,%m:%f,%m:%f,\
+%m:%f,%m:%f,\
 %m:%m,%m:%d,%m:%d,%m:%d,%m:%d,\
-%m:%m,%m:%m,%m:%d,%m:%d,%m:%m,%m:%m,\
+%m:%m,%m:%m,%m:%d,%m:%d,%m:%m,%m:%m,%m:%m,\
 %m:%m,%m:%m,%m:%m}\n",
 /*1*/MG_ESC("通信状态"), MG_ESC(ac->szCommState),MG_ESC("数据更新时间"), MG_ESC(ac->szLastUpdate1), MG_ESC("工作模式"),MG_ESC(ac->szWorkMode), MG_ESC("控制模式"),MG_ESC(ac->szCtlMode),
 /*2*/MG_ESC("出水温度"),ac->OutWaterTemp, MG_ESC("回水温度"),ac->InWaterTemp, MG_ESC("环境温度"),ac->EnvTemp,
 /*3*/MG_ESC("回水压力"),ac->InWaterPre, MG_ESC("出水压力"),ac->OutWaterPre, 
 /*4*/MG_ESC("供回水控制目标"),MG_ESC(ac->szWaterTempTargetCtlTemp),MG_ESC("制冷温度设定"),ac->watercool,MG_ESC("制冷回差"),ac->watercoolgap,MG_ESC("加热温度设定"),ac->waterhot,MG_ESC("加热回差"),ac->waterhotgap,
-/*5*/MG_ESC("水泵档位"),MG_ESC(ac->szPumpShift),MG_ESC("压缩机档位"),MG_ESC(ac->szPumpShift),MG_ESC("水泵转速"),ac->PumpRpm,MG_ESC("心跳"),ac->Heartbeat,MG_ESC("压缩机状态"),MG_ESC(ac->szCmpState),MG_ESC("运行时间"),MG_ESC(ac->szRunTime),
-// /*5*/MG_ESC("水泵转速"),ac->PumpRpm,MG_ESC("心跳"),ac->Heartbeat,MG_ESC("压缩机状态"),MG_ESC(ac->szCmpState),MG_ESC("运行时间"),MG_ESC(ac->szRunTime),
+/*5*/MG_ESC("水泵档位"),MG_ESC(ac->szPumpShift),MG_ESC("压缩机档位"),MG_ESC(ac->szCmpShift),MG_ESC("水泵转速"),ac->PumpRpm,MG_ESC("心跳"),ac->Heartbeat,MG_ESC("水泵状态"),MG_ESC(ac->szPumpState),MG_ESC("压缩机状态"),MG_ESC(ac->szCmpState),MG_ESC("运行时间"),MG_ESC(ac->szRunTime),
 /*6*/MG_ESC("液压水温故障"),MG_ESC(ac->szErrMsg1),MG_ESC("变频器故障"),MG_ESC(ac->szErrMsg2),MG_ESC("当前告警最高等级"),MG_ESC(ac->szErrMsg3));
 }
 
@@ -1329,9 +1398,9 @@ static void handle_env_get(struct mg_connection* c)
   struct Dehumi_t* dh = &APPL.Dehumi;
   struct Co_t* co = &APPL.Co;
   mg_http_reply(c,200,s_json_header,"{\
-%m:{%m:%m,%m:%lf,%m:%lf,%m:%lf,%m:%lf,%m:%lf,%m:%m},\
+%m:{%m:%m,%m:%f,%m:%f,%m:%f,%m:%f,%m:%f,%m:%m},\
 %m:{%m:%m,%m:%m,%m:%m,%m:%m,%m:%m,%m:%m,%m:%m,%m:%m,%m:%m},\
-%m:{%m:%m,%m:%m,%m:%lf,%m:%lf,%m:%lf,%m:%lf,%m:%lf,%m:%lf,%m:%m,%m:%m,%m:%m,%m:%m,%m:%m,%m:%m},\
+%m:{%m:%m,%m:%m,%m:%f,%m:%f,%m:%f,%m:%f,%m:%f,%m:%f,%m:%m,%m:%m,%m:%m,%m:%m,%m:%m,%m:%m},\
 %m:{%m:%m,%m:%m,%m:%d,%m:%m}}\n",
 /*1*/MG_ESC("辅助电表"),MG_ESC("通信状态"),MG_ESC(adl->szCommState),MG_ESC("正向有功总电能"),adl->PosAe,MG_ESC("反向有功总电能"),adl->NegAe,MG_ESC("有功功率"),adl->Ap,MG_ESC("无功功率"),adl->Rap,MG_ESC("功率因数"),adl->Pf,MG_ESC("数据更新时间"),MG_ESC(adl->szLastUpdate),
 /*2*/MG_ESC("DIDO"),MG_ESC("状态"),MG_ESC(dido->szState),MG_ESC("数据更新时间"),MG_ESC(dido->szLastUpdate),MG_ESC("1#水浸"),MG_ESC(dido->szWaterDec1),MG_ESC("2#水浸"),MG_ESC(dido->szWaterDec2),MG_ESC("前门"),MG_ESC(dido->szFrontDoor),MG_ESC("后门"),MG_ESC(dido->szBackDoor),MG_ESC("急停"),MG_ESC(dido->szEmgStop),MG_ESC("状态灯"),MG_ESC(dido->szLedMode),MG_ESC("消防喷发反馈"),MG_ESC(dido->szFeEruptFb),
@@ -1512,6 +1581,10 @@ static void fn(struct mg_connection* c,int ev,void* ev_data)
     {
       handle_bms_get(c);
     }
+    else if(mg_http_match_uri(hm,"/api/bms/set"))
+    {
+      handle_bms_set(c,hm->body);
+    }
     else if(mg_http_match_uri(hm,"/api/ac/get"))
     {
       handle_ac_get(c);