DELL
2024-05-31 989d45448bedd8dc8ae5b09c7ecbdfa2998df13d
有符号数据校准
9个文件已修改
42 ■■■■ 已修改文件
Device_Simulator_DTS_Tester/bin/com/dev/bts/data/FBS9100_ComBase.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/simpower/dev/Power_AlmParam.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/simpower/dev/Power_MU_DCData$DCParam.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/simpower/dev/Power_MU_DCData.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/simpower/dev/Power_MU_Rectifier$RectifierData.class 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/src/com/dev/bts/data/FBS9100_ComBase.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/src/com/dev/simpower/dev/Power_AlmParam.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/src/com/dev/simpower/dev/Power_MU_DCData.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/src/com/dev/simpower/dev/Power_MU_Rectifier.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Device_Simulator_DTS_Tester/bin/com/dev/bts/data/FBS9100_ComBase.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/simpower/dev/Power_AlmParam.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/simpower/dev/Power_MU_DCData$DCParam.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/simpower/dev/Power_MU_DCData.class
Binary files differ
Device_Simulator_DTS_Tester/bin/com/dev/simpower/dev/Power_MU_Rectifier$RectifierData.class
Binary files differ
Device_Simulator_DTS_Tester/src/com/dev/bts/data/FBS9100_ComBase.java
@@ -240,6 +240,11 @@
        int tmp = data;
        return (tmp & 0xFFFF);
    }
    public static int changeSigleShortToInt(short data)
    {
        int tmp = data;
        return (tmp);
    }
    public static float changeShortToFloat(short data)
    {
        int tmp = data & 0xFFFF;
@@ -257,6 +262,13 @@
        return (short)(tmp & 0xFFFF);
    }
    //------------------------------------------------------------------------------
    //------------------------------------------------------------------------------
    public static short changeFloatToSigleShort(float data)
    {
        int tmp = (int)data;
        return (short)(tmp);
    }
    //------------------------------------------------------------------------------
    public static double changeShortToDouble(short data)
    {
        int tmp = data & 0xFFFF;
Device_Simulator_DTS_Tester/src/com/dev/simpower/dev/Power_AlmParam.java
@@ -41,8 +41,8 @@
        this.discurr_high = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort());                //2406    放电电流大阈值        A
        this.chrcurr_high = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort());                //2407    充电电流大阈值        A
        this.dcoutputcurr_high = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort());            //2408    直流输出电流大阈值    A
        this.dev_temp_high = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/10;            //2409    设备内部温度高阈值    0.1℃
        this.dev_temp_low = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/10;            //2410    设备内部温度低阈值    0.1℃
        this.dev_temp_high = FBS9100_ComBase.changeSigleShortToFloat(bbf_rx.getShort())/10;            //2409    设备内部温度高阈值    0.1℃
        this.dev_temp_low = FBS9100_ComBase.changeSigleShortToFloat(bbf_rx.getShort())/10;            //2410    设备内部温度低阈值    0.1℃
        //System.out.println(this);
        return true;
    }
@@ -61,11 +61,19 @@
        buffer.putShort(FBS9100_ComBase.changeFloatToShort(this.discurr_high));
        buffer.putShort(FBS9100_ComBase.changeFloatToShort(this.chrcurr_high));
        buffer.putShort(FBS9100_ComBase.changeFloatToShort(this.dcoutputcurr_high));
        buffer.putShort(FBS9100_ComBase.changeFloatToShort(this.dev_temp_high*10));
        buffer.putShort(FBS9100_ComBase.changeFloatToShort(this.dev_temp_low*10));
        buffer.putShort(FBS9100_ComBase.changeFloatToSigleShort(this.dev_temp_high*10));
        buffer.putShort(FBS9100_ComBase.changeFloatToSigleShort(this.dev_temp_low*10));
        
        buffer.flip();
        return buffer;
    }
    
    public static void main(String[] args) {
        int ff = 65516;
        short ss = -6;
        System.out.println((short)(ff));
        System.out.println((int)(ss&0xFFFF));
    }
}
Device_Simulator_DTS_Tester/src/com/dev/simpower/dev/Power_MU_DCData.java
@@ -75,16 +75,16 @@
            
            this.dc_overvol_coe = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/100;        //直流过压告警点(0.01V)
            this.dc_lessvol_coe = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/100;        //直流欠压告警点(0.01V)
            this.batt_hightemp_coe = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());            //电池高温告警点1℃
            this.batt_lowtemp_coe = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());            //电池低温告警点1℃
            this.envir_hightemp_coe = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());            //环境高温告警点1℃
            this.envir_lowtemp_coe = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());            //环境低温告警点1℃
            this.batt_hightemp_coe = FBS9100_ComBase.changeSigleShortToInt(bbf_rx.getShort());            //电池高温告警点1℃
            this.batt_lowtemp_coe = FBS9100_ComBase.changeSigleShortToInt(bbf_rx.getShort());            //电池低温告警点1℃
            this.envir_hightemp_coe = FBS9100_ComBase.changeSigleShortToInt(bbf_rx.getShort());        //环境高温告警点1℃
            this.envir_lowtemp_coe = FBS9100_ComBase.changeSigleShortToInt(bbf_rx.getShort());        //环境低温告警点1℃
            this.envir_highhumid_coe = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());            //环境高湿告警点1%
            this.envir_lowhumid_coe = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());            //环境低湿告警点1%
            this.float_vol = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/100;                //浮充电压(0.01V)
            this.jun_vol = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/100;                //均充电压(0.01V)
            this.batt_temp_coe = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());                //电池温度补偿系数(1mV/℃)
            this.batt_temp_core = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());                //电池温度补偿中心点(1℃)
            this.batt_temp_core = FBS9100_ComBase.changeSigleShortToInt(bbf_rx.getShort());                //电池温度补偿中心点(1℃)
            this.floattojun_coe = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/100;        //浮充转均充系数(0.01C)
            this.juntofloat_coe = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/100;        //均充转浮充系数(0.01C)
            this.batt_count = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());                    //电池组组数
@@ -112,7 +112,7 @@
        
        this.dc_output_vol = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/100;            //直流输出电压            
        this.load_total_curr = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/10;        //负载总电流            
        this.batt_total_curr = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/10;        //电池总电流
        this.batt_total_curr = FBS9100_ComBase.changeSigleShortToFloat(bbf_rx.getShort())/10;        //电池总电流
        this.batt_rest_cap = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/10;            //电池组剩余容量
        this.batt_temp = FBS9100_ComBase.changeSigleShortToFloat(bbf_rx.getShort());            //电池组温度
        this.envir_temp1 = FBS9100_ComBase.changeSigleShortToFloat(bbf_rx.getShort())/10;        //环境温度1
Device_Simulator_DTS_Tester/src/com/dev/simpower/dev/Power_MU_Rectifier.java
@@ -52,7 +52,7 @@
            this.input_curr = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/10;        //输入电流
            this.output_vol = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/100;        //输出电压
            this.output_curr = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/10;        //输出电流
            this.model_temp = FBS9100_ComBase.changeShortToFloat(bbf_rx.getShort())/10;        //模块温度
            this.model_temp = FBS9100_ComBase.changeSigleShortToFloat(bbf_rx.getShort())/10;        //模块温度
            this.model_open = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());            //模块开关机状态0-开机  1-关机
            this.comm_err = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());            //通信中断 0-正常   1-故障
            this.model_fault = FBS9100_ComBase.changeShortToInt(bbf_rx.getShort());            //故障