优化老版本的调试工具校准逻辑

DELL

2025-04-16 799b25f0150c024dbc0a269ae1bdd11b44992b5f

优化老版本的调试工具校准逻辑

 Demo_FBS9800_HJ_Tester/bin/main/main_window$12.class

Binary files differ

 Demo_FBS9800_HJ_Tester/bin/main/main_window$13.class

Binary files differ

 Demo_FBS9800_HJ_Tester/bin/main/main_window$14.class

Binary files differ

 Demo_FBS9800_HJ_Tester/bin/main/main_window$15.class

Binary files differ

 Demo_FBS9800_HJ_Tester/bin/main/main_window$16.class

Binary files differ

 Demo_FBS9800_HJ_Tester/bin/main/main_window$17.class

Binary files differ

 Demo_FBS9800_HJ_Tester/bin/main/main_window$18$1.class

Binary files differ

 Demo_FBS9800_HJ_Tester/bin/main/main_window$18.class

Binary files differ

 Demo_FBS9800_HJ_Tester/bin/main/main_window$19.class

Binary files differ

 Demo_FBS9800_HJ_Tester/bin/main/main_window$2.class

Binary files differ

 Demo_FBS9800_HJ_Tester/bin/main/main_window$20.class

Binary files differ

 Demo_FBS9800_HJ_Tester/bin/main/main_window$21.class

Binary files differ

 Demo_FBS9800_HJ_Tester/bin/main/main_window.class

Binary files differ

 Demo_FBS9800_HJ_Tester/bin/sp_comm/SPCommZDHJ_9800.class

Binary files differ

 Demo_FBS9800_HJ_Tester/bin/version/version_inf.txt

@@ -1,6 +1,6 @@
带显示屏汇集器调试软件

    设备地址范围  1-65534

    设备地址已修改为2个字节，设置设备地址也修改为2个字节

    设备地址范围  1-254 -老版本

	


    波特率:9600

    数据格式:8位数据，无校验位，1停止位


 Demo_FBS9800_HJ_Tester/src/main/main_window.java

@@ -68,7 +68,7 @@
    public static int LANG_TYPE_CN = 0;

    public static int LANG_TYPE_EN = 1;

    

    public String mTitle = "ALI_9800HJ_ForJS_V1.323";

    public String mTitle = "ALI_9800HJ_V1.323";

    

    public static int LANG_TYPE    = LANG_TYPE_CN;

    public static int APP_ZDHJ_ONLY    = 0;

@@ -323,12 +323,12 @@
            @Override

            public void focusLost(FocusEvent e) {

                if(tf_target_addr.getText().trim().length() < 1) {

                    tf_target_addr.setText("65535");

                    tf_target_addr.setText("255");

                }

            }

        });

        tf_target_addr.setDocument(new LimitedDocument(5, "0123456789"));

        tf_target_addr.setText("65535");

        tf_target_addr.setDocument(new LimitedDocument(3, "0123456789"));

        tf_target_addr.setText("255");

        panel_8.add(tf_target_addr);

        tf_target_addr.setColumns(10);

        

@@ -371,7 +371,7 @@
        panel_55 = new JPanel();

        tabbedPane_commtype.addTab("网口通信", null, panel_55, null);

        panel_55.setLayout(new GridLayout(0, 3, 0, 0));

//        tabbedPane_commtype.setSelectedIndex(1);

        tabbedPane_commtype.setSelectedIndex(1);

        

        panel_62 = new JPanel();

        panel_62.setBorder(new TitledBorder(null, "IP\u5730\u5740", TitledBorder.LEADING, TitledBorder.TOP, null, null));

@@ -1004,7 +1004,7 @@
        tf_zdhj_devaddr = new JTextField();

        panel_7.add(tf_zdhj_devaddr, BorderLayout.CENTER);

        tf_zdhj_devaddr.setFont(new Font("Dialog", Font.PLAIN, 18));

        tf_zdhj_devaddr.setDocument(new LimitedDocument(5, "0123456789"));

        tf_zdhj_devaddr.setDocument(new LimitedDocument(2, "0123456789"));

        tf_zdhj_devaddr.setColumns(10);

        

        panel_10 = new JPanel();

@@ -1503,7 +1503,6 @@
        panel_52.add(panel_30);

        panel_30.setLayout(new GridLayout(0, 5, 2, 0));

        

        //实测组端电压

        tf_zdhj_volcal_source = new JTextField();

        panel_30.add(tf_zdhj_volcal_source);

        tf_zdhj_volcal_source.setFont(new Font("Dialog", Font.PLAIN, 18));

