Message

Reply | Reply all

Date Prev | Date Next | Thread Prev | Thread Next Date Index | Thread Index

From: cvs at opencores.org<cvs@o...>
Date: Sat May 24 15:44:15 CEST 2008
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/08/05 24:15:44

Modified: jop/java/target/src/app/oebb Gps.java Logic.java Main.java
State.java
Log:
BG V 2.08


Revision Changes Path
1.20 jop/java/target/src/app/oebb/Gps.java

http://www.opencores.org/cvsweb.shtml/jop/java/target/src/app/oebb/Gps.java.diff?r1=1.19&r2=1.20

(In the diff below, changes in quantity of whitespace are not shown.)

Index: Gps.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/app/oebb/Gps.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- Gps.java 22 May 2008 16:29:11 -0000 1.19
+++ Gps.java 24 May 2008 13:44:15 -0000 1.20
@@ -763,7 +763,7 @@
i = gpsTime;
}
off /= 1000; // in ms
- return i*100 + off;
+ return i*1000 + off;
}





1.26 jop/java/target/src/app/oebb/Logic.java

http://www.opencores.org/cvsweb.shtml/jop/java/target/src/app/oebb/Logic.java.diff?r1=1.25&r2=1.26

(In the diff below, changes in quantity of whitespace are not shown.)

Index: Logic.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/app/oebb/Logic.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- Logic.java 22 May 2008 16:29:11 -0000 1.25
+++ Logic.java 24 May 2008 13:44:15 -0000 1.26
@@ -1246,10 +1246,10 @@
private void reset() {
// wait some time to send outstanding messages
// and reply
- int tim = Timer.getTimeoutSec(4);
- while (!Timer.timeout(tim)) {
- loop();
- }
+// int tim = Timer.getTimeoutSec(4);
+// while (!Timer.timeout(tim)) {
+// loop();
+// }
// wait for reset
Main.reset = true;
for (;;) {



1.31 jop/java/target/src/app/oebb/Main.java

http://www.opencores.org/cvsweb.shtml/jop/java/target/src/app/oebb/Main.java.diff?r1=1.30&r2=1.31

(In the diff below, changes in quantity of whitespace are not shown.)

Index: Main.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/app/oebb/Main.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- Main.java 22 May 2008 16:29:11 -0000 1.30
+++ Main.java 24 May 2008 13:44:15 -0000 1.31
@@ -62,7 +62,7 @@

// SW version
public static final int VER_MAJ = 2;
- public static final int VER_MIN = 7;
+ public static final int VER_MIN = 8;

private static final int STRECKE_PRIO = 1;
private static final int STRECKE_PERIOD = 100000;



1.10 jop/java/target/src/app/oebb/State.java

http://www.opencores.org/cvsweb.shtml/jop/java/target/src/app/oebb/State.java.diff?r1=1.9&r2=1.10

(In the diff below, changes in quantity of whitespace are not shown.)

Index: State.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/app/oebb/State.java,v
retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- State.java 22 May 2008 16:29:11 -0000 1.9 +++ State.java 24 May 2008 13:44:15 -0000 1.10 @@ -93,6 +93,7 @@ final static int CFLAG_FWR = 0x00000002; // Fahrtwiderruf final static int CFLAG_NOT = 0x00000004; // Nothalt final static int CFLAG_ANMOK = 0x00000008; // Anmelden OK + final static int CFLAG_IGNORE = 0x00000020; // ignore message /** * The alarm was ack by the TFZ. Set the flags to zero when @@ -270,7 +271,6 @@ * Handle a message received from the ZLB. * zlbMsg point to the received package * - * TODO: check timestamp */ private void handleMsg() { @@ -300,8 +300,6 @@ zlbTimer = Timer.getTimeoutSec(ZLB_TIMEOUT); Status.connOk = true; - // just now - use the ZLB time for our message timing -// setTimestamp(date, time); int[] buf = p.buf; // extract data @@ -310,6 +308,16 @@ int zugnr = strPos & 0xfffff; int cmd = buf[Udp.DATA+8]; + + // ack just this flag, but ignore the rest + if ((cmd & CFLAG_IGNORE)!=0) { + cmdAck |= CFLAG_IGNORE; + Dbg.wr("ZLB ignored"); + Dbg.lf(); + p.setStatus(Packet.FREE); + return; + } + if (cmd!=cmdAck) { // TODO check a cmd change @@ -328,7 +336,7 @@ } // update ack with cmd as default action cmdAck = cmd; - // but keep some when not acked from TFZF or Loigc + // but keep some when not acked from TFZF or Logic // Abmelden if ((cmd & CFLAG_ABM)!=0) {