diff options
| author | Bdale Garbee <bdale@gag.com> | 2018-08-05 11:21:37 +0800 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2018-08-05 11:21:37 +0800 |
| commit | d8627bb7b46fc991786835afa38cd720e9e75812 (patch) | |
| tree | e14ae029a4ead29a4a7ccccb39af556e32413d36 /altoslib/AltosAccelCal.java | |
| parent | 59e23c27c2a85d7d748223e444b24d19937afe47 (diff) | |
| parent | 8830fbc99565f753c0ae1f3d9f4b079860c2634a (diff) | |
Merge branch 'master' into branch-1.8
Diffstat (limited to 'altoslib/AltosAccelCal.java')
| -rw-r--r-- | altoslib/AltosAccelCal.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/altoslib/AltosAccelCal.java b/altoslib/AltosAccelCal.java index 03d9fbf2..f98090ef 100644 --- a/altoslib/AltosAccelCal.java +++ b/altoslib/AltosAccelCal.java @@ -174,22 +174,23 @@ public class AltosAccelCal implements Runnable { if (worked) new_config = new AltosConfigData(link); } finally { + int plus = config_data.accel_cal_plus(config_data.pad_orientation); + int minus = config_data.accel_cal_minus(config_data.pad_orientation); System.out.printf("Restore orientation %d +g %d -g %d\n", config_data.pad_orientation, - config_data.accel_cal_plus, - config_data.accel_cal_minus); - if (config_data.pad_orientation != AltosLib.MISSING && config_data.pad_orientation != 0) + plus, minus); + if (config_data.pad_orientation != AltosLib.MISSING) link.printf("c o %d\n", config_data.pad_orientation); - if (config_data.accel_cal_plus != AltosLib.MISSING && config_data.accel_cal_minus != AltosLib.MISSING) - link.printf("c a %d %d\n", - config_data.accel_cal_plus, config_data.accel_cal_minus); + if (plus != AltosLib.MISSING && minus != AltosLib.MISSING) + link.printf("c a %d %d\n", plus, minus); + link.flush_output(); stop_link(); } if (new_config != null) { - System.out.printf("*** +1g %d -1g %d\n", - new_config.accel_cal_plus, - new_config.accel_cal_minus); - listener.cal_done(this, new_config.accel_cal_plus, new_config.accel_cal_minus); + int plus = new_config.accel_cal_plus(AltosLib.AO_PAD_ORIENTATION_ANTENNA_UP); + int minus = new_config.accel_cal_minus(AltosLib.AO_PAD_ORIENTATION_ANTENNA_UP); + System.out.printf("*** +1g %d -1g %d\n", plus, minus); + listener.cal_done(this, plus, minus); if (!wait_signal()) throw new InterruptedException("aborted"); } else |