iac600kw调试软新增控制是添加操作提示,以及在通信上之后发送一次退出系统界面命令
36个文件已修改
269 ■■■■■ 已修改文件
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/IAC_ComBase.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/IAC_RealData.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/SPCommIAC_600KW.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$1.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$10.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$11.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$12.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$13.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$14.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$15.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$16.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$17.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$18.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$19.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$2.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$20.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$21.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$22.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$23.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$24.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$25.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$3.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$4.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$5.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$6.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$7.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$8.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$9.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/main/main_window_computer.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/IAC_ComBase.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/IAC_RealData.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/IAC_TestParam.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/SPCommIAC_600KW.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/iac_600kw_page.java 173 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/src/main/main_window_computer.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/IAC_ComBase.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/IAC_RealData.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/SPCommIAC_600KW.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$1.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$10.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$11.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$12.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$13.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$14.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$15.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$16.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$17.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$18.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$19.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$2.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$20.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$21.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$22.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$23.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$24.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$25.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$3.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$4.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$5.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$6.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$7.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$8.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page$9.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/ica_600kw/iac_600kw_page.class
Binary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer.class
Binary files differ
Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/IAC_ComBase.java
@@ -25,7 +25,16 @@
    
    
    public static final int CMD_WTTest_Success_Ack            = 0x20;        //稳态测试成功
    public static final int CMD_WTTest_Fail_Ack                = 0x21;        //稳态测试失败
    public static final int CMD_ZDTest_Success_Ack            = 0x22;        //整定测试成功
    public static final int CMD_ZDTest_Fail_Ack                = 0x23;        //整定测试失败
    public static final int CMD_BDTest_Success_Ack            = 0x24;        //波动测试成功
    public static final int CMD_BDTest_Fail_Ack                = 0x25;        //波动测试失败
    public static final int CMD_STTest_Success_Ack            = 0x26;        //瞬态测试成功
    public static final int CMD_STTest_Fail_Ack                = 0x27;        //瞬态测试失败
    public static final int CMD_XBTest_Success_Ack            = 0x28;        //谐波测试成功
    public static final int CMD_XBTest_Fail_Ack                = 0x29;        //谐波测试失败
    
    
    
Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/IAC_RealData.java
@@ -18,7 +18,7 @@
    public static final int XBtesting   =        9;
    public static final int XBPause     =        10;
    
    public static final int REG_Count = 36;        //寄存器数量
    public static final int REG_Count = 37;        //寄存器数量
    
    private float Ua;            //a相电压(0.1V)
    private float Ub;            //b相电压(0.1V)
@@ -56,6 +56,7 @@
    private float JBXBIb;        //基波谐波电流b(0.1A)
    private float JBXBIc;        //基波谐波电流c(0.1A)
    private int SysWorkState;        //状态(0-停止  1-稳态测试  2-稳态暂停  3-整定测试  4-整定暂停 5-波动测试  6-波动暂停 7-瞬态测试 8-瞬态暂停  9-谐波测试  10-谐波暂停)
    private int AlmState;        //告警[]
    
    public boolean putByteBuffer(ByteBuffer bbf_rx) {
        if(bbf_rx.limit() < REG_Count*2) {
@@ -99,6 +100,7 @@
        this.JBXBIb = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/10;        //基波谐波电流b(0.1A)
        this.JBXBIc = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/10;        //基波谐波电流c(0.1A)
        this.SysWorkState = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());    //状态(0-停止  1-稳态测试  2-稳态暂停  3-整定测试  4-整定暂停 5-波动测试  6-波动暂停 7-瞬态测试 8-瞬态暂停  9-谐波测试  10-谐波暂停)
        this.AlmState = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());    //状态(0-停止  1-稳态测试  2-稳态暂停  3-整定测试  4-整定暂停 5-波动测试  6-波动暂停 7-瞬态测试 8-瞬态暂停  9-谐波测试  10-谐波暂停)
    
        return true;
    }