@@ -1865,9 +1864,7 @@
                    tf_rxcnt.setText(String.format("RX:%d", SerialComm_ZDHJ.comm_rx_cnt));

                    tf_zdhj_version.setText(String.format("V%1.2f", SerialComm_ZDHJ.dev_stat_version));

                    tf_zdhj_moncount.setText(String.format("%d", SerialComm_ZDHJ.ZDHJ_BattCount));

					
                    tf_zdhj_zdvol.setText(String.format("%1.1f", SerialComm_ZDHJ.GroupVol));

					
                    tf_zdhj_volcal_source.setText(String.format("%1.1f", SerialComm_ZDHJ.GroupVol));

                    //System.out.println("SerialComm_ZDHJ.dev_stat_state:" + SerialComm_ZDHJ.dev_stat_state);

                    cb_zdhj_state.setSelectedIndex(SerialComm_ZDHJ.dev_stat_state);


 Demo_FBS9800_HJ_Tester/src/sp_comm/SPCommZDHJ_9800.java

@@ -19,7 +19,6 @@
import FBS9100.FBS9100_ComBase;



import com.Com;

import com.ComFn;

import com.Crc16;

import com.PlaySound;



@@ -269,8 +268,7 @@
    private short[] dt_cmd_regdata = null;

    

    public SPCommZDHJ_9800(short addr_t, int bitrate, String dev_ip, int ipport, byte com_type) {

        dt_target_addr = addr_t & 0xFFFF;

//        dt_target_addr = addr_t & 0x00FF;

        dt_target_addr = addr_t & 0x00FF;

        comm_bautrate = bitrate;

        m_dev_ip = dev_ip;

        m_ip_port = ipport;

@@ -465,8 +463,7 @@
                    m_ZDHJ_REG_CNT = 120;

                }

            }

            CommTxBuffer.putShort((short) dt_target_addr);

//            CommTxBuffer.put((byte) dt_target_addr);

            CommTxBuffer.put((byte) dt_target_addr);

            CommTxBuffer.put((byte) dt_cmd_tmp);

            CommTxBuffer.putShort((short) m_ZDHJ_REG_ADDR);

            CommTxBuffer.putShort((short) m_ZDHJ_REG_CNT);

@@ -476,8 +473,7 @@
            m_ZDHJ_REG_ADDR = dt_cmd_regaddr;

            m_ZDHJ_REG_CNT = dt_cmd_regcnt;

            

            CommTxBuffer.putShort((short) dt_target_addr);

//            CommTxBuffer.put((byte) dt_target_addr);

            CommTxBuffer.put((byte) dt_target_addr);

            CommTxBuffer.put((byte) dt_cmd_tmp);

            CommTxBuffer.putShort((short) dt_cmd_regaddr);

            CommTxBuffer.putShort(dt_cmd_regdata[0]);

@@ -492,8 +488,7 @@
            m_ZDHJ_REG_ADDR = dt_cmd_regaddr;

            m_ZDHJ_REG_CNT = dt_cmd_regcnt;

            

            CommTxBuffer.putShort((short) dt_target_addr);

//            CommTxBuffer.put((byte) dt_target_addr);

            CommTxBuffer.put((byte) dt_target_addr);

            CommTxBuffer.put((byte) dt_cmd_tmp);

            CommTxBuffer.putShort((short) dt_cmd_regaddr);

            CommTxBuffer.putShort((short) dt_cmd_regcnt);

@@ -531,7 +526,7 @@
        byte[] bt_t = new byte[bbf_tx.limit()];

        bbf_tx.get(bt_t);

        

        System.out.println("TX:" + ComFn.bytesToHexString(bt_t, bt_t.length));

        //System.out.println(ComFn.bytesToHexString(bt_t, bt_t.length));

        

        outputStream.write(bt_t);

    }

@@ -664,14 +659,13 @@
            }

            

            bbf_rx.position(0);

