change axis x to time
This commit is contained in:
@ -28,22 +28,22 @@ display_pdo_params = [
|
||||
{"name": "device_servo_trq_feedback", "channel": 5},
|
||||
]
|
||||
durable_data_current = {
|
||||
'time': list(range(1, 26)),
|
||||
'axis1': [0 for _ in range(25)],
|
||||
'axis2': [0 for _ in range(25)],
|
||||
'axis3': [0 for _ in range(25)],
|
||||
'axis4': [0 for _ in range(25)],
|
||||
'axis5': [0 for _ in range(25)],
|
||||
'axis6': [0 for _ in range(25)],
|
||||
'time': list(range(1, 19)),
|
||||
'axis1': [0 for _ in range(18)],
|
||||
'axis2': [0 for _ in range(18)],
|
||||
'axis3': [0 for _ in range(18)],
|
||||
'axis4': [0 for _ in range(18)],
|
||||
'axis5': [0 for _ in range(18)],
|
||||
'axis6': [0 for _ in range(18)],
|
||||
}
|
||||
durable_data_current_max = {
|
||||
'time': list(range(1, 26)),
|
||||
'axis1': [0 for _ in range(25)],
|
||||
'axis2': [0 for _ in range(25)],
|
||||
'axis3': [0 for _ in range(25)],
|
||||
'axis4': [0 for _ in range(25)],
|
||||
'axis5': [0 for _ in range(25)],
|
||||
'axis6': [0 for _ in range(25)],
|
||||
'time': list(range(1, 19)),
|
||||
'axis1': [0 for _ in range(18)],
|
||||
'axis2': [0 for _ in range(18)],
|
||||
'axis3': [0 for _ in range(18)],
|
||||
'axis4': [0 for _ in range(18)],
|
||||
'axis5': [0 for _ in range(18)],
|
||||
'axis6': [0 for _ in range(18)],
|
||||
}
|
||||
data_all = [durable_data_current, durable_data_current_max]
|
||||
|
||||
@ -228,6 +228,7 @@ def get_durable_data(path, data, scenario_time, wait_time, rcs, hr, w2t):
|
||||
this_time = strftime("%Y-%m-%d %H:%M:%S", localtime(time()))
|
||||
next_time = strftime("%Y-%m-%d %H:%M:%S", localtime(time()+wait_time+10+scenario_time)).split()[-1]
|
||||
_df = DataFrame(_d2d_trq)
|
||||
_flg = 0
|
||||
for i in range(6):
|
||||
try:
|
||||
_ = sqrt(_df[i].apply(lambda x: power((rcs[i]*x/1000), 2)).sum()/len(_df[i]))
|
||||
@ -236,13 +237,18 @@ def get_durable_data(path, data, scenario_time, wait_time, rcs, hr, w2t):
|
||||
w2t(f"{i}calculate error", 0, 11, 'red', tab_name)
|
||||
del data[0][f"axis{i + 1}"][0]
|
||||
data[0][f"axis{i + 1}"].append(_)
|
||||
del data[0]['time'][0]
|
||||
data[0]['time'].append(next_time)
|
||||
|
||||
_ = rcs[i] * _df[i].abs().max() / 1000
|
||||
del data[1][f"axis{i + 1}"][0]
|
||||
data[1][f"axis{i + 1}"].append(_)
|
||||
del data[1]['time'][0]
|
||||
data[1]['time'].append(this_time.split()[-1])
|
||||
|
||||
if not _flg:
|
||||
del data[0]['time'][0]
|
||||
data[0]['time'].append(this_time.split()[-1])
|
||||
del data[1]['time'][0]
|
||||
data[1]['time'].append(this_time.split()[-1])
|
||||
_flg = 1
|
||||
|
||||
_df_1 = DataFrame(data[0])
|
||||
_df_2 = DataFrame(data[1])
|
||||
|
||||
|
Reference in New Issue
Block a user