@@ -147,6 +149,53 @@
        return work_str;
    }
    
    public String getAlmStateStr() {
        String alm_str = "δ֪-"+this.AlmState;
        switch (this.AlmState) {
        case 0:    alm_str = "暂停";break;
        case 1:    alm_str = "稳态";break;
        case 2:    alm_str = "暂停";break;
        case 3:    alm_str = "整定";break;
        case 4:    alm_str = "波动";break;
        case 5:    alm_str = "˲̬";break;
        case 6:    alm_str = "谐波";break;
        case 7:    alm_str = "手动停止";break;
        case 8:    alm_str = "测试时间到停止";break;
        case 9:    alm_str = "Flash故障";break;
        case 10:alm_str = "电流上限到停止";break;
        case 11:alm_str = "电压上限到停止";break;
        case 12:alm_str = "电压下限到停止";break;
        case 13:alm_str = "温度过高停止";break;
        case 14:alm_str = "紧急停止";break;
        case 15:alm_str = "通信异常停止";break;
        case 16:alm_str = "从机通信异常停止";break;
        case 17:alm_str = "主机通信异常停止";break;
        case 18:alm_str = "从机状态异常停止";break;
        default:
            alm_str = "δ֪-"+this.AlmState;
            break;
        }
        return alm_str;
    }
    public int getAlmState() {
        return AlmState;
    }
    public void setAlmState(int almState) {
        AlmState = almState;
    }
    public int getSysWorkState() {
        return SysWorkState;
    }
    public void setSysWorkState(int sysWorkState) {
        SysWorkState = sysWorkState;
    }
    public float getUa() {
        return Ua;
    }
Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/IAC_TestParam.java
@@ -20,7 +20,7 @@
    public static final int REG_Count_Set = 29;
    
    public boolean is_ReadParam = false;
    public int JiFangNum;                    //机房编号
    public int DeviceNum;                    //设备编号[1-9999999]
    
Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/SPCommIAC_600KW.java
@@ -43,6 +43,8 @@
    private short dt_user_cmd = Power_ComBase.CMD_NULL;
    private int dt_user_cmd_regaddr = 0;                                    //用户控制时的寄存器地址
    
    public boolean is_ClosePage = false;                    //是否退出界面
    /*********************************************************************/
    
    private  boolean CommThreadRunning = false;
@@ -98,7 +100,7 @@
    public short mAddrSettedNow = 0;
    
    private short dt_cmd = ModBus_ComBase.CMD_Null;
    public int dt_cmd_ack = Power_ComBase.CMD_NULL;
    public int dt_cmd_ack = IAC_ComBase.CMD_Null;
    public MyModBusRtu rtu_rt;
    public MyModBusRtu rtu_rx;
@@ -203,6 +205,7 @@
            comm_rx_cnt = 0;
            CommThreadRunning = true;
        }
        is_ClosePage = false;
        m_TestParamFromDev.setIs_ReadParam(false);
        return res;
    }
