aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Motors: example: support setting and testing DUAL_MODE

Browse Source
This commit is contained in:
Iampete1 2023-10-30 22:21:44 +00:00 committed by Andrew Tridgell
parent aa8c477a26
commit 55242445b2
2 changed files with 126 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/AP_Motors/examples/AP_Motors_test/AP_Motors_test.cpp
View File

@ -120,6 +120,15 @@ void setup()
exit(1); exit(1);
} }
} else if (strcmp(cmd,"dual_mode") == 0) {
if (frame_class != AP_Motors::MOTOR_FRAME_HELI_DUAL) {
::printf("dual_mode only supported by dual heli frame type (%i), got %i\n", AP_Motors::MOTOR_FRAME_HELI_DUAL, frame_class);
exit(1);
}
// look away now, more dodgy param access.
AP_Int8 *dual_mode = (AP_Int8*)motors + AP_MotorsHeli_Dual::var_info[1].offset;
dual_mode->set(value);
} else if (strcmp(cmd,"frame_class") == 0) { } else if (strcmp(cmd,"frame_class") == 0) {
// We must have the frame_class argument 2nd as resulting class is used to determine if // We must have the frame_class argument 2nd as resulting class is used to determine if

203
libraries/AP_Motors/examples/AP_Motors_test/run_heli_comparison.py
View File

@ -96,9 +96,12 @@ swash_type_lookup = {0: 'H3',
4: 'H4_90', 4: 'H4_90',
5: 'H4_45'} 5: 'H4_45'}
dual_mode_lookup = {0: 'Longitudinal',
1: 'Transverse',
2: 'Intermeshing_or_Coaxial'}
# Run sweep over range of types # Run sweep over range of types
def run_sweep(frame_class, swash_type, dir_name): def run_sweep(frame_class, swash_type, dual_mode, dir_name):
# configure and build the test # configure and build the test
os.system('./waf configure --board linux') os.system('./waf configure --board linux')
@ -107,19 +110,29 @@ def run_sweep(frame_class, swash_type, dir_name):
# Run sweep # Run sweep
for fc in frame_class: for fc in frame_class:
for swash in swash_type: for swash in swash_type:
if swash is not None: for mode in dual_mode:
name = 'frame class = %s (%i), swash = %s (%i)' % (frame_class_lookup[fc], fc, swash_type_lookup[swash], swash) if swash is not None:
filename = '%s_%s_motor_test.csv' % (frame_class_lookup[fc], swash_type_lookup[swash]) swash_cmd = 'swash=%d' % swash
swash_cmd = 'swash=%d' % swash
else: if mode is not None:
name = 'frame class = %s (%i)' % (frame_class_lookup[fc], fc) name = 'frame class = %s (%i), swash = %s (%i), dual mode = %s (%i)' % (frame_class_lookup[fc], fc, swash_type_lookup[swash], swash, dual_mode_lookup[mode], mode)
filename = '%s_motor_test.csv' % (frame_class_lookup[fc]) filename = '%s_%s_%s_motor_test.csv' % (frame_class_lookup[fc], swash_type_lookup[swash], dual_mode_lookup[mode])
swash_cmd = '' mode_cmd = 'dual_mode=%d' % mode
print('Running motors test for %s' % name) else:
os.system('./build/linux/examples/AP_Motors_test s frame_class=%d %s > %s/%s' % (fc, swash_cmd, dir_name, filename)) name = 'frame class = %s (%i), swash = %s (%i)' % (frame_class_lookup[fc], fc, swash_type_lookup[swash], swash)
print('%s complete\n' % name) filename = '%s_%s_motor_test.csv' % (frame_class_lookup[fc], swash_type_lookup[swash])
mode_cmd = ''
else:
name = 'frame class = %s (%i)' % (frame_class_lookup[fc], fc)
filename = '%s_motor_test.csv' % (frame_class_lookup[fc])
swash_cmd = ''
mode_cmd = ''
print('Running motors test for %s' % name)
os.system('./build/linux/examples/AP_Motors_test s frame_class=%d %s %s > %s/%s' % (fc, swash_cmd, mode_cmd, dir_name, filename))
print('%s complete\n' % name)
if __name__ == '__main__': if __name__ == '__main__':
@ -135,6 +148,7 @@ if __name__ == '__main__':
parser.add_argument("-s", "--swash-type", type=int, dest='swash_type', nargs="+", help="list of swashplate types to run comparison on. Defaults to test all types. Invalid for heli quad") parser.add_argument("-s", "--swash-type", type=int, dest='swash_type', nargs="+", help="list of swashplate types to run comparison on. Defaults to test all types. Invalid for heli quad")
parser.add_argument("-c", "--compare", action='store_true', help='Compare only, do not re-run tests') parser.add_argument("-c", "--compare", action='store_true', help='Compare only, do not re-run tests')
parser.add_argument("-p", "--plot", action='store_true', help='Plot comparison results') parser.add_argument("-p", "--plot", action='store_true', help='Plot comparison results')
parser.add_argument("-m", "--dual_mode", type=int, dest='dual_mode', help='Set DUAL_MODE, 0:Longitudinal, 1:Transverse, 2:Intermeshing/Coaxial, default:run all')
args = parser.parse_args() args = parser.parse_args()
if 13 in args.frame_class: if 13 in args.frame_class:
@ -147,6 +161,16 @@ if __name__ == '__main__':
if not args.swash_type: if not args.swash_type:
args.swash_type = (0, 1, 2, 3, 4, 5) args.swash_type = (0, 1, 2, 3, 4, 5)
if (args.frame_class != [11]) and (args.dual_mode is not None):
print('Only Frame %s (%i) supports dual_mode' % (frame_class_lookup[11], 11))
quit()
if args.frame_class == [11]:
if args.dual_mode is None:
args.dual_mode = (0, 1, 2)
else:
args.dual_mode = [None]
dir_name = 'motors_comparison' dir_name = 'motors_comparison'
if not args.compare: if not args.compare:
@ -161,7 +185,7 @@ if __name__ == '__main__':
print('\nRunning motor tests with current changes\n') print('\nRunning motor tests with current changes\n')
# run the test # run the test
run_sweep(args.frame_class, args.swash_type, new_name) run_sweep(args.frame_class, args.swash_type, args.dual_mode, new_name)
if args.head: if args.head:
# rewind head and repeat test # rewind head and repeat test
@ -213,91 +237,98 @@ if __name__ == '__main__':
# Print comparison # Print comparison
for fc in args.frame_class: for fc in args.frame_class:
for sw in args.swash_type: for sw in args.swash_type:
frame = frame_class_lookup[fc] for dm in args.dual_mode:
if sw is not None: frame = frame_class_lookup[fc]
swash = swash_type_lookup[sw] if sw is not None:
name = frame + ' ' + swash swash = swash_type_lookup[sw]
filename = '%s_%s_motor_test.csv' % (frame, swash) if dm is not None:
mode = dual_mode_lookup[dm]
name = frame + ' ' + swash + ' ' + mode
filename = '%s_%s_%s_motor_test.csv' % (frame, swash, mode)
else: else:
name = frame name = frame + ' ' + swash
filename = '%s_motor_test.csv' % (frame) filename = '%s_%s_motor_test.csv' % (frame, swash)
print('%s:' % name) else:
name = frame
filename = '%s_motor_test.csv' % (frame)
new_points = DataPoints(os.path.join(dir_name, 'new/%s' % filename)) print('%s:' % name)
old_points = DataPoints(os.path.join(dir_name, 'original/%s' % filename))
if new_points.init_failed: new_points = DataPoints(os.path.join(dir_name, 'new/%s' % filename))
print('\t failed!\n') old_points = DataPoints(os.path.join(dir_name, 'original/%s' % filename))
print('\tInputs max change:') if new_points.init_failed:
INPUTS = ['Roll', 'Pitch', 'Yaw', 'Thr'] print('\t failed!\n')
input_diff = {}
for field in INPUTS:
input_diff[field] = [i-j for i, j in zip(old_points.data[field], new_points.data[field])]
print('\t\t%s: %f' % (field, max(map(abs, input_diff[field]))))
# Find number of motors print('\tInputs max change:')
num_motors = 0 INPUTS = ['Roll', 'Pitch', 'Yaw', 'Thr']
while True: input_diff = {}
num_motors += 1 for field in INPUTS:
if 'Mot%i' % (num_motors+1) not in new_points.get_fields(): input_diff[field] = [i-j for i, j in zip(old_points.data[field], new_points.data[field])]
break print('\t\t%s: %f' % (field, max(map(abs, input_diff[field]))))
print('\tOutputs max change:') # Find number of motors
output_diff = {} num_motors = 0
for i in range(num_motors): while True:
field = 'Mot%i' % (i+1) num_motors += 1
output_diff[field] = [i-j for i, j in zip(old_points.data[field], new_points.data[field])] if 'Mot%i' % (num_motors+1) not in new_points.get_fields():
print('\t\t%s: %f' % (field, max(map(abs, output_diff[field])))) break
print('\tLimits max change:') print('\tOutputs max change:')
LIMITS = ['LimR', 'LimP', 'LimY', 'LimThD', 'LimThU'] output_diff = {}
limit_diff = {} for i in range(num_motors):
for field in LIMITS: field = 'Mot%i' % (i+1)
limit_diff[field] = [i-j for i, j in zip(old_points.data[field], new_points.data[field])] output_diff[field] = [i-j for i, j in zip(old_points.data[field], new_points.data[field])]
print('\t\t%s: %f' % (field, max(map(abs, limit_diff[field])))) print('\t\t%s: %f' % (field, max(map(abs, output_diff[field]))))
print('\n')
if not args.plot: print('\tLimits max change:')
continue LIMITS = ['LimR', 'LimP', 'LimY', 'LimThD', 'LimThU']
limit_diff = {}
for field in LIMITS:
limit_diff[field] = [i-j for i, j in zip(old_points.data[field], new_points.data[field])]
print('\t\t%s: %f' % (field, max(map(abs, limit_diff[field]))))
print('\n')
# Plot comparison if not args.plot:
fig_size = (16, 8) continue
fig, ax = plt.subplots(2, 2, figsize=fig_size)
fig.suptitle('%s Input Diff' % name, fontsize=16)
ax = ax.flatten()
for i, field in enumerate(INPUTS):
ax[i].plot(input_diff[field], color=RED)
ax[i].set_xlabel('Test Number')
ax[i].set_ylabel('%s Old - New' % field)
plt.tight_layout(rect=[0, 0.0, 1, 0.95])
fig, ax = plt.subplots(2, num_motors, figsize=fig_size) # Plot comparison
fig.suptitle('%s Outputs' % name, fontsize=16) fig_size = (16, 8)
for i in range(num_motors): fig, ax = plt.subplots(2, 2, figsize=fig_size)
field = 'Mot%i' % (i+1) fig.suptitle('%s Input Diff' % name, fontsize=16)
ax[0, i].plot(old_points.data[field], color=RED) ax = ax.flatten()
ax[0, i].plot(new_points.data[field], color=BLUE) for i, field in enumerate(INPUTS):
ax[0, i].set_ylabel(field) ax[i].plot(input_diff[field], color=RED)
ax[0, i].set_xlabel('Test No') ax[i].set_xlabel('Test Number')
ax[1, i].plot(output_diff[field], color=BLACK) ax[i].set_ylabel('%s Old - New' % field)
ax[1, i].set_ylabel('Change in %s' % field) plt.tight_layout(rect=[0, 0.0, 1, 0.95])
ax[1, i].set_xlabel('Test No')
plt.tight_layout(rect=[0, 0.0, 1, 0.95])
fig, ax = plt.subplots(2, 5, figsize=fig_size) fig, ax = plt.subplots(2, num_motors, figsize=fig_size)
fig.suptitle(name + ' Limits', fontsize=16) fig.suptitle('%s Outputs' % name, fontsize=16)
for i, field in enumerate(LIMITS): for i in range(num_motors):
ax[0, i].plot(old_points.data[field], color=RED) field = 'Mot%i' % (i+1)
ax[0, i].plot(new_points.data[field], color=BLUE) ax[0, i].plot(old_points.data[field], color=RED)
ax[0, i].set_ylabel(field) ax[0, i].plot(new_points.data[field], color=BLUE)
ax[0, i].set_xlabel('Test No') ax[0, i].set_ylabel(field)
ax[1, i].plot(limit_diff[field], color=BLACK) ax[0, i].set_xlabel('Test No')
ax[1, i].set_ylabel('Change in %s' % field) ax[1, i].plot(output_diff[field], color=BLACK)
ax[1, i].set_xlabel('Test No') ax[1, i].set_ylabel('Change in %s' % field)
plt.tight_layout(rect=[0, 0.0, 1, 0.95]) ax[1, i].set_xlabel('Test No')
plt.tight_layout(rect=[0, 0.0, 1, 0.95])
fig, ax = plt.subplots(2, 5, figsize=fig_size)
fig.suptitle(name + ' Limits', fontsize=16)
for i, field in enumerate(LIMITS):
ax[0, i].plot(old_points.data[field], color=RED)
ax[0, i].plot(new_points.data[field], color=BLUE)
ax[0, i].set_ylabel(field)
ax[0, i].set_xlabel('Test No')
ax[1, i].plot(limit_diff[field], color=BLACK)
ax[1, i].set_ylabel('Change in %s' % field)
ax[1, i].set_xlabel('Test No')
plt.tight_layout(rect=[0, 0.0, 1, 0.95])
if args.plot: if args.plot:
plt.show() plt.show()