|
@@ -426,7 +426,7 @@ class BatInterShort():
|
|
|
dict_bal2={}
|
|
dict_bal2={}
|
|
|
else:
|
|
else:
|
|
|
deltvolt_last2=[np.array(x) for x in df_ram_chrgvolt.loc[0,'deltvolt']]
|
|
deltvolt_last2=[np.array(x) for x in df_ram_chrgvolt.loc[0,'deltvolt']]
|
|
|
- time_last2=df_ram_chrgvolt.loc[0,'time2']
|
|
|
|
|
|
|
+ time_last2=df_ram_chrgvolt.loc[0,'time']
|
|
|
temp_mean_last=df_ram_chrgvolt.loc[0,'temp_avg']
|
|
temp_mean_last=df_ram_chrgvolt.loc[0,'temp_avg']
|
|
|
packcrnt_mean_last=df_ram_chrgvolt.loc[0,'packcrnt_avg']
|
|
packcrnt_mean_last=df_ram_chrgvolt.loc[0,'packcrnt_avg']
|
|
|
firsttime2=0
|
|
firsttime2=0
|
|
@@ -721,7 +721,7 @@ class BatInterShort():
|
|
|
dict_bal2={}
|
|
dict_bal2={}
|
|
|
else:
|
|
else:
|
|
|
deltvolt_last2=[np.array(x) for x in df_ram_chrgvolt.loc[0,'deltvolt']]
|
|
deltvolt_last2=[np.array(x) for x in df_ram_chrgvolt.loc[0,'deltvolt']]
|
|
|
- time_last2=df_ram_chrgvolt.loc[0,'time2']
|
|
|
|
|
|
|
+ time_last2=df_ram_chrgvolt.loc[0,'time']
|
|
|
temp_mean_last=df_ram_chrgvolt.loc[0,'temp_avg']
|
|
temp_mean_last=df_ram_chrgvolt.loc[0,'temp_avg']
|
|
|
packcrnt_mean_last=df_ram_chrgvolt.loc[0,'packcrnt_avg']
|
|
packcrnt_mean_last=df_ram_chrgvolt.loc[0,'packcrnt_avg']
|
|
|
firsttime2=0
|
|
firsttime2=0
|
