bugfix to polarisation

diff --git a/hostside/TODO b/hostside/TODO
index 4859f14cf71900dd35568dd943434039feb98af4..b5a7ecf0a8a1bc71ade566aed9ab4c2c93cc5961 100644 (file)
--- a/hostside/TODO
+++ b/hostside/TODO
@@ -1,5 +1,10 @@
 bugs
        does not set serial port mode etc.
+       when checking future polarity possibility, does not account
+               for MARGIN_POLARISETIME - it just checks to see if
+               extending front before reducing rear is sufficient
+               this will not work if there are segments which are
+               traversed more quickly than MARGIN_POLARISETIME
 
 want to
        document commands [!]movfeat and speed

diff --git a/hostside/safety.c b/hostside/safety.c
index 9f315aba85872adf7656c898e4c6c5edd34843c7..1bdfb184790149470904772bccc925e724269667 100644 (file)
--- a/hostside/safety.c
+++ b/hostside/safety.c
@@ -643,7 +643,7 @@ static int fdet_nextseg(TrackLocation *t, TrackAdvanceContext *c,
     }
     if (u->know_best_polarity &&
        !t->seg->i->invertible &&
-       u->noninv_tally[ t->backwards ^ u->train_polarity_inverted ]) {
+       u->noninv_tally[ t->backwards ^ u->train_polarity_inverted ^ 1]) {
       /* incompatible, stop now */
       u->walk_compute_polarise= 0;
     }