Message

Reply | Reply all

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

From: cvs at opencores.org<cvs@o...>
Date: Mon May 19 21:42:02 CEST 2008
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/08/05 19:21:42

Modified: jop/java/target/src/app/oebb Logic.java Main.java
Log:
BG V 2.05


Revision Changes Path
1.23 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.22&r2=1.23

(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.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- Logic.java 25 Apr 2008 22:26:19 -0000 1.22
+++ Logic.java 19 May 2008 19:42:02 -0000 1.23
@@ -17,6 +17,7 @@

// values for state
static final int DL_CHECK = -1;
+ static final int ANM_WAIT = 19;
static final int DEAKT = 18;
static final int ES_VERSCHUB = 17;
static final int ES_RDY = 16;
@@ -190,6 +191,9 @@
case Logic.FDL_CONN:
anmelden();
break;
+ case Logic.ANM_WAIT:
+ anmeldenWait();
+ break;
case Logic.ANM_OK:
if (Status.esMode) {
// we get into ANM_OK after an alarm the removes
@@ -597,13 +601,14 @@
}
} else if (cnt==7) {
// HB Ferl
- if (!hilfsbtr) {
+ if (!hilfsbtr || Main.state.zugnr==0) {
Display.write("", "Nicht möglich", "");
waitEnter();
- }
+ } else {
hbFerl();
}
}
+ }

return;
}
@@ -949,10 +954,10 @@
int type = val;

if (val==1) {
- Display.write("StreckenNr: ", state.strnr, "ZugNr: ",state.zugnr ,
+ Display.write("StreckenNr: ", state.strnr, "ZugNr: ",nr ,
"(Anmelden mit [E])");
} else {
- Display.write("StreckenNr: ", state.strnr, "Nebenfahrt: N", state.zugnr,
+ Display.write("StreckenNr: ", state.strnr, "Nebenfahrt: N", nr,
"(Anmelden mit [E])");
}

@@ -965,11 +970,21 @@
if (val==Keyboard.E) {
state.zugnr = nr;
state.type = type;
+ Logic.state = Logic.ANM_WAIT;
+// if (Logic.state!=Logic.FDL_CONN) return;
+ return;
+ } else if (val==Keyboard.C) {
+ return;
+ }
+ }
+ }
+
+ private void anmeldenWait() {
+
+ while (loop()) {
Display.write("Anmelden", "", "(bitte warten)");
- if (Logic.state!=Logic.FDL_CONN) return;
// wait for Anmelden OK or we already got a FERL
- while (loop()) {
- if (Events.anmeldenOk || state.start!=0 || hilfsbtr) {
+ if (Events.anmeldenOk || Main.state.start!=0 || hilfsbtr) {
Logic.state = Logic.ANM_OK;
Events.anmeldenOk = false;
break;
@@ -977,12 +992,6 @@
abmelden();
}
}
-
- return;
- } else if (val==Keyboard.C) {
- return; - } - } } private int zugnummer(int val) { 1.28 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.27&r2=1.28 (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.27 retrieving revision 1.28 diff -u -b -r1.27 -r1.28 --- Main.java 29 Apr 2008 16:26:10 -0000 1.27 +++ Main.java 19 May 2008 19:42:02 -0000 1.28 @@ -62,7 +62,7 @@ // SW version public static final int VER_MAJ = 2; - public static final int VER_MIN = 4; + public static final int VER_MIN = 5; private static final int STRECKE_PRIO = 1; private static final int STRECKE_PERIOD = 100000;