修改

whyclj

2020-10-11 e72ab6c7f9e4ca9b9f57af0cdcde135d049513e5

 src/com/dev/base/data/Dynamicload_state.java

@@ -256,7 +256,7 @@
      batch.addLocator(2,MyModbusUtils.createBaseLocator(10 , master));
      batch.addLocator(3,MyModbusUtils.createBaseLocator(11, master));//全部分闸
      if(fz_button_num==11){
         batch.addLocator(4,MyModbusUtils.createBaseLocator(1,DataType.FOUR_BYTE_FLOAT, master));   //实际设定功率4									
         batch.addLocator(4,MyModbusUtils.createBaseLocator(1,DataType.TWO_BYTE_INT_SIGNED, master));   //实际设定功率4									
         batch.addLocator(5,MyModbusUtils.createBaseLocator(2,DataType.TWO_BYTE_INT_SIGNED, master));//已输出功率                        
         batch.addLocator(6,MyModbusUtils.createBaseLocator(4,DataType.TWO_BYTE_INT_SIGNED, master));//设定功率                  
         batch.addLocator(7,MyModbusUtils.createBaseLocator(6,DataType.TWO_BYTE_INT_SIGNED,master));   //间隔时间               
@@ -264,8 +264,8 @@
         batch.addLocator(9,MyModbusUtils.createBaseLocator(8,DataType.TWO_BYTE_INT_SIGNED, master));//实际电压4
         
      }else {
         batch.addLocator(4,MyModbusUtils.createBaseLocator(2,DataType.FOUR_BYTE_FLOAT, master));   //实际设定功率4									
         batch.addLocator(5,MyModbusUtils.createBaseLocator(4,DataType.TWO_BYTE_INT_SIGNED, master));//已输出功率								
         batch.addLocator(4,MyModbusUtils.createBaseLocator(2,DataType.TWO_BYTE_INT_SIGNED, master));   //实际设定功率4									
         batch.addLocator(5,MyModbusUtils.createBaseLocator(4,DataType.FOUR_BYTE_FLOAT, master));   //已输出功率								
         batch.addLocator(6,MyModbusUtils.createBaseLocator(8,DataType.TWO_BYTE_INT_SIGNED, master));//设定功率                  
         batch.addLocator(7,MyModbusUtils.createBaseLocator(16,DataType.TWO_BYTE_INT_SIGNED,master));//间隔时间                  
         batch.addLocator(8,MyModbusUtils.createBaseLocator(17,DataType.TWO_BYTE_INT_SIGNED, master));//实际电流                  
@@ -299,15 +299,18 @@
    * 解析返回请求
    * @param res
    */
   public void putBatchResult(BatchResults<Integer> res) {
   public void putBatchResult(BatchResults<Integer> res,int fz_button_num) {
      if(res != null) {
         this.start_auto = MyModbusUtils.readBooleanToInt(res.getValue(0));   
         this.stop_auto = MyModbusUtils.readBooleanToInt(res.getValue(1));   
         this.sudden_crease = MyModbusUtils.readBooleanToInt(res.getValue(2));   
         this.all_open = MyModbusUtils.readBooleanToInt(res.getValue(3));   
			
         this.actual_set_power = MyModbusUtils.readFloat(res.getValue(4));            //实际设定功率	
         this.output_power = MyModbusUtils.readShortToFloat(res.getValue(5));         //已输出功率
         this.actual_set_power = MyModbusUtils.readShortToFloat(res.getValue(4));            //实际设定功率	
         if(fz_button_num == 11) {
            this.output_power = MyModbusUtils.readShortToFloat(res.getValue(5));         //已输出功率
         }else {
            this.output_power = MyModbusUtils.readFloat(res.getValue(5));         //已输出功率
         }
         this.set_power = MyModbusUtils.readShortToFloat(res.getValue(6));            //设定功率            
         this.interval_time = MyModbusUtils.readShortToFloat(res.getValue(7));         //间隔时间   
         this.actual_curr = MyModbusUtils.readShortToFloat(res.getValue(8));            //电压