@@ -224,6 +227,16 @@
            
            rtu_rt.reg_addr = IAC_ComBase.CMD_RealData_Addr;
            rtu_rt.reg_count = IAC_RealData.REG_Count;
            if((dt_cmd_cnt % 3 == 0) && !is_ClosePage) {
                //退出界面
                rtu_rt.Cmd = MyModBusRtu.CMD_TYPE_WRITE_STD;
                rtu_rt.reg_addr = IAC_ComBase.CMD_ClosePage_Addr;
                dt_data = IAC_Cmd.createControlByteBuffer(0x0001&0xFFFF);
                rtu_rt.reg_count = dt_data.capacity()/2;
            }
            
        } else {
            //数据
@@ -355,43 +368,54 @@
                    if(IAC_ComBase.CMD_Success == rtu_rx.result) {
                        isSuccess = true;
                        op_result = "控制稳态测试成功-" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
                        dt_cmd_ack = IAC_ComBase.CMD_WTTest_Success_Ack;
                    }else {
                        op_result = "控制稳态测试失败-" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
                        dt_cmd_ack = IAC_ComBase.CMD_WTTest_Fail_Ack;
                    }
                }else if(IAC_ComBase.CMD_ZDTest_Addr == rtu_rx.reg_addr) {
                    if(IAC_ComBase.CMD_Success == rtu_rx.result) {
                        isSuccess = true;
                        dt_cmd_ack = IAC_ComBase.CMD_ZDTest_Success_Ack;
                        op_result = "控制整定测试成功-" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
                    }else {
                        dt_cmd_ack = IAC_ComBase.CMD_ZDTest_Fail_Ack;
                        op_result = "控制整定测试失败-" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
                    }
                }else if(IAC_ComBase.CMD_BDTest_Addr == rtu_rx.reg_addr) {
                    if(IAC_ComBase.CMD_Success == rtu_rx.result) {
                        isSuccess = true;
                        dt_cmd_ack = IAC_ComBase.CMD_BDTest_Success_Ack;
                        op_result = "控制波动测试成功-" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
                    }else {
                        dt_cmd_ack = IAC_ComBase.CMD_BDTest_Fail_Ack;
                        op_result = "控制波动测试失败-" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
                    }
                }else if(IAC_ComBase.CMD_STTest_Addr == rtu_rx.reg_addr) {
                    if(IAC_ComBase.CMD_Success == rtu_rx.result) {
                        isSuccess = true;
                        dt_cmd_ack = IAC_ComBase.CMD_STTest_Success_Ack;
                        op_result = "控制瞬态测试成功-" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
                    }else {
                        dt_cmd_ack = IAC_ComBase.CMD_STTest_Fail_Ack;
                        op_result = "控制瞬态测试失败-" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
                    }
                }else if(IAC_ComBase.CMD_XBTest_Addr == rtu_rx.reg_addr) {
                    if(IAC_ComBase.CMD_Success == rtu_rx.result) {
                        isSuccess = true;
                        dt_cmd_ack = IAC_ComBase.CMD_XBTest_Success_Ack;
                        op_result = "控制谐波测试成功-" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
                    }else {
                        dt_cmd_ack = IAC_ComBase.CMD_XBTest_Fail_Ack;
                        op_result = "控制谐波测试失败-" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
                    }
                }else if(IAC_ComBase.CMD_ClosePage_Addr == rtu_rx.reg_addr) {
                    if(IAC_ComBase.CMD_Success == rtu_rx.result) {
                        isSuccess = true;
                        op_result = "退出界面成功-" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
                        is_ClosePage = true;
                        //op_result = "退出界面成功-" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
                    }else {
                        op_result = "退出界面失败-" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
                        //op_result = "退出界面失败-" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
                    }
                }
                
Device_Simulator_DTS_Tester/src/com/dev/ica_600kw/iac_600kw_page.java
@@ -1,6 +1,7 @@
package com.dev.ica_600kw;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
@@ -96,6 +97,7 @@
    private JTextField tf_JbxbIc;                //基波谐波电流C
    private JTextField SysWorkState;            //工作状态
    private JTextField tf_AlmState;                //工作状态
    private JTextField tf_JiFangNum_wt;            //机房编号    
    private JTextField tf_DeviceNum_wt;            //设备编号    
@@ -216,7 +218,7 @@
        JPanel panel_100 = new JPanel();
        panel_100.setBorder(new TitledBorder(null, "设备状态", TitledBorder.LEADING, TitledBorder.TOP, null, null));
        panel_baseinfo.add(panel_100, BorderLayout.CENTER);
        panel_100.setLayout(new GridLayout(6, 3, 0, 5));
        panel_100.setLayout(new GridLayout(7, 6, 0, 1));
        
        JPanel panel_101 = new JPanel();
        panel_101.setBorder(new TitledBorder(null, "设备遥调遥控", TitledBorder.LEADING, TitledBorder.TOP, null, null));
@@ -566,6 +568,18 @@
        tf_PHa = new JTextField();
        tf_PHa.setColumns(10);
        panel_177.add(tf_PHa);
        JPanel panel_178 = new JPanel();
        panel_178.setBorder(new TitledBorder(null, "设备告警", TitledBorder.LEADING, TitledBorder.TOP, null, null));
        panel_100.add(panel_178);
        panel_178.setLayout(new BorderLayout(0, 0));
        tf_AlmState = new JTextField();
        tf_AlmState.setColumns(10);
        tf_AlmState.setFont(new Font("宋体", Font.PLAIN, 10));
        tf_AlmState.setForeground(Color.RED);
        //tf_AlmState.setText("从机状态异常停止");
        panel_178.add(tf_AlmState);
        
        
        JPanel panel_130 = new JPanel();        
