From: ian Date: Sun, 14 Sep 2008 15:18:23 +0000 (+0000) Subject: delete junking debugging X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=44a2cd39f88f7f944f8285980a72912f6c1ea0c1;p=trains.git delete junking debugging --- diff --git a/hostside/junk b/hostside/junk deleted file mode 100644 index 76a772e..0000000 --- a/hostside/junk +++ /dev/null @@ -1,27 +0,0 @@ -cvs diff: Diffing . -Index: safety.c -=================================================================== -RCS file: /u/ian/cvs/trains/hostside/safety.c,v -retrieving revision 1.101 -diff -u -r1.101 safety.c ---- safety.c 24 Aug 2008 22:53:58 -0000 1.101 -+++ safety.c 14 Sep 2008 15:12:59 -0000 -@@ -630,12 +630,18 @@ - u->done_first_new_fdet= 1; - } - -+DPRINTF(safety,predictseg," elapsed=%lu ?< %d si=%u trb=%u tpi=%u ^^=%u\n", -+ (unsigned long)u->elapsed, MARGIN_POLARISETIME, -+ t->seg->seg_inverted, t->backwards, u->train_polarity_inverted, -+ t->seg->seg_inverted ^ t->backwards ^ -+ u->train_polarity_inverted); - if (u->elapsed < MARGIN_POLARISETIME) { - u->need_polarise |= (t->seg->seg_inverted ^ t->backwards ^ - u->train_polarity_inverted); - } else { - u->walk_compute_polarise &= u->need_polarise; - } -+DPRINTF(safety,predictseg," nnp=%u\n", u->need_polarise); - - if (u->train->autopoint && !u->autopoint_distance) { - const SegPosCombInfo *pci; diff --git a/hostside/safety.c b/hostside/safety.c index dc7685b..bb3d2ed 100644 --- a/hostside/safety.c +++ b/hostside/safety.c @@ -630,18 +630,12 @@ static int fdet_nextseg(TrackLocation *t, TrackAdvanceContext *c, u->done_first_new_fdet= 1; } -DPRINTF(safety,predictseg," elapsed=%lu ?< %d si=%u trb=%u tpi=%u ^^=%u\n", - (unsigned long)u->elapsed, MARGIN_POLARISETIME, - t->seg->seg_inverted, t->backwards, u->train_polarity_inverted, - t->seg->seg_inverted ^ t->backwards ^ - u->train_polarity_inverted); if (u->elapsed < MARGIN_POLARISETIME) { u->need_polarise |= (t->seg->seg_inverted ^ t->backwards ^ u->train_polarity_inverted); } else { u->walk_compute_polarise &= u->need_polarise; } -DPRINTF(safety,predictseg," nnp=%u\n", u->need_polarise); if (u->train->autopoint && !u->autopoint_distance) { const SegPosCombInfo *pci;