//            bbf_rx.get();

            bbf_rx.getShort();                    //设备地址，状态码

            bbf_rx.get();

            byte op_cmd_t = bbf_rx.get();

            //short reg_addr_t = bbf_rx.getShort();

            

            if(CMD_TYPE_WRITE_MULTY == op_cmd_t) {

                bbf_rx.position(5);

                  int res_t = bbf_rx.getShort()&0xFFFF;

                bbf_rx.position(4);

                  int res_t = bbf_rx.getShort();

                if((reg_addr_t >= ZDHJ_PARAM_RegAddr_Start) && (reg_addr_t < ZDHJ_PARAM_RegAddr_End)) {

                    if(1 == res_t) {

                         setCommCmdAck(SPCommZDHJ_9800.ZDHJ_OP_WRITE_PARAM_OK);

@@ -680,8 +674,8 @@
                     }

                }

             } else if(m_CMD_TYPE_WRITE == op_cmd_t) {

                bbf_rx.position(5);

                int res_t = bbf_rx.getShort()&0xFFFF;

                bbf_rx.position(4);

                int res_t = bbf_rx.getShort();

                

                if(ZDHJ_ResTest_Start_RegAddr == reg_addr_t) {

                    if(1 == res_t) {

@@ -726,10 +720,9 @@
                    }

                }

            } else if(CMD_TYPE_READ == op_cmd_t) {

//                bbf_rx.position(3);

                bbf_rx.position(4);

                bbf_rx.position(3);

                if((reg_addr_t >= ZDHJ_PARAM_RegAddr_Start) && (reg_addr_t < ZDHJ_PARAM_RegAddr_End)) {

                    dev_param_addr = bbf_rx.getShort()&0xFFFF;

                    dev_param_addr = bbf_rx.getShort();

                    

                    int mon_cnt_t = 0;

                    for(int n=0; n<dev_param_ch_mon_cnt.length; n++) {

@@ -904,19 +897,20 @@
                } else {

                    SocketComm.Comm(this.m_dev_ip, this.m_ip_port, CommTxBuffer, CommRxBuffer);

                }

				
                //响应数据

                //System.out.println("RX:" + ComFn.bytesToHexString(CommRxBuffer.array(), CommRxBuffer.array().length));

				
                /*

                byte[] tmp = new byte[CommRxBuffer.limit()];

                CommRxBuffer.get(tmp);

                System.out.println(ComFn.bytesToHexString(tmp, tmp.length));

                */

                processRxData(CommRxBuffer, m_ZDHJ_REG_ADDR, m_ZDHJ_REG_CNT);

                if((ZDHJ_PARAM_RegAddr_Start == m_ZDHJ_REG_ADDR)            //设置参数

                    || (ZDHJ_ResTest_Start_RegAddr == m_ZDHJ_REG_ADDR)        //启动内阻测试

                    || (ZDHJ_ResTest_Stop_RegAddr == m_ZDHJ_REG_ADDR)        //停止内阻测试

                    || (ZDHJ_ResStart_System_RegAddr == m_ZDHJ_REG_ADDR)    //重启设备

                    || (ZDHJ_SetCurrZero_RegAddr == m_ZDHJ_REG_ADDR)        //电流重置

                    || (ZDHJ_AdjCurrSlope_RegAddr == m_ZDHJ_REG_ADDR)        //电流校准

                    || (ZDHJ_AdjVolOffset_RegAddr == m_ZDHJ_REG_ADDR)        //电压重置

                    || (ZDHJ_AdjVolSlope_RegAddr == m_ZDHJ_REG_ADDR)) {        //电压校准

                if((ZDHJ_PARAM_RegAddr_Start == m_ZDHJ_REG_ADDR)

                    || (ZDHJ_ResTest_Start_RegAddr == m_ZDHJ_REG_ADDR)

                    || (ZDHJ_ResTest_Stop_RegAddr == m_ZDHJ_REG_ADDR)

                    || (ZDHJ_ResStart_System_RegAddr == m_ZDHJ_REG_ADDR)

                    || (ZDHJ_SetCurrZero_RegAddr == m_ZDHJ_REG_ADDR)

                    || (ZDHJ_AdjCurrSlope_RegAddr == m_ZDHJ_REG_ADDR)

                    || (ZDHJ_AdjVolOffset_RegAddr == m_ZDHJ_REG_ADDR)

                    || (ZDHJ_AdjVolSlope_RegAddr == m_ZDHJ_REG_ADDR)) {



                    Thread.sleep(1000);

                    

@@ -966,6 +960,7 @@
                    }

                }

            } catch (InterruptedException | IOException e) {

                // TODO Auto-generated catch block

                e.printStackTrace();

                CloseCommPort();

                JOptionPane.showMessageDialog(null, "ZDHJ CommPort 串口异常: " + e.getMessage());


 Demo_FBS9800_HJ_Tester/src/version/version_inf.txt

@@ -1,6 +1,6 @@
带显示屏汇集器调试软件

    设备地址范围  1-65534

    设备地址已修改为2个字节，设置设备地址也修改为2个字节

    设备地址范围  1-254 -老版本

	


    波特率:9600

    数据格式:8位数据，无校验位，1停止位