@@ -925,6 +939,10 @@
        btn_wt_start.setEnabled(false);
        btn_wt_start.addActionListener(new ActionListener() {
            public void actionPerformed(ActionEvent arg0) {
                if(!Comm_ICA.m_TestParamFromDev.is_ReadParam) {
                    JOptionPane.showMessageDialog(null, "请先读取测试参数!");
                    return;
                }
                Comm_ICA.setCommCmd(MyModBusRtu.CMD_TYPE_WRITE_STD, IAC_ComBase.CMD_WTTest_Addr, IAC_Cmd.createControlByteBuffer(0x0001&0xFFFF));
            }
        });
@@ -1048,6 +1066,10 @@
        btn_zd_start.setEnabled(false);
        btn_zd_start.addActionListener(new ActionListener() {
            public void actionPerformed(ActionEvent arg0) {
                if(!Comm_ICA.m_TestParamFromDev.is_ReadParam) {
                    JOptionPane.showMessageDialog(null, "请先读取测试参数!");
                    return;
                }
                Comm_ICA.setCommCmd(MyModBusRtu.CMD_TYPE_WRITE_STD, IAC_ComBase.CMD_ZDTest_Addr, IAC_Cmd.createControlByteBuffer(0x0001&0xFFFF));
            }
        });
@@ -1171,6 +1193,10 @@
        btn_bd_start.setEnabled(false);
        btn_bd_start.addActionListener(new ActionListener() {
            public void actionPerformed(ActionEvent arg0) {
                if(!Comm_ICA.m_TestParamFromDev.is_ReadParam) {
                    JOptionPane.showMessageDialog(null, "请先读取测试参数!");
                    return;
                }
                Comm_ICA.setCommCmd(MyModBusRtu.CMD_TYPE_WRITE_STD, IAC_ComBase.CMD_BDTest_Addr, IAC_Cmd.createControlByteBuffer(0x0001&0xFFFF));
            }
        });
@@ -1294,6 +1320,10 @@
        btn_st_start.setEnabled(false);
        btn_st_start.addActionListener(new ActionListener() {
            public void actionPerformed(ActionEvent arg0) {
                if(!Comm_ICA.m_TestParamFromDev.is_ReadParam) {
                    JOptionPane.showMessageDialog(null, "请先读取测试参数!");
                    return;
                }
                Comm_ICA.setCommCmd(MyModBusRtu.CMD_TYPE_WRITE_STD, IAC_ComBase.CMD_STTest_Addr, IAC_Cmd.createControlByteBuffer(0x0001&0xFFFF));
            }
        });
@@ -1408,6 +1438,10 @@
        btn_xb_start.setEnabled(false);
        btn_xb_start.addActionListener(new ActionListener() {
            public void actionPerformed(ActionEvent arg0) {
                if(!Comm_ICA.m_TestParamFromDev.is_ReadParam) {
                    JOptionPane.showMessageDialog(null, "请先读取测试参数!");
                    return;
                }
                Comm_ICA.setCommCmd(MyModBusRtu.CMD_TYPE_WRITE_STD, IAC_ComBase.CMD_XBTest_Addr, IAC_Cmd.createControlByteBuffer(0x0001&0xFFFF));
            }
        });
