update trigger commenting

This commit is contained in:
sonora 2021-01-03 11:47:59 +01:00
parent 38b4057a53
commit 4168b6e939

View file

@ -166,10 +166,12 @@ public class AnnounceTimeDistances {
} }
private boolean isDistanceLess(float currentSpeed, double dist, double etalon, float defSpeed) { private boolean isDistanceLess(float currentSpeed, double dist, double etalon, float defSpeed) {
// Check triggers: distance < etalon, or time_with_current_speed < etalon_time_with_default_speed // Check triggers:
// (1) distance < etalon?
if (dist - voicePromptDelayTimeSec * currentSpeed <= etalon) { if (dist - voicePromptDelayTimeSec * currentSpeed <= etalon) {
return true; return true;
} }
// (2) time_with_current_speed < etalon_time_with_default_speed?
// check only if speed > 0 // check only if speed > 0
if (currentSpeed > 0 && (dist / currentSpeed - voicePromptDelayTimeSec) <= etalon / defSpeed) { if (currentSpeed > 0 && (dist / currentSpeed - voicePromptDelayTimeSec) <= etalon / defSpeed) {
return true; return true;