From bcd7202db10b9dc9600660230b0d8b39b6c68c6c Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 10 二月 2023 10:53:43 +0800
Subject: [PATCH] 修改
---
src/main/java/com/whyc/fbo/FboDataHeadStart.java | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/whyc/fbo/FboDataHeadStart.java b/src/main/java/com/whyc/fbo/FboDataHeadStart.java
index 95ee9be..b9e567f 100644
--- a/src/main/java/com/whyc/fbo/FboDataHeadStart.java
+++ b/src/main/java/com/whyc/fbo/FboDataHeadStart.java
@@ -122,11 +122,9 @@
batt_std_cte = (float) ComBase.changeShortToInt(bf.getShort())/10; //鏍囩О鐢靛 2
batt_mon_num = ComBase.changeShortToInt(bf.getShort()); //鍗曚綋鏁伴噺 1
batt_mon_vol = (float) ComBase.changeShortToInt(bf.getShort())/10; //鍗曚綋鐢靛帇 0.1 2 =100
- //System.out.println("鍗曚綋鐢靛帇锛�"+batt_mon_vol);
TestStartTime.setDateTime(bf);; //鏀剧數寮�濮嬬殑鏃堕棿 6
testStartTime = TestStartTime.getFBODateTime();
Device = ComBase.changeShortToInt(bf.getShort()); //浠〃绫诲瀷 鏈娇鐢� 1
- //System.out.println("浠〃绫诲瀷锛�"+getDeviceType(Device));
DataVersion = ComBase.changeShortToInt(bf.getShort()); //鏁版嵁鐗堟湰 1
DataType = ComBase.changeByteToInt(bf.get()); //鏁版嵁绫诲瀷;0xFD琛ㄧず鏀剧數,0xFC琛ㄧず鍏呯數 1
HourRate = ComBase.changeByteToInt(bf.get()); //灏忔椂鐜� 鏈娇鐢� 1
@@ -136,7 +134,6 @@
MVLLimitCount = ComBase.changeShortToInt(bf.getShort()); //鍗曚綋涓嬮檺涓暟 鏈娇鐢� 2
for(int i=0;i<module_mon_num.length;i++) {
module_mon_num[i] = ComBase.changeShortToInt(bf.getShort()); //姣忎釜缁勫帇妯″潡鍗曚綋鑺傛暟 鐩墠鍙敤5涓� 20
- //System.out.println((i+1)+":鍗曚綋鏁扮洰锛�"+module_mon_num[i]);
}
GrpVol_H_Limit = (float) ComBase.changeShortToFloat(bf.getShort())/10; //缁勭鐢靛帇涓婇檺 2
GrpVol_L_Limit = (float) ComBase.changeShortToFloat(bf.getShort())/10; //缁勭鐢靛帇涓嬮檺 2
@@ -153,11 +150,8 @@
for(int i =0;i<StandBy.length;i++) {
StandBy[i] = ComBase.changeShortToInt(bf.getShort()); //淇濈暀澶囩敤 20 179
}
- //System.out.println(this);
-
+
fboHeadStop.setFboStopData(bf);
- //System.out.println("avg_curr:"+avg_curr);
- //realcap = BattCapFactory.GetMonomerCap(STDCap,HourRate, TestCap, SMaxVol[0], MonomerVol, SMinVol[0], BattCapFactory.CapType_Real);
}
@@ -165,8 +159,7 @@
byte[] batt_brand_tmp = new byte[batt_brand_len];
System.arraycopy(this.batt_brand, 0, batt_brand_tmp, 0, batt_brand_tmp.length);
this.battBrandStr = new String(batt_brand_tmp);
- //System.out.println(this.battBrandStr);
-
+
}
@@ -174,14 +167,12 @@
byte[] batt = new byte[battname_len];
System.arraycopy(this.battname, 0, batt, 0, batt.length);
this.battNameStr = new String(batt);
- //System.out.println(this.battNameStr);
}
public void checkBattDate() {
byte[] date = new byte[batt_date_len];
System.arraycopy(this.batt_date, 0, date, 0, date.length);
this.batt_date_str = new String(date);
- //System.out.println(this.batt_date_str);
}
public String getDeviceType(int device) {
--
Gitblit v1.9.1