@@ -1570,11 +1604,118 @@
                tf_JbxbIc.setText(String.format("%1.1f", tmp_real.getJBXBIc()));
                SysWorkState.setText(String.format("%s", tmp_real.getSysWorkStateStr()));
                tf_AlmState.setText(String.format("%s", tmp_real.getAlmStateStr()));
                
                
                
                tf_op_inf.setText(String.format("%s",Comm_ICA.op_result));
                if(IAC_RealData.Stopped == tmp_real.getSysWorkState()) {
                    setButttonState(true);
                    if(tmp_real.getAlmState() > 8) {
                        btn_wt_start.setEnabled(false);                //启动
                        btn_zd_start.setEnabled(false);                //启动
                        btn_bd_start.setEnabled(false);                //启动
                        btn_st_start.setEnabled(false);                //启动
                        btn_xb_start.setEnabled(false);                //启动
                    }
                    btn_wt_pause.setEnabled(false);                //暂停
                    btn_wt_stop.setEnabled(false);                //ֹͣ
                    btn_zd_pause.setEnabled(false);                //暂停
                    btn_zd_stop.setEnabled(false);                //ֹͣ
                    btn_bd_pause.setEnabled(false);                //暂停
                    btn_bd_stop.setEnabled(false);                //ֹͣ
                    btn_st_pause.setEnabled(false);                //暂停
                    btn_st_stop.setEnabled(false);                //ֹͣ
                    btn_xb_pause.setEnabled(false);                //暂停
                    btn_xb_stop.setEnabled(false);                //ֹͣ
                }else if(IAC_RealData.WTtesting == tmp_real.getSysWorkState()) {
                    setButttonState(false);
                    btn_wt_read.setEnabled(true);                //读取
                    btn_wt_write.setEnabled(true);                //设置
                    btn_wt_pause.setEnabled(true);                //暂停
                    btn_wt_stop.setEnabled(true);                //ֹͣ
                }else if(IAC_RealData.WTPause == tmp_real.getSysWorkState()) {
                    setButttonState(false);
                    btn_wt_read.setEnabled(true);                //读取
                    btn_wt_write.setEnabled(true);                //设置
                    btn_wt_start.setEnabled(true);                //启动
                    btn_wt_stop.setEnabled(true);                //ֹͣ
                }else if(IAC_RealData.ZDtesting == tmp_real.getSysWorkState()) {
                    setButttonState(false);
                    btn_zd_read.setEnabled(true);                //读取
                    btn_zd_write.setEnabled(true);                //设置
                    btn_zd_pause.setEnabled(true);                //暂停
                    btn_zd_stop.setEnabled(true);                //ֹͣ
                }else if(IAC_RealData.ZDPause == tmp_real.getSysWorkState()) {
                    setButttonState(false);
                    btn_zd_read.setEnabled(true);                //读取
                    btn_zd_write.setEnabled(true);                //设置
                    btn_zd_start.setEnabled(true);                //启动
                    btn_zd_stop.setEnabled(true);                //ֹͣ
                }else if(IAC_RealData.BDtesting == tmp_real.getSysWorkState()) {
                    setButttonState(false);
                    btn_bd_read.setEnabled(true);                //读取
                    btn_bd_write.setEnabled(true);                //设置
                    btn_bd_pause.setEnabled(true);                //暂停
                    btn_bd_stop.setEnabled(true);                //ֹͣ
                }else if(IAC_RealData.BDPause == tmp_real.getSysWorkState()) {
                    setButttonState(false);
                    btn_bd_read.setEnabled(true);                //读取
                    btn_bd_write.setEnabled(true);                //设置
                    btn_bd_start.setEnabled(true);                //启动
                    btn_bd_stop.setEnabled(true);                //ֹͣ
                }else if(IAC_RealData.STtesting == tmp_real.getSysWorkState()) {
                    setButttonState(false);
                    btn_st_read.setEnabled(true);                //读取
                    btn_st_write.setEnabled(true);                //设置
                    btn_st_pause.setEnabled(true);                //暂停
                    btn_st_stop.setEnabled(true);                //ֹͣ
                }else if(IAC_RealData.STPause == tmp_real.getSysWorkState()) {
                    setButttonState(false);
                    btn_st_read.setEnabled(true);                //读取
                    btn_st_write.setEnabled(true);                //设置
                    btn_st_start.setEnabled(true);                //启动
                    btn_st_stop.setEnabled(true);                //ֹͣ
                }else if(IAC_RealData.XBtesting == tmp_real.getSysWorkState()) {
                    setButttonState(false);
                    btn_st_read.setEnabled(true);                //读取
                    btn_st_write.setEnabled(true);                //设置
                    btn_xb_pause.setEnabled(true);                //暂停
                    btn_st_stop.setEnabled(true);                //ֹͣ
                }else if(IAC_RealData.XBPause == tmp_real.getSysWorkState()) {
                    setButttonState(false);
                    btn_st_read.setEnabled(true);                //读取
                    btn_st_write.setEnabled(true);                //设置
                    btn_xb_start.setEnabled(true);                //启动
                    btn_st_stop.setEnabled(true);                //ֹͣ
                }
            }
            
            if(IAC_ComBase.CMD_GetParam_Ack == Comm_ICA.dt_cmd_ack) {
                IAC_TestParam param = Comm_ICA.m_TestParamFromDev;
@@ -1633,6 +1774,36 @@
                this.tf_PowerPercent_xb.setText(String.format("%d",param.PowerPercent));    //负载率
                Comm_ICA.dt_cmd_ack = IAC_ComBase.CMD_Null;
            }else if(IAC_ComBase.CMD_WTTest_Success_Ack == Comm_ICA.dt_cmd_ack) {
                JOptionPane.showMessageDialog(null, "控制稳态测试成功!");
                Comm_ICA.dt_cmd_ack = IAC_ComBase.CMD_Null;
            }else if(IAC_ComBase.CMD_WTTest_Fail_Ack == Comm_ICA.dt_cmd_ack) {
                JOptionPane.showMessageDialog(null, "控制稳态测试失败!");
                Comm_ICA.dt_cmd_ack = IAC_ComBase.CMD_Null;
            }else if(IAC_ComBase.CMD_ZDTest_Success_Ack == Comm_ICA.dt_cmd_ack) {
                JOptionPane.showMessageDialog(null, "控制整定测试成功!");
                Comm_ICA.dt_cmd_ack = IAC_ComBase.CMD_Null;
            }else if(IAC_ComBase.CMD_ZDTest_Fail_Ack == Comm_ICA.dt_cmd_ack) {
                JOptionPane.showMessageDialog(null, "控制整定测试失败!");
                Comm_ICA.dt_cmd_ack = IAC_ComBase.CMD_Null;
            }else if(IAC_ComBase.CMD_BDTest_Success_Ack == Comm_ICA.dt_cmd_ack) {
                JOptionPane.showMessageDialog(null, "控制波动测试成功!");
                Comm_ICA.dt_cmd_ack = IAC_ComBase.CMD_Null;
            }else if(IAC_ComBase.CMD_BDTest_Fail_Ack == Comm_ICA.dt_cmd_ack) {
                JOptionPane.showMessageDialog(null, "控制波动测试失败!");
                Comm_ICA.dt_cmd_ack = IAC_ComBase.CMD_Null;
            }else if(IAC_ComBase.CMD_STTest_Success_Ack == Comm_ICA.dt_cmd_ack) {
                JOptionPane.showMessageDialog(null, "控制瞬态测试成功!");
                Comm_ICA.dt_cmd_ack = IAC_ComBase.CMD_Null;
            }else if(IAC_ComBase.CMD_STTest_Fail_Ack == Comm_ICA.dt_cmd_ack) {
                JOptionPane.showMessageDialog(null, "控制瞬态测试失败!");
                Comm_ICA.dt_cmd_ack = IAC_ComBase.CMD_Null;
            }else if(IAC_ComBase.CMD_XBTest_Success_Ack == Comm_ICA.dt_cmd_ack) {
                JOptionPane.showMessageDialog(null, "控制谐波测试成功!");
                Comm_ICA.dt_cmd_ack = IAC_ComBase.CMD_Null;
            }else if(IAC_ComBase.CMD_XBTest_Fail_Ack == Comm_ICA.dt_cmd_ack) {
                JOptionPane.showMessageDialog(null, "控制谐波测试失败!");
                Comm_ICA.dt_cmd_ack = IAC_ComBase.CMD_Null;
            }
            
            
Device_Simulator_DTS_Tester/src/main/main_window_computer.java
@@ -110,7 +110,7 @@
    //public String mTitle = "MSP&SAM&SWM&Curr_V1.523_220424G";
    public String mTitle = "调试工具";
    
    public String mVerSioin = "_V1.104";
    public String mVerSioin = "_V1.105";
    
    public static int LANG_TYPE    = LANG_TYPE_CN;